diff --git a/lib/cs/diagnosticMessages.generated.json b/lib/cs/diagnosticMessages.generated.json
index 462b5b2e008..8d9b01b2a6f 100644
--- a/lib/cs/diagnosticMessages.generated.json
+++ b/lib/cs/diagnosticMessages.generated.json
@@ -107,6 +107,7 @@
   "Add_0_to_existing_import_declaration_from_1_90015": "Přidat {0} k existující deklaraci importu z {1}",
   "Add_0_to_unresolved_variable_90008": "Přidat {0}. k nerozpoznané proměnné",
   "Add_all_missing_async_modifiers_95041": "Přidat všechny chybějící modifikátory async",
+  "Add_all_missing_call_parentheses_95068": "Přidat všechny chybějící závorky volání",
   "Add_all_missing_imports_95064": "Přidat všechny chybějící importy",
   "Add_all_missing_members_95022": "Přidat všechny chybějící členy",
   "Add_all_missing_super_calls_95039": "Přidat všechna chybějící volání pomocí super",
@@ -124,6 +125,7 @@
   "Add_index_signature_for_property_0_90017": "Přidat signaturu indexu pro vlastnost {0}",
   "Add_initializer_to_property_0_95019": "Přidat inicializační výraz k vlastnosti {0}",
   "Add_initializers_to_all_uninitialized_properties_95027": "Přidat inicializátory do všech neinicializovaných vlastností",
+  "Add_missing_call_parentheses_95067": "Přidat chybějící závorky volání",
   "Add_missing_enum_member_0_95063": "Přidat chybějící člen výčtu {0}",
   "Add_missing_new_operator_to_all_calls_95072": "Přidat chybějící operátor new ke všem voláním",
   "Add_missing_new_operator_to_call_95071": "Přidat chybějící operátor new k volání",
@@ -266,8 +268,8 @@
   "Cannot_find_global_value_0_2468": "Globální hodnota {0} se nenašla.",
   "Cannot_find_lib_definition_for_0_2726": "Nepovedlo se najít definici knihovny pro {0}.",
   "Cannot_find_lib_definition_for_0_Did_you_mean_1_2727": "Nepovedlo se najít definici knihovny pro {0}. Neměli jste na mysli spíš {1}?",
-  "Cannot_find_module_0_2307": "Nenašel se modul {0}.",
   "Cannot_find_module_0_Consider_using_resolveJsonModule_to_import_module_with_json_extension_2732": "Nepovedlo se najít modul {0}. Zvažte možnost importovat modul s příponou .json pomocí --resolveJsonModule.",
+  "Cannot_find_module_0_or_its_corresponding_type_declarations_2307": "Nepovedlo se najít modul {0} nebo jeho odpovídající deklarace typů.",
   "Cannot_find_name_0_2304": "Název {0} se nenašel.",
   "Cannot_find_name_0_Did_you_mean_1_2552": "Nepovedlo se najít název {0}. Měli jste na mysli {1}?",
   "Cannot_find_name_0_Did_you_mean_the_instance_member_this_0_2663": "Název {0} se nedá najít. Měli jste na mysli člena instance this.{0}?",
@@ -388,6 +390,7 @@
   "Declaration_or_statement_expected_1128": "Očekává se deklarace nebo příkaz.",
   "Declare_a_private_field_named_0_90053": "Deklarovat privátní pole s názvem {0}",
   "Declare_method_0_90023": "Deklarovat metodu {0}",
+  "Declare_private_property_0_90035": "Deklarujte privátní vlastnost {0}.",
   "Declare_property_0_90016": "Deklarovat vlastnost {0}",
   "Declare_static_method_0_90024": "Deklarovat statickou metodu {0}",
   "Declare_static_property_0_90027": "Deklarovat statickou vlastnost {0}",
@@ -1271,6 +1274,7 @@
   "_0_cannot_be_used_as_a_value_because_it_was_exported_using_export_type_1362": "{0} se nedá používat jako hodnota, protože se exportovalo pomocí export type.",
   "_0_cannot_be_used_as_a_value_because_it_was_imported_using_import_type_1361": "{0} se nedá používat jako hodnota, protože se importovalo pomocí import type.",
   "_0_components_don_t_accept_text_as_child_elements_Text_in_JSX_has_the_type_string_but_the_expected_t_2747": "Komponenty {0} nepřijímají text jako podřízené prvky. Text v JSX má typ string, ale očekávaný typ {1} je {2}.",
+  "_0_could_be_instantiated_with_an_arbitrary_type_which_could_be_unrelated_to_1_5082": "Instanci {0} by bylo možné vytvořit s libovolným typem, který by nemusel souviset s {1}.",
   "_0_declarations_can_only_be_used_in_TypeScript_files_8006": "Deklarace {0} se dají používat jen v typescriptových souborech.",
   "_0_expected_1005": "Očekával se: {0}.",
   "_0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage_7050": "{0} má implicitně návratový typ {1}, ale je možné, že lepší typ by se vyvodil z využití.",
@@ -1307,7 +1311,7 @@
   "_0_only_refers_to_a_type_but_is_being_used_as_a_value_here_2693": "{0} odkazuje jenom na typ, ale používá se tady jako hodnota.",
   "_0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Do_you_need_to_change_your_target_library_2585": "{0} se odkazuje jen na typ, ale používá se tady jako hodnota. Potřebujete změnit svou cílovou knihovnu? Zkuste změnit možnost kompilátoru lib na es2015 nebo novější.",
   "_0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead_2686": "{0} odkazuje na globální UMD, ale aktuální soubor je modul. Zvažte raději přidání importu.",
-  "_0_refers_to_a_value_but_is_being_used_as_a_type_here_2749": "{0} odkazuje na hodnotu, ale tady se používá jako typ.",
+  "_0_refers_to_a_value_but_is_being_used_as_a_type_here_Did_you_mean_typeof_0_2749": "{0} odkazuje na hodnotu, ale tady se používá jako typ. Měli jste na mysli typeof {0}?",
   "_0_tag_already_specified_1223": "Značka {0} se už specifikovala.",
   "_0_tag_cannot_be_used_independently_as_a_top_level_JSDoc_tag_1253": "Značku {0} nejde používat nezávisle jako značku JSDoc nejvyšší úrovně.",
   "_0_was_also_declared_here_6203": "{0} se deklarovalo i tady.",
diff --git a/lib/lib.dom.d.ts b/lib/lib.dom.d.ts
index 81ab89760dc..4feeb51cbb3 100644
--- a/lib/lib.dom.d.ts
+++ b/lib/lib.dom.d.ts
@@ -600,6 +600,15 @@ interface IIRFilterOptions extends AudioNodeOptions {
     feedforward: number[];
 }
 
+interface ImageBitmapOptions {
+    colorSpaceConversion?: ColorSpaceConversion;
+    imageOrientation?: ImageOrientation;
+    premultiplyAlpha?: PremultiplyAlpha;
+    resizeHeight?: number;
+    resizeQuality?: ResizeQuality;
+    resizeWidth?: number;
+}
+
 interface ImageBitmapRenderingContextSettings {
     alpha?: boolean;
 }
@@ -1708,6 +1717,12 @@ interface ShadowRootInit {
     mode: ShadowRootMode;
 }
 
+interface ShareData {
+    text?: string;
+    title?: string;
+    url?: string;
+}
+
 interface SpeechSynthesisErrorEventInit extends SpeechSynthesisEventInit {
     error: SpeechSynthesisErrorCode;
 }
@@ -1793,7 +1808,7 @@ interface TouchInit {
 }
 
 interface TrackEventInit extends EventInit {
-    track?: VideoTrack | AudioTrack | TextTrack | null;
+    track?: TextTrack | null;
 }
 
 interface Transformer<I = any, O = any> {
@@ -2176,10 +2191,12 @@ interface Attr extends Node {
     readonly localName: string;
     readonly name: string;
     readonly namespaceURI: string | null;
+    readonly ownerDocument: Document;
     readonly ownerElement: Element | null;
     readonly prefix: string | null;
     readonly specified: boolean;
     value: string;
+    cloneNode(deep?: boolean): Attr;
 }
 
 declare var Attr: {
@@ -2363,47 +2380,6 @@ declare var AudioScheduledSourceNode: {
     new(): AudioScheduledSourceNode;
 };
 
-/** A single audio track from one of the HTML media elements, <audio> or <video>.  */
-interface AudioTrack {
-    enabled: boolean;
-    readonly id: string;
-    kind: string;
-    readonly label: string;
-    language: string;
-    readonly sourceBuffer: SourceBuffer | null;
-}
-
-declare var AudioTrack: {
-    prototype: AudioTrack;
-    new(): AudioTrack;
-};
-
-interface AudioTrackListEventMap {
-    "addtrack": TrackEvent;
-    "change": Event;
-    "removetrack": TrackEvent;
-}
-
-/** Used to represent a list of the audio tracks contained within a given HTML media element, with each track represented by a separate AudioTrack object in the list. */
-interface AudioTrackList extends EventTarget {
-    readonly length: number;
-    onaddtrack: ((this: AudioTrackList, ev: TrackEvent) => any) | null;
-    onchange: ((this: AudioTrackList, ev: Event) => any) | null;
-    onremovetrack: ((this: AudioTrackList, ev: TrackEvent) => any) | null;
-    getTrackById(id: string): AudioTrack | null;
-    item(index: number): AudioTrack;
-    addEventListener<K extends keyof AudioTrackListEventMap>(type: K, listener: (this: AudioTrackList, ev: AudioTrackListEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
-    removeEventListener<K extends keyof AudioTrackListEventMap>(type: K, listener: (this: AudioTrackList, ev: AudioTrackListEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
-    removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
-    [index: number]: AudioTrack;
-}
-
-declare var AudioTrackList: {
-    prototype: AudioTrackList;
-    new(): AudioTrackList;
-};
-
 interface AudioWorklet extends Worklet {
 }
 
@@ -2627,6 +2603,7 @@ declare var ByteLengthQueuingStrategy: {
 
 /** A CDATA section that can be used within XML to include extended portions of unescaped text. The symbols < and & don’t need escaping as they normally do when inside a CDATA section. */
 interface CDATASection extends Text {
+    cloneNode(deep?: boolean): CDATASection;
 }
 
 declare var CDATASection: {
@@ -2634,13 +2611,6 @@ declare var CDATASection: {
     new(): CDATASection;
 };
 
-/** Holds useful CSS-related methods. No object with this interface are implemented: it contains only static methods and therefore is a utilitarian interface. */
-interface CSS {
-    escape(value: string): string;
-    supports(property: string, value?: string): boolean;
-}
-declare var CSS: CSS;
-
 /** A single condition CSS at-rule, which consists of a condition and a statement block. It is a child of CSSGroupingRule. */
 interface CSSConditionRule extends CSSGroupingRule {
     conditionText: string;
@@ -2664,7 +2634,7 @@ declare var CSSFontFaceRule: {
 interface CSSGroupingRule extends CSSRule {
     readonly cssRules: CSSRuleList;
     deleteRule(index: number): void;
-    insertRule(rule: string, index: number): number;
+    insertRule(rule: string, index?: number): number;
 }
 
 declare var CSSGroupingRule: {
@@ -2730,9 +2700,7 @@ declare var CSSNamespaceRule: {
 };
 
 /** CSSPageRule is an interface representing a single CSS @page rule. It implements the CSSRule interface with a type value of 6 (CSSRule.PAGE_RULE). */
-interface CSSPageRule extends CSSRule {
-    readonly pseudoClass: string;
-    readonly selector: string;
+interface CSSPageRule extends CSSGroupingRule {
     selectorText: string;
     readonly style: CSSStyleDeclaration;
 }
@@ -2758,8 +2726,6 @@ interface CSSRule {
     readonly PAGE_RULE: number;
     readonly STYLE_RULE: number;
     readonly SUPPORTS_RULE: number;
-    readonly UNKNOWN_RULE: number;
-    readonly VIEWPORT_RULE: number;
 }
 
 declare var CSSRule: {
@@ -2775,8 +2741,6 @@ declare var CSSRule: {
     readonly PAGE_RULE: number;
     readonly STYLE_RULE: number;
     readonly SUPPORTS_RULE: number;
-    readonly UNKNOWN_RULE: number;
-    readonly VIEWPORT_RULE: number;
 };
 
 /** A CSSRuleList is an (indirect-modify only) array-like object containing an ordered collection of CSSRule objects. */
@@ -2797,6 +2761,7 @@ interface CSSStyleDeclaration {
     alignItems: string;
     alignSelf: string;
     alignmentBaseline: string;
+    all: string;
     animation: string;
     animationDelay: string;
     animationDirection: string;
@@ -2897,14 +2862,13 @@ interface CSSStyleDeclaration {
     content: string;
     counterIncrement: string;
     counterReset: string;
-    cssFloat: string | null;
+    cssFloat: string;
     cssText: string;
     cursor: string;
     direction: string;
     display: string;
     dominantBaseline: string;
     emptyCells: string;
-    enableBackground: string | null;
     fill: string;
     fillOpacity: string;
     fillRule: string;
@@ -2936,7 +2900,6 @@ interface CSSStyleDeclaration {
     fontVariantPosition: string;
     fontWeight: string;
     gap: string;
-    glyphOrientationHorizontal: string | null;
     glyphOrientationVertical: string;
     grid: string;
     gridArea: string;
@@ -2960,17 +2923,10 @@ interface CSSStyleDeclaration {
     hyphens: string;
     imageOrientation: string;
     imageRendering: string;
-    imeMode: string | null;
     inlineSize: string;
     justifyContent: string;
     justifyItems: string;
     justifySelf: string;
-    kerning: string | null;
-    layoutGrid: string | null;
-    layoutGridChar: string | null;
-    layoutGridLine: string | null;
-    layoutGridMode: string | null;
-    layoutGridType: string | null;
     left: string;
     readonly length: number;
     letterSpacing: string;
@@ -3009,53 +2965,6 @@ interface CSSStyleDeclaration {
     minHeight: string;
     minInlineSize: string;
     minWidth: string;
-    msContentZoomChaining: string | null;
-    msContentZoomLimit: string | null;
-    msContentZoomLimitMax: any;
-    msContentZoomLimitMin: any;
-    msContentZoomSnap: string | null;
-    msContentZoomSnapPoints: string | null;
-    msContentZoomSnapType: string | null;
-    msContentZooming: string | null;
-    msFlowFrom: string | null;
-    msFlowInto: string | null;
-    msFontFeatureSettings: string | null;
-    msGridColumn: any;
-    msGridColumnAlign: string | null;
-    msGridColumnSpan: any;
-    msGridColumns: string | null;
-    msGridRow: any;
-    msGridRowAlign: string | null;
-    msGridRowSpan: any;
-    msGridRows: string | null;
-    msHighContrastAdjust: string | null;
-    msHyphenateLimitChars: string | null;
-    msHyphenateLimitLines: any;
-    msHyphenateLimitZone: any;
-    msHyphens: string | null;
-    msImeAlign: string | null;
-    msOverflowStyle: string | null;
-    msScrollChaining: string | null;
-    msScrollLimit: string | null;
-    msScrollLimitXMax: any;
-    msScrollLimitXMin: any;
-    msScrollLimitYMax: any;
-    msScrollLimitYMin: any;
-    msScrollRails: string | null;
-    msScrollSnapPointsX: string | null;
-    msScrollSnapPointsY: string | null;
-    msScrollSnapType: string | null;
-    msScrollSnapX: string | null;
-    msScrollSnapY: string | null;
-    msScrollTranslation: string | null;
-    msTextCombineHorizontal: string | null;
-    msTextSizeAdjust: any;
-    msTouchAction: string | null;
-    msTouchSelect: string | null;
-    msUserSelect: string | null;
-    msWrapFlow: string;
-    msWrapMargin: any;
-    msWrapThrough: string;
     objectFit: string;
     objectPosition: string;
     opacity: string;
@@ -3084,14 +2993,13 @@ interface CSSStyleDeclaration {
     pageBreakBefore: string;
     pageBreakInside: string;
     paintOrder: string;
-    readonly parentRule: CSSRule;
-    penAction: string | null;
+    readonly parentRule: CSSRule | null;
     perspective: string;
     perspectiveOrigin: string;
     placeContent: string;
     placeItems: string;
     placeSelf: string;
-    pointerEvents: string | null;
+    pointerEvents: string;
     position: string;
     quotes: string;
     resize: string;
@@ -3099,7 +3007,6 @@ interface CSSStyleDeclaration {
     rotate: string;
     rowGap: string;
     rubyAlign: string;
-    rubyOverhang: string | null;
     rubyPosition: string;
     scale: string;
     scrollBehavior: string;
@@ -3130,8 +3037,6 @@ interface CSSStyleDeclaration {
     textEmphasisStyle: string;
     textIndent: string;
     textJustify: string;
-    textKashida: string | null;
-    textKashidaSpace: string | null;
     textOrientation: string;
     textOverflow: string;
     textRendering: string;
@@ -3192,7 +3097,6 @@ interface CSSStyleDeclaration {
     webkitBorderBottomLeftRadius: string;
     /** @deprecated */
     webkitBorderBottomRightRadius: string;
-    webkitBorderImage: string | null;
     /** @deprecated */
     webkitBorderRadius: string;
     /** @deprecated */
@@ -3201,7 +3105,6 @@ interface CSSStyleDeclaration {
     webkitBorderTopRightRadius: string;
     /** @deprecated */
     webkitBoxAlign: string;
-    webkitBoxDirection: string | null;
     /** @deprecated */
     webkitBoxFlex: string;
     /** @deprecated */
@@ -3214,18 +3117,6 @@ interface CSSStyleDeclaration {
     webkitBoxShadow: string;
     /** @deprecated */
     webkitBoxSizing: string;
-    webkitColumnBreakAfter: string | null;
-    webkitColumnBreakBefore: string | null;
-    webkitColumnBreakInside: string | null;
-    webkitColumnCount: any;
-    webkitColumnGap: any;
-    webkitColumnRule: string | null;
-    webkitColumnRuleColor: any;
-    webkitColumnRuleStyle: string | null;
-    webkitColumnRuleWidth: any;
-    webkitColumnSpan: string | null;
-    webkitColumnWidth: any;
-    webkitColumns: string | null;
     /** @deprecated */
     webkitFilter: string;
     /** @deprecated */
@@ -3279,7 +3170,7 @@ interface CSSStyleDeclaration {
     webkitPerspective: string;
     /** @deprecated */
     webkitPerspectiveOrigin: string;
-    webkitTapHighlightColor: string | null;
+    webkitTapHighlightColor: string;
     /** @deprecated */
     webkitTextFillColor: string;
     /** @deprecated */
@@ -3306,9 +3197,8 @@ interface CSSStyleDeclaration {
     webkitTransitionProperty: string;
     /** @deprecated */
     webkitTransitionTimingFunction: string;
-    webkitUserModify: string | null;
-    webkitUserSelect: string | null;
-    webkitWritingMode: string | null;
+    /** @deprecated */
+    webkitUserSelect: string;
     whiteSpace: string;
     widows: string;
     width: string;
@@ -3318,12 +3208,13 @@ interface CSSStyleDeclaration {
     wordWrap: string;
     writingMode: string;
     zIndex: string;
-    zoom: string | null;
-    getPropertyPriority(propertyName: string): string;
-    getPropertyValue(propertyName: string): string;
+    /** @deprecated */
+    zoom: string;
+    getPropertyPriority(property: string): string;
+    getPropertyValue(property: string): string;
     item(index: number): string;
-    removeProperty(propertyName: string): string;
-    setProperty(propertyName: string, value: string | null, priority?: string | null): void;
+    removeProperty(property: string): string;
+    setProperty(property: string, value: string | null, priority?: string): void;
     [index: number]: string;
 }
 
@@ -3346,34 +3237,12 @@ declare var CSSStyleRule: {
 /** A single CSS style sheet. It inherits properties and methods from its parent, StyleSheet. */
 interface CSSStyleSheet extends StyleSheet {
     readonly cssRules: CSSRuleList;
-    /** @deprecated */
-    cssText: string;
-    /** @deprecated */
-    readonly id: string;
-    /** @deprecated */
-    readonly imports: StyleSheetList;
-    /** @deprecated */
-    readonly isAlternate: boolean;
-    /** @deprecated */
-    readonly isPrefAlternate: boolean;
     readonly ownerRule: CSSRule | null;
-    /** @deprecated */
-    readonly owningElement: Element;
-    /** @deprecated */
-    readonly pages: any;
-    /** @deprecated */
-    readonly readOnly: boolean;
     readonly rules: CSSRuleList;
-    /** @deprecated */
-    addImport(bstrURL: string, lIndex?: number): number;
-    /** @deprecated */
-    addPageRule(bstrSelector: string, bstrStyle: string, lIndex?: number): number;
-    addRule(bstrSelector: string, bstrStyle?: string, lIndex?: number): number;
-    deleteRule(index?: number): void;
+    addRule(selector?: string, style?: string, index?: number): number;
+    deleteRule(index: number): void;
     insertRule(rule: string, index?: number): number;
-    /** @deprecated */
-    removeImport(lIndex: number): void;
-    removeRule(lIndex: number): void;
+    removeRule(index?: number): void;
 }
 
 declare var CSSStyleSheet: {
@@ -3449,7 +3318,7 @@ interface CanvasFillStrokeStyles {
     fillStyle: string | CanvasGradient | CanvasPattern;
     strokeStyle: string | CanvasGradient | CanvasPattern;
     createLinearGradient(x0: number, y0: number, x1: number, y1: number): CanvasGradient;
-    createPattern(image: CanvasImageSource, repetition: string): CanvasPattern | null;
+    createPattern(image: CanvasImageSource, repetition: string | null): CanvasPattern | null;
     createRadialGradient(x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): CanvasGradient;
 }
 
@@ -3612,7 +3481,9 @@ declare var ChannelSplitterNode: {
 interface CharacterData extends Node, ChildNode, NonDocumentTypeChildNode {
     data: string;
     readonly length: number;
+    readonly ownerDocument: Document;
     appendData(data: string): void;
+    cloneNode(deep?: boolean): CharacterData;
     deleteData(offset: number, count: number): void;
     insertData(offset: number, data: string): void;
     replaceData(offset: number, count: number, data: string): void;
@@ -3717,6 +3588,7 @@ declare var CloseEvent: {
 
 /** Textual notations within markup; although it is generally not visually shown, such comments are available to be read in the source view. */
 interface Comment extends CharacterData {
+    cloneNode(deep?: boolean): Comment;
 }
 
 declare var Comment: {
@@ -3743,40 +3615,6 @@ interface ConcatParams extends Algorithm {
     publicInfo?: Uint8Array;
 }
 
-/** Provides access to the browser's debugging console (e.g. the Web Console in Firefox). The specifics of how it works varies from browser to browser, but there is a de facto set of features that are typically provided. */
-interface Console {
-    memory: any;
-    assert(condition?: boolean, message?: string, ...data: any[]): void;
-    clear(): void;
-    count(label?: string): void;
-    debug(message?: any, ...optionalParams: any[]): void;
-    dir(value?: any, ...optionalParams: any[]): void;
-    dirxml(value: any): void;
-    error(message?: any, ...optionalParams: any[]): void;
-    exception(message?: string, ...optionalParams: any[]): void;
-    group(groupTitle?: string, ...optionalParams: any[]): void;
-    groupCollapsed(groupTitle?: string, ...optionalParams: any[]): void;
-    groupEnd(): void;
-    info(message?: any, ...optionalParams: any[]): void;
-    log(message?: any, ...optionalParams: any[]): void;
-    markTimeline(label?: string): void;
-    profile(reportName?: string): void;
-    profileEnd(reportName?: string): void;
-    table(...tabularData: any[]): void;
-    time(label?: string): void;
-    timeEnd(label?: string): void;
-    timeStamp(label?: string): void;
-    timeline(label?: string): void;
-    timelineEnd(label?: string): void;
-    trace(message?: any, ...optionalParams: any[]): void;
-    warn(message?: any, ...optionalParams: any[]): void;
-}
-
-declare var Console: {
-    prototype: Console;
-    new(): Console;
-};
-
 interface ConstantSourceNode extends AudioScheduledSourceNode {
     readonly offset: AudioParam;
     addEventListener<K extends keyof AudioScheduledSourceNodeEventMap>(type: K, listener: (this: ConstantSourceNode, ev: AudioScheduledSourceNodeEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
@@ -4627,7 +4465,7 @@ interface Document extends Node, DocumentAndElementEventHandlers, DocumentOrShad
      * Returns null if the Document is not currently executing a script or SVG script element (e.g., because the running script is an event handler, or a timeout), or if the currently executing script or SVG script element represents a module script.
      */
     readonly currentScript: HTMLOrSVGScriptElement | null;
-    readonly defaultView: WindowProxy | null;
+    readonly defaultView: (WindowProxy & typeof globalThis) | null;
     /**
      * Sets or gets a value that indicates whether the document can be edited.
      */
@@ -4719,6 +4557,7 @@ interface Document extends Node, DocumentAndElementEventHandlers, DocumentOrShad
      * Returns document's origin.
      */
     readonly origin: string;
+    readonly ownerDocument: null;
     /**
      * Return an HTMLCollection of the embed elements in the Document.
      */
@@ -4760,6 +4599,7 @@ interface Document extends Node, DocumentAndElementEventHandlers, DocumentOrShad
     caretRangeFromPoint(x: number, y: number): Range;
     /** @deprecated */
     clear(): void;
+    cloneNode(deep?: boolean): Document;
     /**
      * Closes an output stream and forces the sent data to display.
      */
@@ -5142,6 +4982,8 @@ interface DocumentEvent {
 
 /** A minimal document object that has no parent. It is used as a lightweight version of Document that stores a segment of a document structure comprised of nodes just like a standard document. The key difference is that because the document fragment isn't part of the active document tree structure, changes made to the fragment don't affect the document, cause reflow, or incur any performance impact that can occur when changes are made. */
 interface DocumentFragment extends Node, NonElementParentNode, ParentNode {
+    readonly ownerDocument: Document;
+    cloneNode(deep?: boolean): DocumentFragment;
     getElementById(elementId: string): HTMLElement | null;
 }
 
@@ -5180,8 +5022,10 @@ declare var DocumentTimeline: {
 /** A Node containing a doctype. */
 interface DocumentType extends Node, ChildNode {
     readonly name: string;
+    readonly ownerDocument: Document;
     readonly publicId: string;
     readonly systemId: string;
+    cloneNode(deep?: boolean): DocumentType;
 }
 
 declare var DocumentType: {
@@ -5278,6 +5122,7 @@ interface Element extends Node, Animatable, ChildNode, InnerHTML, NonDocumentTyp
     onfullscreenchange: ((this: Element, ev: Event) => any) | null;
     onfullscreenerror: ((this: Element, ev: Event) => any) | null;
     outerHTML: string;
+    readonly ownerDocument: Document;
     /**
      * Returns the namespace prefix.
      */
@@ -5302,6 +5147,7 @@ interface Element extends Node, Animatable, ChildNode, InnerHTML, NonDocumentTyp
      * Creates a shadow root for element and returns it.
      */
     attachShadow(init: ShadowRootInit): ShadowRoot;
+    cloneNode(deep?: boolean): Element;
     /**
      * Returns the first (starting at element) inclusive ancestor that matches selectors, and null otherwise.
      */
@@ -6265,6 +6111,7 @@ interface HTMLAnchorElement extends HTMLElement, HTMLHyperlinkElementUtils {
      */
     text: string;
     type: string;
+    cloneNode(deep?: boolean): HTMLAnchorElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLAnchorElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLAnchorElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -6315,6 +6162,7 @@ interface HTMLAppletElement extends HTMLElement {
     vspace: number;
     /** @deprecated */
     width: string;
+    cloneNode(deep?: boolean): HTMLAppletElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLAppletElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLAppletElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -6354,6 +6202,7 @@ interface HTMLAreaElement extends HTMLElement, HTMLHyperlinkElementUtils {
      * Sets or retrieves the window or frame at which to target content.
      */
     target: string;
+    cloneNode(deep?: boolean): HTMLAreaElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLAreaElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLAreaElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -6367,6 +6216,7 @@ declare var HTMLAreaElement: {
 
 /** Provides access to the properties of <audio> elements, as well as methods to manipulate them. It derives from the HTMLMediaElement interface. */
 interface HTMLAudioElement extends HTMLMediaElement {
+    cloneNode(deep?: boolean): HTMLAudioElement;
     addEventListener<K extends keyof HTMLMediaElementEventMap>(type: K, listener: (this: HTMLAudioElement, ev: HTMLMediaElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLMediaElementEventMap>(type: K, listener: (this: HTMLAudioElement, ev: HTMLMediaElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -6385,6 +6235,7 @@ interface HTMLBRElement extends HTMLElement {
      */
     /** @deprecated */
     clear: string;
+    cloneNode(deep?: boolean): HTMLBRElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLBRElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLBRElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -6406,6 +6257,7 @@ interface HTMLBaseElement extends HTMLElement {
      * Sets or retrieves the window or frame at which to target content.
      */
     target: string;
+    cloneNode(deep?: boolean): HTMLBaseElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLBaseElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLBaseElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -6429,6 +6281,7 @@ interface HTMLBaseFontElement extends HTMLElement, DOML2DeprecatedColorProperty
      */
     /** @deprecated */
     size: number;
+    cloneNode(deep?: boolean): HTMLBaseFontElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLBaseFontElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLBaseFontElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -6460,6 +6313,7 @@ interface HTMLBodyElement extends HTMLElement, WindowEventHandlers {
     text: string;
     /** @deprecated */
     vLink: string;
+    cloneNode(deep?: boolean): HTMLBodyElement;
     addEventListener<K extends keyof HTMLBodyElementEventMap>(type: K, listener: (this: HTMLBodyElement, ev: HTMLBodyElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLBodyElementEventMap>(type: K, listener: (this: HTMLBodyElement, ev: HTMLBodyElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -6527,6 +6381,7 @@ interface HTMLButtonElement extends HTMLElement {
      * Returns whether a form will validate when it is submitted, without having to submit it.
      */
     checkValidity(): boolean;
+    cloneNode(deep?: boolean): HTMLButtonElement;
     reportValidity(): boolean;
     /**
      * Sets a custom error message that is displayed when a form is submitted.
@@ -6554,6 +6409,7 @@ interface HTMLCanvasElement extends HTMLElement {
      * Gets or sets the width of a canvas element on a document.
      */
     width: number;
+    cloneNode(deep?: boolean): HTMLCanvasElement;
     /**
      * Returns an object that provides methods and properties for drawing and manipulating images and graphics on a canvas element in a document. A context object includes information about colors, line widths, fonts, and other graphic parameters that can be drawn on a canvas.
      * @param contextId The identifier (ID) of the type of canvas to create. Internet Explorer 9 and Internet Explorer 10 support only a 2-D context using canvas.getContext("2d"); IE11 Preview also supports 3-D or WebGL context using canvas.getContext("experimental-webgl");
@@ -6616,6 +6472,7 @@ interface HTMLCollectionOf<T extends Element> extends HTMLCollectionBase {
 interface HTMLDListElement extends HTMLElement {
     /** @deprecated */
     compact: boolean;
+    cloneNode(deep?: boolean): HTMLDListElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDListElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDListElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -6630,6 +6487,7 @@ declare var HTMLDListElement: {
 /** Provides special properties (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating <data> elements. */
 interface HTMLDataElement extends HTMLElement {
     value: string;
+    cloneNode(deep?: boolean): HTMLDataElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDataElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDataElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -6644,6 +6502,7 @@ declare var HTMLDataElement: {
 /** Provides special properties (beyond the HTMLElement object interface it also has available to it by inheritance) to manipulate <datalist> elements and their content. */
 interface HTMLDataListElement extends HTMLElement {
     readonly options: HTMLCollectionOf<HTMLOptionElement>;
+    cloneNode(deep?: boolean): HTMLDataListElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDataListElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDataListElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -6657,6 +6516,7 @@ declare var HTMLDataListElement: {
 
 interface HTMLDetailsElement extends HTMLElement {
     open: boolean;
+    cloneNode(deep?: boolean): HTMLDetailsElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDetailsElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDetailsElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -6671,6 +6531,7 @@ declare var HTMLDetailsElement: {
 interface HTMLDialogElement extends HTMLElement {
     open: boolean;
     returnValue: string;
+    cloneNode(deep?: boolean): HTMLDialogElement;
     close(returnValue?: string): void;
     show(): void;
     showModal(): void;
@@ -6688,6 +6549,7 @@ declare var HTMLDialogElement: {
 interface HTMLDirectoryElement extends HTMLElement {
     /** @deprecated */
     compact: boolean;
+    cloneNode(deep?: boolean): HTMLDirectoryElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDirectoryElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDirectoryElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -6706,6 +6568,7 @@ interface HTMLDivElement extends HTMLElement {
      */
     /** @deprecated */
     align: string;
+    cloneNode(deep?: boolean): HTMLDivElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDivElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLDivElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -6719,6 +6582,7 @@ declare var HTMLDivElement: {
 
 /** The HTMLDocument property of Window objects is an alias that browsers expose for the Document interface object. */
 interface HTMLDocument extends Document {
+    cloneNode(deep?: boolean): HTMLDocument;
     addEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: HTMLDocument, ev: DocumentEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: HTMLDocument, ev: DocumentEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -6734,7 +6598,7 @@ interface HTMLElementEventMap extends ElementEventMap, GlobalEventHandlersEventM
 }
 
 /** Any HTML element. Some elements directly implement this interface, while others implement it via an interface that inherits it. */
-interface HTMLElement extends Element, DocumentAndElementEventHandlers, ElementCSSInlineStyle, ElementContentEditable, GlobalEventHandlers, HTMLOrSVGElement {
+interface HTMLElement extends Element, DocumentAndElementEventHandlers, ElementCSSInlineStyle, ElementCSSInlineStyle, ElementContentEditable, GlobalEventHandlers, HTMLOrSVGElement {
     accessKey: string;
     readonly accessKeyLabel: string;
     autocapitalize: string;
@@ -6752,6 +6616,7 @@ interface HTMLElement extends Element, DocumentAndElementEventHandlers, ElementC
     title: string;
     translate: boolean;
     click(): void;
+    cloneNode(deep?: boolean): HTMLElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -6785,6 +6650,7 @@ interface HTMLEmbedElement extends HTMLElement {
      * Sets or retrieves the width of the object.
      */
     width: string;
+    cloneNode(deep?: boolean): HTMLEmbedElement;
     getSVGDocument(): Document | null;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLEmbedElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -6823,6 +6689,7 @@ interface HTMLFieldSetElement extends HTMLElement {
      * Returns whether a form will validate when it is submitted, without having to submit it.
      */
     checkValidity(): boolean;
+    cloneNode(deep?: boolean): HTMLFieldSetElement;
     reportValidity(): boolean;
     /**
      * Sets a custom error message that is displayed when a form is submitted.
@@ -6851,6 +6718,7 @@ interface HTMLFontElement extends HTMLElement {
     face: string;
     /** @deprecated */
     size: string;
+    cloneNode(deep?: boolean): HTMLFontElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLFontElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLFontElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -6927,6 +6795,7 @@ interface HTMLFormElement extends HTMLElement {
      * Returns whether a form will validate when it is submitted, without having to submit it.
      */
     checkValidity(): boolean;
+    cloneNode(deep?: boolean): HTMLFormElement;
     reportValidity(): boolean;
     /**
      * Fires when the user resets a form.
@@ -7000,6 +6869,7 @@ interface HTMLFrameElement extends HTMLElement {
      */
     /** @deprecated */
     src: string;
+    cloneNode(deep?: boolean): HTMLFrameElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLFrameElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLFrameElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -7026,6 +6896,7 @@ interface HTMLFrameSetElement extends HTMLElement, WindowEventHandlers {
      */
     /** @deprecated */
     rows: string;
+    cloneNode(deep?: boolean): HTMLFrameSetElement;
     addEventListener<K extends keyof HTMLFrameSetElementEventMap>(type: K, listener: (this: HTMLFrameSetElement, ev: HTMLFrameSetElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLFrameSetElementEventMap>(type: K, listener: (this: HTMLFrameSetElement, ev: HTMLFrameSetElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -7058,6 +6929,7 @@ interface HTMLHRElement extends HTMLElement {
      */
     /** @deprecated */
     width: string;
+    cloneNode(deep?: boolean): HTMLHRElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLHRElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLHRElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -7071,6 +6943,7 @@ declare var HTMLHRElement: {
 
 /** Contains the descriptive information, or metadata, for a document. This object inherits all of the properties and methods described in the HTMLElement interface. */
 interface HTMLHeadElement extends HTMLElement {
+    cloneNode(deep?: boolean): HTMLHeadElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLHeadElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLHeadElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -7089,6 +6962,7 @@ interface HTMLHeadingElement extends HTMLElement {
      */
     /** @deprecated */
     align: string;
+    cloneNode(deep?: boolean): HTMLHeadingElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLHeadingElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLHeadingElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -7107,6 +6981,7 @@ interface HTMLHtmlElement extends HTMLElement {
      */
     /** @deprecated */
     version: string;
+    cloneNode(deep?: boolean): HTMLHtmlElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLHtmlElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLHtmlElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -7198,6 +7073,7 @@ interface HTMLIFrameElement extends HTMLElement {
      * Sets or retrieves the width of the object.
      */
     width: string;
+    cloneNode(deep?: boolean): HTMLIFrameElement;
     getSVGDocument(): Document | null;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLIFrameElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -7288,6 +7164,7 @@ interface HTMLImageElement extends HTMLElement {
     width: number;
     readonly x: number;
     readonly y: number;
+    cloneNode(deep?: boolean): HTMLImageElement;
     decode(): Promise<void>;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLImageElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -7464,6 +7341,7 @@ interface HTMLInputElement extends HTMLElement {
      * Returns whether a form will validate when it is submitted, without having to submit it.
      */
     checkValidity(): boolean;
+    cloneNode(deep?: boolean): HTMLInputElement;
     reportValidity(): boolean;
     /**
      * Makes the selection equal to the current object.
@@ -7512,6 +7390,7 @@ interface HTMLLIElement extends HTMLElement {
      * Sets or retrieves the value of a list item.
      */
     value: number;
+    cloneNode(deep?: boolean): HTMLLIElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLLIElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLLIElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -7534,6 +7413,7 @@ interface HTMLLabelElement extends HTMLElement {
      * Sets or retrieves the object to which the given label object is assigned.
      */
     htmlFor: string;
+    cloneNode(deep?: boolean): HTMLLabelElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLLabelElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLLabelElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -7553,6 +7433,7 @@ interface HTMLLegendElement extends HTMLElement {
      * Retrieves a reference to the form that the object is embedded in.
      */
     readonly form: HTMLFormElement | null;
+    cloneNode(deep?: boolean): HTMLLegendElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLLegendElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLLegendElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -7610,6 +7491,7 @@ interface HTMLLinkElement extends HTMLElement, LinkStyle {
      * Sets or retrieves the MIME type of the object.
      */
     type: string;
+    cloneNode(deep?: boolean): HTMLLinkElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLLinkElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLLinkElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -7631,6 +7513,7 @@ interface HTMLMapElement extends HTMLElement {
      * Sets or retrieves the name of the object.
      */
     name: string;
+    cloneNode(deep?: boolean): HTMLMapElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMapElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMapElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -7678,6 +7561,7 @@ interface HTMLMarqueeElement extends HTMLElement {
     vspace: number;
     /** @deprecated */
     width: string;
+    cloneNode(deep?: boolean): HTMLMarqueeElement;
     /** @deprecated */
     start(): void;
     /** @deprecated */
@@ -7695,16 +7579,11 @@ declare var HTMLMarqueeElement: {
 
 interface HTMLMediaElementEventMap extends HTMLElementEventMap {
     "encrypted": MediaEncryptedEvent;
-    "msneedkey": MSMediaKeyNeededEvent;
     "waitingforkey": Event;
 }
 
 /** Adds to HTMLElement the properties and methods needed to support basic media-related capabilities that are common to audio and video. */
 interface HTMLMediaElement extends HTMLElement {
-    /**
-     * Returns an AudioTrackList object with the audio tracks for a given video element.
-     */
-    readonly audioTracks: AudioTrackList;
     /**
      * Gets or sets a value that indicates whether to start playing the media automatically.
      */
@@ -7748,40 +7627,6 @@ interface HTMLMediaElement extends HTMLElement {
      */
     loop: boolean;
     readonly mediaKeys: MediaKeys | null;
-    /**
-     * Specifies the purpose of the audio or video media, such as background audio or alerts.
-     */
-    msAudioCategory: string;
-    /**
-     * Specifies the output device id that the audio will be sent to.
-     */
-    msAudioDeviceType: string;
-    readonly msGraphicsTrustStatus: MSGraphicsTrust;
-    /**
-     * Gets the MSMediaKeys object, which is used for decrypting media data, that is associated with this media element.
-     */
-    /** @deprecated */
-    readonly msKeys: MSMediaKeys;
-    /**
-     * Gets or sets whether the DLNA PlayTo device is available.
-     */
-    msPlayToDisabled: boolean;
-    /**
-     * Gets or sets the path to the preferred media source. This enables the Play To target device to stream the media content, which can be DRM protected, from a different location, such as a cloud media server.
-     */
-    msPlayToPreferredSourceUri: string;
-    /**
-     * Gets or sets the primary DLNA PlayTo device.
-     */
-    msPlayToPrimary: boolean;
-    /**
-     * Gets the source associated with the media element for use by the PlayToManager.
-     */
-    readonly msPlayToSource: any;
-    /**
-     * Specifies whether or not to enable low-latency playback on the media element.
-     */
-    msRealTime: boolean;
     /**
      * Gets or sets a flag that indicates whether the audio (either audio or the audio track on video media) is muted.
      */
@@ -7791,8 +7636,6 @@ interface HTMLMediaElement extends HTMLElement {
      */
     readonly networkState: number;
     onencrypted: ((this: HTMLMediaElement, ev: MediaEncryptedEvent) => any) | null;
-    /** @deprecated */
-    onmsneedkey: ((this: HTMLMediaElement, ev: MSMediaKeyNeededEvent) => any) | null;
     onwaitingforkey: ((this: HTMLMediaElement, ev: Event) => any) | null;
     /**
      * Gets a flag that specifies whether playback is paused.
@@ -7823,9 +7666,8 @@ interface HTMLMediaElement extends HTMLElement {
      * The address or URL of the a media resource that is to be considered.
      */
     src: string;
-    srcObject: MediaStream | MediaSource | Blob | null;
+    srcObject: MediaProvider | null;
     readonly textTracks: TextTrackList;
-    readonly videoTracks: VideoTrackList;
     /**
      * Gets or sets the volume level for audio portions of the media element.
      */
@@ -7835,25 +7677,12 @@ interface HTMLMediaElement extends HTMLElement {
      * Returns a string that specifies whether the client can play a given media resource type.
      */
     canPlayType(type: string): CanPlayTypeResult;
+    cloneNode(deep?: boolean): HTMLMediaElement;
+    fastSeek(time: number): void;
     /**
      * Resets the audio or video object and loads a new media resource.
      */
     load(): void;
-    /**
-     * Clears all effects from the media pipeline.
-     */
-    msClearEffects(): void;
-    msGetAsCastingSource(): any;
-    /**
-     * Inserts the specified audio effect into media pipeline.
-     */
-    msInsertAudioEffect(activatableClassId: string, effectRequired: boolean, config?: any): void;
-    /** @deprecated */
-    msSetMediaKeys(mediaKeys: MSMediaKeys): void;
-    /**
-     * Specifies the media protection manager for a given media pipeline.
-     */
-    msSetMediaProtectionManager(mediaProtectionManager?: any): void;
     /**
      * Pauses the current playback and sets paused to TRUE. This can be used to test whether the media is playing or paused. You can also use the pause or play events to tell whether the media is playing or not.
      */
@@ -7895,6 +7724,7 @@ declare var HTMLMediaElement: {
 interface HTMLMenuElement extends HTMLElement {
     /** @deprecated */
     compact: boolean;
+    cloneNode(deep?: boolean): HTMLMenuElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMenuElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMenuElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -7925,6 +7755,7 @@ interface HTMLMetaElement extends HTMLElement {
      */
     /** @deprecated */
     scheme: string;
+    cloneNode(deep?: boolean): HTMLMetaElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMetaElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMetaElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -7945,6 +7776,7 @@ interface HTMLMeterElement extends HTMLElement {
     min: number;
     optimum: number;
     value: number;
+    cloneNode(deep?: boolean): HTMLMeterElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMeterElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLMeterElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -7966,6 +7798,7 @@ interface HTMLModElement extends HTMLElement {
      * Sets or retrieves the date and time of a modification to the object.
      */
     dateTime: string;
+    cloneNode(deep?: boolean): HTMLModElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLModElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLModElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -7987,6 +7820,7 @@ interface HTMLOListElement extends HTMLElement {
      */
     start: number;
     type: string;
+    cloneNode(deep?: boolean): HTMLOListElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLOListElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLOListElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -8084,6 +7918,7 @@ interface HTMLObjectElement extends HTMLElement {
      * Returns whether a form will validate when it is submitted, without having to submit it.
      */
     checkValidity(): boolean;
+    cloneNode(deep?: boolean): HTMLObjectElement;
     getSVGDocument(): Document | null;
     reportValidity(): boolean;
     /**
@@ -8113,6 +7948,7 @@ interface HTMLOptGroupElement extends HTMLElement {
      * Sets or retrieves a value that you can use to implement your own label functionality for the object.
      */
     label: string;
+    cloneNode(deep?: boolean): HTMLOptGroupElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLOptGroupElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLOptGroupElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -8155,6 +7991,7 @@ interface HTMLOptionElement extends HTMLElement {
      * Sets or retrieves the value which is returned to the server when the form control is submitted.
      */
     value: string;
+    cloneNode(deep?: boolean): HTMLOptionElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLOptionElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLOptionElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -8225,6 +8062,7 @@ interface HTMLOutputElement extends HTMLElement {
     value: string;
     readonly willValidate: boolean;
     checkValidity(): boolean;
+    cloneNode(deep?: boolean): HTMLOutputElement;
     reportValidity(): boolean;
     setCustomValidity(error: string): void;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLOutputElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
@@ -8245,6 +8083,7 @@ interface HTMLParagraphElement extends HTMLElement {
      */
     /** @deprecated */
     align: string;
+    cloneNode(deep?: boolean): HTMLParagraphElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLParagraphElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLParagraphElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -8276,6 +8115,7 @@ interface HTMLParamElement extends HTMLElement {
      */
     /** @deprecated */
     valueType: string;
+    cloneNode(deep?: boolean): HTMLParamElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLParamElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLParamElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -8289,6 +8129,7 @@ declare var HTMLParamElement: {
 
 /** A <picture> HTML element. It doesn't implement specific properties or methods. */
 interface HTMLPictureElement extends HTMLElement {
+    cloneNode(deep?: boolean): HTMLPictureElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLPictureElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLPictureElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -8307,6 +8148,7 @@ interface HTMLPreElement extends HTMLElement {
      */
     /** @deprecated */
     width: number;
+    cloneNode(deep?: boolean): HTMLPreElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLPreElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLPreElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -8333,6 +8175,7 @@ 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;
+    cloneNode(deep?: boolean): HTMLProgressElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLProgressElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLProgressElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -8350,6 +8193,7 @@ interface HTMLQuoteElement extends HTMLElement {
      * Sets or retrieves reference information about the object.
      */
     cite: string;
+    cloneNode(deep?: boolean): HTMLQuoteElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLQuoteElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLQuoteElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -8399,6 +8243,7 @@ interface HTMLScriptElement extends HTMLElement {
      * Sets or retrieves the MIME type for the associated scripting engine.
      */
     type: string;
+    cloneNode(deep?: boolean): HTMLScriptElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLScriptElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLScriptElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -8475,6 +8320,7 @@ interface HTMLSelectElement extends HTMLElement {
      * Returns whether a form will validate when it is submitted, without having to submit it.
      */
     checkValidity(): boolean;
+    cloneNode(deep?: boolean): HTMLSelectElement;
     /**
      * Retrieves a select object or an object from an options collection.
      * @param name Variant of type Number or String that specifies the object or collection to retrieve. If this parameter is an integer, it is the zero-based index of the object. If this parameter is a string, all objects with matching name or id properties are retrieved, and a collection is returned if more than one match is made.
@@ -8514,6 +8360,7 @@ interface HTMLSlotElement extends HTMLElement {
     name: string;
     assignedElements(options?: AssignedNodesOptions): Element[];
     assignedNodes(options?: AssignedNodesOptions): Node[];
+    cloneNode(deep?: boolean): HTMLSlotElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLSlotElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLSlotElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -8541,6 +8388,7 @@ interface HTMLSourceElement extends HTMLElement {
      * Gets or sets the MIME type of a media resource.
      */
     type: string;
+    cloneNode(deep?: boolean): HTMLSourceElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLSourceElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLSourceElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -8554,6 +8402,7 @@ declare var HTMLSourceElement: {
 
 /** A <span> element and derives from the HTMLElement interface, but without implementing any additional properties or methods. */
 interface HTMLSpanElement extends HTMLElement {
+    cloneNode(deep?: boolean): HTMLSpanElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLSpanElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLSpanElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -8576,6 +8425,7 @@ interface HTMLStyleElement extends HTMLElement, LinkStyle {
      */
     /** @deprecated */
     type: string;
+    cloneNode(deep?: boolean): HTMLStyleElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLStyleElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLStyleElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -8594,6 +8444,7 @@ interface HTMLTableCaptionElement extends HTMLElement {
      */
     /** @deprecated */
     align: string;
+    cloneNode(deep?: boolean): HTMLTableCaptionElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableCaptionElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableCaptionElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -8664,6 +8515,7 @@ interface HTMLTableCellElement extends HTMLElement {
      */
     /** @deprecated */
     width: string;
+    cloneNode(deep?: boolean): HTMLTableCellElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableCellElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableCellElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -8697,6 +8549,7 @@ interface HTMLTableColElement extends HTMLElement {
      */
     /** @deprecated */
     width: string;
+    cloneNode(deep?: boolean): HTMLTableColElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableColElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableColElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -8709,6 +8562,7 @@ declare var HTMLTableColElement: {
 };
 
 interface HTMLTableDataCellElement extends HTMLTableCellElement {
+    cloneNode(deep?: boolean): HTMLTableDataCellElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableDataCellElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableDataCellElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -8784,6 +8638,7 @@ interface HTMLTableElement extends HTMLElement {
      */
     /** @deprecated */
     width: string;
+    cloneNode(deep?: boolean): HTMLTableElement;
     /**
      * Creates an empty caption element in the table.
      */
@@ -8835,6 +8690,7 @@ declare var HTMLTableElement: {
 
 interface HTMLTableHeaderCellElement extends HTMLTableCellElement {
     scope: string;
+    cloneNode(deep?: boolean): HTMLTableHeaderCellElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableHeaderCellElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTableHeaderCellElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -8873,6 +8729,7 @@ interface HTMLTableRowElement extends HTMLElement {
     readonly sectionRowIndex: number;
     /** @deprecated */
     vAlign: string;
+    cloneNode(deep?: boolean): HTMLTableRowElement;
     /**
      * Removes the specified cell from the table row, as well as from the cells collection.
      * @param index Number that specifies the zero-based position of the cell to remove from the table row. If no value is provided, the last cell in the cells collection is deleted.
@@ -8911,6 +8768,7 @@ interface HTMLTableSectionElement extends HTMLElement {
     readonly rows: HTMLCollectionOf<HTMLTableRowElement>;
     /** @deprecated */
     vAlign: string;
+    cloneNode(deep?: boolean): HTMLTableSectionElement;
     /**
      * Removes the specified row (tr) from the element and from the rows collection.
      * @param index Number that specifies the zero-based position in the rows collection of the row to remove.
@@ -8935,6 +8793,7 @@ declare var HTMLTableSectionElement: {
 /** Enables access to the contents of an HTML <template> element. */
 interface HTMLTemplateElement extends HTMLElement {
     readonly content: DocumentFragment;
+    cloneNode(deep?: boolean): HTMLTemplateElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTemplateElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTemplateElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -9027,6 +8886,7 @@ interface HTMLTextAreaElement extends HTMLElement {
      * Returns whether a form will validate when it is submitted, without having to submit it.
      */
     checkValidity(): boolean;
+    cloneNode(deep?: boolean): HTMLTextAreaElement;
     reportValidity(): boolean;
     /**
      * Highlights the input area of a form element.
@@ -9060,6 +8920,7 @@ declare var HTMLTextAreaElement: {
 /** Provides special properties (beyond the regular HTMLElement interface it also has available to it by inheritance) for manipulating <time> elements. */
 interface HTMLTimeElement extends HTMLElement {
     dateTime: string;
+    cloneNode(deep?: boolean): HTMLTimeElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTimeElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTimeElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -9077,6 +8938,7 @@ interface HTMLTitleElement extends HTMLElement {
      * Retrieves or sets the text of the object as a string.
      */
     text: string;
+    cloneNode(deep?: boolean): HTMLTitleElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTitleElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLTitleElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -9097,6 +8959,7 @@ interface HTMLTrackElement extends HTMLElement {
     src: string;
     srclang: string;
     readonly track: TextTrack;
+    cloneNode(deep?: boolean): HTMLTrackElement;
     readonly ERROR: number;
     readonly LOADED: number;
     readonly LOADING: number;
@@ -9122,6 +8985,7 @@ interface HTMLUListElement extends HTMLElement {
     compact: boolean;
     /** @deprecated */
     type: string;
+    cloneNode(deep?: boolean): HTMLUListElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLUListElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLUListElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -9135,6 +8999,7 @@ declare var HTMLUListElement: {
 
 /** An invalid HTML element and derives from the HTMLElement interface, but without implementing any additional properties or methods. */
 interface HTMLUnknownElement extends HTMLElement {
+    cloneNode(deep?: boolean): HTMLUnknownElement;
     addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLUnknownElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLUnknownElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -9146,27 +9011,12 @@ declare var HTMLUnknownElement: {
     new(): HTMLUnknownElement;
 };
 
-interface HTMLVideoElementEventMap extends HTMLMediaElementEventMap {
-    "MSVideoFormatChanged": Event;
-    "MSVideoFrameStepCompleted": Event;
-    "MSVideoOptimalLayoutChanged": Event;
-}
-
 /** Provides special properties and methods for manipulating video objects. It also inherits properties and methods of HTMLMediaElement and HTMLElement. */
 interface HTMLVideoElement extends HTMLMediaElement {
     /**
      * Gets or sets the height of the video element.
      */
     height: number;
-    msHorizontalMirror: boolean;
-    readonly msIsLayoutOptimalForPlayback: boolean;
-    readonly msIsStereo3D: boolean;
-    msStereo3DPackingMode: string;
-    msStereo3DRenderMode: string;
-    msZoom: boolean;
-    onMSVideoFormatChanged: ((this: HTMLVideoElement, ev: Event) => any) | null;
-    onMSVideoFrameStepCompleted: ((this: HTMLVideoElement, ev: Event) => any) | null;
-    onMSVideoOptimalLayoutChanged: ((this: HTMLVideoElement, ev: Event) => any) | null;
     /**
      * 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.
      */
@@ -9179,23 +9029,15 @@ interface HTMLVideoElement extends HTMLMediaElement {
      * Gets the intrinsic width of a video in CSS pixels, or zero if the dimensions are not known.
      */
     readonly videoWidth: number;
-    readonly webkitDisplayingFullscreen: boolean;
-    readonly webkitSupportsFullscreen: boolean;
     /**
      * Gets or sets the width of the video element.
      */
     width: number;
+    cloneNode(deep?: boolean): HTMLVideoElement;
     getVideoPlaybackQuality(): VideoPlaybackQuality;
-    msFrameStep(forward: boolean): void;
-    msInsertVideoEffect(activatableClassId: string, effectRequired: boolean, config?: any): void;
-    msSetVideoRectangle(left: number, top: number, right: number, bottom: number): void;
-    webkitEnterFullScreen(): void;
-    webkitEnterFullscreen(): void;
-    webkitExitFullScreen(): void;
-    webkitExitFullscreen(): void;
-    addEventListener<K extends keyof HTMLVideoElementEventMap>(type: K, listener: (this: HTMLVideoElement, ev: HTMLVideoElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
+    addEventListener<K extends keyof HTMLMediaElementEventMap>(type: K, listener: (this: HTMLVideoElement, ev: HTMLMediaElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
-    removeEventListener<K extends keyof HTMLVideoElementEventMap>(type: K, listener: (this: HTMLVideoElement, ev: HTMLVideoElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
+    removeEventListener<K extends keyof HTMLMediaElementEventMap>(type: K, listener: (this: HTMLVideoElement, ev: HTMLMediaElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
     removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
 }
 
@@ -9774,15 +9616,6 @@ declare var ImageBitmap: {
     new(): ImageBitmap;
 };
 
-interface ImageBitmapOptions {
-    colorSpaceConversion?: "none" | "default";
-    imageOrientation?: "none" | "flipY";
-    premultiplyAlpha?: "none" | "premultiply" | "default";
-    resizeHeight?: number;
-    resizeQuality?: "pixelated" | "low" | "medium" | "high";
-    resizeWidth?: number;
-}
-
 interface ImageBitmapRenderingContext {
     /**
      * Returns the canvas element that the context is bound to.
@@ -9925,7 +9758,7 @@ declare var KeyframeEffect: {
 };
 
 interface LinkStyle {
-    readonly sheet: StyleSheet | null;
+    readonly sheet: CSSStyleSheet | null;
 }
 
 interface ListeningStateChangedEvent extends Event {
@@ -10330,12 +10163,10 @@ declare var MediaEncryptedEvent: {
 interface MediaError {
     readonly code: number;
     readonly message: string;
-    readonly msExtendedCode: number;
     readonly MEDIA_ERR_ABORTED: number;
     readonly MEDIA_ERR_DECODE: number;
     readonly MEDIA_ERR_NETWORK: number;
     readonly MEDIA_ERR_SRC_NOT_SUPPORTED: number;
-    readonly MS_MEDIA_ERR_ENCRYPTED: number;
 }
 
 declare var MediaError: {
@@ -10345,7 +10176,6 @@ declare var MediaError: {
     readonly MEDIA_ERR_DECODE: number;
     readonly MEDIA_ERR_NETWORK: number;
     readonly MEDIA_ERR_SRC_NOT_SUPPORTED: number;
-    readonly MS_MEDIA_ERR_ENCRYPTED: number;
 };
 
 /** This EncryptedMediaExtensions API interface contains the content and related data when the content decryption module generates a message for the session. */
@@ -10928,6 +10758,8 @@ interface Navigator extends MSFileSaver, MSNavigatorDoNotTrack, NavigatorAutomat
     getVRDisplays(): Promise<VRDisplay[]>;
     msLaunchUri(uri: string, successCallback?: MSLaunchUriCallback, noHandlerCallback?: MSLaunchUriCallback): void;
     requestMediaKeySystemAccess(keySystem: string, supportedConfigurations: MediaKeySystemConfiguration[]): Promise<MediaKeySystemAccess>;
+    sendBeacon(url: string, data?: BodyInit | null): boolean;
+    share(data?: ShareData): Promise<void>;
     vibrate(pattern: number | number[]): boolean;
 }
 
@@ -10961,14 +10793,12 @@ interface NavigatorID {
     readonly appCodeName: string;
     readonly appName: string;
     readonly appVersion: string;
-    readonly oscpu: string;
     readonly platform: string;
     readonly product: string;
     readonly productSub: string;
     readonly userAgent: string;
     readonly vendor: string;
     readonly vendorSub: string;
-    taintEnabled(): boolean;
 }
 
 interface NavigatorLanguage {
@@ -12045,8 +11875,10 @@ interface PositionError {
 }
 
 /** A processing instruction embeds application-specific instructions in XML which can be ignored by other applications that don't recognize them. */
-interface ProcessingInstruction extends CharacterData {
+interface ProcessingInstruction extends CharacterData, LinkStyle {
+    readonly ownerDocument: Document;
     readonly target: string;
+    cloneNode(deep?: boolean): ProcessingInstruction;
 }
 
 declare var ProcessingInstruction: {
@@ -12882,6 +12714,7 @@ declare var Response: {
 /** Provides access to the properties of <a> element, as well as methods to manipulate them. */
 interface SVGAElement extends SVGGraphicsElement, SVGURIReference {
     readonly target: SVGAnimatedString;
+    cloneNode(deep?: boolean): SVGAElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGAElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGAElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -12919,6 +12752,7 @@ declare var SVGAngle: {
 };
 
 interface SVGAnimateElement extends SVGAnimationElement {
+    cloneNode(deep?: boolean): SVGAnimateElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGAnimateElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGAnimateElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -12931,6 +12765,7 @@ declare var SVGAnimateElement: {
 };
 
 interface SVGAnimateMotionElement extends SVGAnimationElement {
+    cloneNode(deep?: boolean): SVGAnimateMotionElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGAnimateMotionElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGAnimateMotionElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -12943,6 +12778,7 @@ declare var SVGAnimateMotionElement: {
 };
 
 interface SVGAnimateTransformElement extends SVGAnimationElement {
+    cloneNode(deep?: boolean): SVGAnimateTransformElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGAnimateTransformElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGAnimateTransformElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13093,6 +12929,7 @@ declare var SVGAnimatedTransformList: {
 
 interface SVGAnimationElement extends SVGElement {
     readonly targetElement: SVGElement;
+    cloneNode(deep?: boolean): SVGAnimationElement;
     getCurrentTime(): number;
     getSimpleDuration(): number;
     getStartTime(): number;
@@ -13112,6 +12949,7 @@ interface SVGCircleElement extends SVGGeometryElement {
     readonly cx: SVGAnimatedLength;
     readonly cy: SVGAnimatedLength;
     readonly r: SVGAnimatedLength;
+    cloneNode(deep?: boolean): SVGCircleElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGCircleElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGCircleElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13127,6 +12965,7 @@ declare var SVGCircleElement: {
 interface SVGClipPathElement extends SVGElement {
     readonly clipPathUnits: SVGAnimatedEnumeration;
     readonly transform: SVGAnimatedTransformList;
+    cloneNode(deep?: boolean): SVGClipPathElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGClipPathElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGClipPathElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13147,6 +12986,7 @@ interface SVGComponentTransferFunctionElement extends SVGElement {
     readonly slope: SVGAnimatedNumber;
     readonly tableValues: SVGAnimatedNumberList;
     readonly type: SVGAnimatedEnumeration;
+    cloneNode(deep?: boolean): SVGComponentTransferFunctionElement;
     readonly SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE: number;
     readonly SVG_FECOMPONENTTRANSFER_TYPE_GAMMA: number;
     readonly SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY: number;
@@ -13173,6 +13013,7 @@ declare var SVGComponentTransferFunctionElement: {
 interface SVGCursorElement extends SVGElement {
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
+    cloneNode(deep?: boolean): SVGCursorElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGCursorElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGCursorElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13186,6 +13027,7 @@ declare var SVGCursorElement: {
 
 /** Corresponds to the <defs> element. */
 interface SVGDefsElement extends SVGGraphicsElement {
+    cloneNode(deep?: boolean): SVGDefsElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGDefsElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGDefsElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13199,6 +13041,7 @@ declare var SVGDefsElement: {
 
 /** Corresponds to the <desc> element. */
 interface SVGDescElement extends SVGElement {
+    cloneNode(deep?: boolean): SVGDescElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGDescElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGDescElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13214,11 +13057,12 @@ interface SVGElementEventMap extends ElementEventMap, GlobalEventHandlersEventMa
 }
 
 /** All of the SVG DOM interfaces that correspond directly to elements in the SVG language derive from the SVGElement interface. */
-interface SVGElement extends Element, DocumentAndElementEventHandlers, ElementCSSInlineStyle, GlobalEventHandlers, HTMLOrSVGElement, SVGElementInstance {
+interface SVGElement extends Element, DocumentAndElementEventHandlers, DocumentAndElementEventHandlers, ElementCSSInlineStyle, GlobalEventHandlers, GlobalEventHandlers, HTMLOrSVGElement, SVGElementInstance {
     /** @deprecated */
     readonly className: any;
     readonly ownerSVGElement: SVGSVGElement | null;
     readonly viewportElement: SVGElement | null;
+    cloneNode(deep?: boolean): SVGElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13258,6 +13102,7 @@ interface SVGEllipseElement extends SVGGeometryElement {
     readonly cy: SVGAnimatedLength;
     readonly rx: SVGAnimatedLength;
     readonly ry: SVGAnimatedLength;
+    cloneNode(deep?: boolean): SVGEllipseElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGEllipseElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGEllipseElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13274,6 +13119,7 @@ interface SVGFEBlendElement extends SVGElement, SVGFilterPrimitiveStandardAttrib
     readonly in1: SVGAnimatedString;
     readonly in2: SVGAnimatedString;
     readonly mode: SVGAnimatedEnumeration;
+    cloneNode(deep?: boolean): SVGFEBlendElement;
     readonly SVG_FEBLEND_MODE_COLOR: number;
     readonly SVG_FEBLEND_MODE_COLOR_BURN: number;
     readonly SVG_FEBLEND_MODE_COLOR_DODGE: number;
@@ -13324,6 +13170,7 @@ interface SVGFEColorMatrixElement extends SVGElement, SVGFilterPrimitiveStandard
     readonly in1: SVGAnimatedString;
     readonly type: SVGAnimatedEnumeration;
     readonly values: SVGAnimatedNumberList;
+    cloneNode(deep?: boolean): SVGFEColorMatrixElement;
     readonly SVG_FECOLORMATRIX_TYPE_HUEROTATE: number;
     readonly SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA: number;
     readonly SVG_FECOLORMATRIX_TYPE_MATRIX: number;
@@ -13348,6 +13195,7 @@ declare var SVGFEColorMatrixElement: {
 /** Corresponds to the <feComponentTransfer> element. */
 interface SVGFEComponentTransferElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly in1: SVGAnimatedString;
+    cloneNode(deep?: boolean): SVGFEComponentTransferElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEComponentTransferElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEComponentTransferElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13368,6 +13216,7 @@ interface SVGFECompositeElement extends SVGElement, SVGFilterPrimitiveStandardAt
     readonly k3: SVGAnimatedNumber;
     readonly k4: SVGAnimatedNumber;
     readonly operator: SVGAnimatedEnumeration;
+    cloneNode(deep?: boolean): SVGFECompositeElement;
     readonly SVG_FECOMPOSITE_OPERATOR_ARITHMETIC: number;
     readonly SVG_FECOMPOSITE_OPERATOR_ATOP: number;
     readonly SVG_FECOMPOSITE_OPERATOR_IN: number;
@@ -13407,6 +13256,7 @@ interface SVGFEConvolveMatrixElement extends SVGElement, SVGFilterPrimitiveStand
     readonly preserveAlpha: SVGAnimatedBoolean;
     readonly targetX: SVGAnimatedInteger;
     readonly targetY: SVGAnimatedInteger;
+    cloneNode(deep?: boolean): SVGFEConvolveMatrixElement;
     readonly SVG_EDGEMODE_DUPLICATE: number;
     readonly SVG_EDGEMODE_NONE: number;
     readonly SVG_EDGEMODE_UNKNOWN: number;
@@ -13433,6 +13283,7 @@ interface SVGFEDiffuseLightingElement extends SVGElement, SVGFilterPrimitiveStan
     readonly kernelUnitLengthX: SVGAnimatedNumber;
     readonly kernelUnitLengthY: SVGAnimatedNumber;
     readonly surfaceScale: SVGAnimatedNumber;
+    cloneNode(deep?: boolean): SVGFEDiffuseLightingElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEDiffuseLightingElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEDiffuseLightingElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13451,6 +13302,7 @@ interface SVGFEDisplacementMapElement extends SVGElement, SVGFilterPrimitiveStan
     readonly scale: SVGAnimatedNumber;
     readonly xChannelSelector: SVGAnimatedEnumeration;
     readonly yChannelSelector: SVGAnimatedEnumeration;
+    cloneNode(deep?: boolean): SVGFEDisplacementMapElement;
     readonly SVG_CHANNEL_A: number;
     readonly SVG_CHANNEL_B: number;
     readonly SVG_CHANNEL_G: number;
@@ -13476,6 +13328,7 @@ declare var SVGFEDisplacementMapElement: {
 interface SVGFEDistantLightElement extends SVGElement {
     readonly azimuth: SVGAnimatedNumber;
     readonly elevation: SVGAnimatedNumber;
+    cloneNode(deep?: boolean): SVGFEDistantLightElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEDistantLightElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEDistantLightElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13493,6 +13346,7 @@ interface SVGFEDropShadowElement extends SVGElement, SVGFilterPrimitiveStandardA
     readonly in1: SVGAnimatedString;
     readonly stdDeviationX: SVGAnimatedNumber;
     readonly stdDeviationY: SVGAnimatedNumber;
+    cloneNode(deep?: boolean): SVGFEDropShadowElement;
     setStdDeviation(stdDeviationX: number, stdDeviationY: number): void;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEDropShadowElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -13507,6 +13361,7 @@ declare var SVGFEDropShadowElement: {
 
 /** Corresponds to the <feFlood> element. */
 interface SVGFEFloodElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
+    cloneNode(deep?: boolean): SVGFEFloodElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFloodElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFloodElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13520,6 +13375,7 @@ declare var SVGFEFloodElement: {
 
 /** Corresponds to the <feFuncA> element. */
 interface SVGFEFuncAElement extends SVGComponentTransferFunctionElement {
+    cloneNode(deep?: boolean): SVGFEFuncAElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFuncAElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFuncAElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13533,6 +13389,7 @@ declare var SVGFEFuncAElement: {
 
 /** Corresponds to the <feFuncB> element. */
 interface SVGFEFuncBElement extends SVGComponentTransferFunctionElement {
+    cloneNode(deep?: boolean): SVGFEFuncBElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFuncBElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFuncBElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13546,6 +13403,7 @@ declare var SVGFEFuncBElement: {
 
 /** Corresponds to the <feFuncG> element. */
 interface SVGFEFuncGElement extends SVGComponentTransferFunctionElement {
+    cloneNode(deep?: boolean): SVGFEFuncGElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFuncGElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFuncGElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13559,6 +13417,7 @@ declare var SVGFEFuncGElement: {
 
 /** Corresponds to the <feFuncR> element. */
 interface SVGFEFuncRElement extends SVGComponentTransferFunctionElement {
+    cloneNode(deep?: boolean): SVGFEFuncRElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFuncRElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEFuncRElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13575,6 +13434,7 @@ interface SVGFEGaussianBlurElement extends SVGElement, SVGFilterPrimitiveStandar
     readonly in1: SVGAnimatedString;
     readonly stdDeviationX: SVGAnimatedNumber;
     readonly stdDeviationY: SVGAnimatedNumber;
+    cloneNode(deep?: boolean): SVGFEGaussianBlurElement;
     setStdDeviation(stdDeviationX: number, stdDeviationY: number): void;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEGaussianBlurElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -13590,6 +13450,7 @@ declare var SVGFEGaussianBlurElement: {
 /** Corresponds to the <feImage> element. */
 interface SVGFEImageElement extends SVGElement, SVGFilterPrimitiveStandardAttributes, SVGURIReference {
     readonly preserveAspectRatio: SVGAnimatedPreserveAspectRatio;
+    cloneNode(deep?: boolean): SVGFEImageElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEImageElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEImageElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13603,6 +13464,7 @@ declare var SVGFEImageElement: {
 
 /** Corresponds to the <feMerge> element. */
 interface SVGFEMergeElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
+    cloneNode(deep?: boolean): SVGFEMergeElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEMergeElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEMergeElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13617,6 +13479,7 @@ declare var SVGFEMergeElement: {
 /** Corresponds to the <feMergeNode> element. */
 interface SVGFEMergeNodeElement extends SVGElement {
     readonly in1: SVGAnimatedString;
+    cloneNode(deep?: boolean): SVGFEMergeNodeElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEMergeNodeElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEMergeNodeElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13634,6 +13497,7 @@ interface SVGFEMorphologyElement extends SVGElement, SVGFilterPrimitiveStandardA
     readonly operator: SVGAnimatedEnumeration;
     readonly radiusX: SVGAnimatedNumber;
     readonly radiusY: SVGAnimatedNumber;
+    cloneNode(deep?: boolean): SVGFEMorphologyElement;
     readonly SVG_MORPHOLOGY_OPERATOR_DILATE: number;
     readonly SVG_MORPHOLOGY_OPERATOR_ERODE: number;
     readonly SVG_MORPHOLOGY_OPERATOR_UNKNOWN: number;
@@ -13656,6 +13520,7 @@ interface SVGFEOffsetElement extends SVGElement, SVGFilterPrimitiveStandardAttri
     readonly dx: SVGAnimatedNumber;
     readonly dy: SVGAnimatedNumber;
     readonly in1: SVGAnimatedString;
+    cloneNode(deep?: boolean): SVGFEOffsetElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEOffsetElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEOffsetElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13672,6 +13537,7 @@ interface SVGFEPointLightElement extends SVGElement {
     readonly x: SVGAnimatedNumber;
     readonly y: SVGAnimatedNumber;
     readonly z: SVGAnimatedNumber;
+    cloneNode(deep?: boolean): SVGFEPointLightElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEPointLightElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFEPointLightElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13691,6 +13557,7 @@ interface SVGFESpecularLightingElement extends SVGElement, SVGFilterPrimitiveSta
     readonly specularConstant: SVGAnimatedNumber;
     readonly specularExponent: SVGAnimatedNumber;
     readonly surfaceScale: SVGAnimatedNumber;
+    cloneNode(deep?: boolean): SVGFESpecularLightingElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFESpecularLightingElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFESpecularLightingElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13712,6 +13579,7 @@ interface SVGFESpotLightElement extends SVGElement {
     readonly x: SVGAnimatedNumber;
     readonly y: SVGAnimatedNumber;
     readonly z: SVGAnimatedNumber;
+    cloneNode(deep?: boolean): SVGFESpotLightElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFESpotLightElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFESpotLightElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13726,6 +13594,7 @@ declare var SVGFESpotLightElement: {
 /** Corresponds to the <feTile> element. */
 interface SVGFETileElement extends SVGElement, SVGFilterPrimitiveStandardAttributes {
     readonly in1: SVGAnimatedString;
+    cloneNode(deep?: boolean): SVGFETileElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFETileElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFETileElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13745,6 +13614,7 @@ interface SVGFETurbulenceElement extends SVGElement, SVGFilterPrimitiveStandardA
     readonly seed: SVGAnimatedNumber;
     readonly stitchTiles: SVGAnimatedEnumeration;
     readonly type: SVGAnimatedEnumeration;
+    cloneNode(deep?: boolean): SVGFETurbulenceElement;
     readonly SVG_STITCHTYPE_NOSTITCH: number;
     readonly SVG_STITCHTYPE_STITCH: number;
     readonly SVG_STITCHTYPE_UNKNOWN: number;
@@ -13776,6 +13646,7 @@ interface SVGFilterElement extends SVGElement, SVGURIReference {
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
+    cloneNode(deep?: boolean): SVGFilterElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFilterElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGFilterElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13806,6 +13677,7 @@ interface SVGForeignObjectElement extends SVGGraphicsElement {
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
+    cloneNode(deep?: boolean): SVGForeignObjectElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGForeignObjectElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGForeignObjectElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13819,6 +13691,7 @@ declare var SVGForeignObjectElement: {
 
 /** Corresponds to the <g> element. */
 interface SVGGElement extends SVGGraphicsElement {
+    cloneNode(deep?: boolean): SVGGElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGGElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGGElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13832,6 +13705,7 @@ declare var SVGGElement: {
 
 interface SVGGeometryElement extends SVGGraphicsElement {
     readonly pathLength: SVGAnimatedNumber;
+    cloneNode(deep?: boolean): SVGGeometryElement;
     getPointAtLength(distance: number): DOMPoint;
     getTotalLength(): number;
     isPointInFill(point?: DOMPointInit): boolean;
@@ -13852,6 +13726,7 @@ interface SVGGradientElement extends SVGElement, SVGURIReference {
     readonly gradientTransform: SVGAnimatedTransformList;
     readonly gradientUnits: SVGAnimatedEnumeration;
     readonly spreadMethod: SVGAnimatedEnumeration;
+    cloneNode(deep?: boolean): SVGGradientElement;
     readonly SVG_SPREADMETHOD_PAD: number;
     readonly SVG_SPREADMETHOD_REFLECT: number;
     readonly SVG_SPREADMETHOD_REPEAT: number;
@@ -13874,6 +13749,7 @@ declare var SVGGradientElement: {
 /** SVG elements whose primary purpose is to directly render graphics into a group. */
 interface SVGGraphicsElement extends SVGElement, SVGTests {
     readonly transform: SVGAnimatedTransformList;
+    cloneNode(deep?: boolean): SVGGraphicsElement;
     getBBox(options?: SVGBoundingBoxOptions): DOMRect;
     getCTM(): DOMMatrix | null;
     getScreenCTM(): DOMMatrix | null;
@@ -13895,6 +13771,7 @@ interface SVGImageElement extends SVGGraphicsElement, SVGURIReference {
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
+    cloneNode(deep?: boolean): SVGImageElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGImageElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGImageElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13968,6 +13845,7 @@ interface SVGLineElement extends SVGGeometryElement {
     readonly x2: SVGAnimatedLength;
     readonly y1: SVGAnimatedLength;
     readonly y2: SVGAnimatedLength;
+    cloneNode(deep?: boolean): SVGLineElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGLineElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGLineElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -13985,6 +13863,7 @@ interface SVGLinearGradientElement extends SVGGradientElement {
     readonly x2: SVGAnimatedLength;
     readonly y1: SVGAnimatedLength;
     readonly y2: SVGAnimatedLength;
+    cloneNode(deep?: boolean): SVGLinearGradientElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGLinearGradientElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGLinearGradientElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -14004,6 +13883,7 @@ interface SVGMarkerElement extends SVGElement, SVGFitToViewBox {
     readonly orientType: SVGAnimatedEnumeration;
     readonly refX: SVGAnimatedLength;
     readonly refY: SVGAnimatedLength;
+    cloneNode(deep?: boolean): SVGMarkerElement;
     setOrientToAngle(angle: SVGAngle): void;
     setOrientToAuto(): void;
     readonly SVG_MARKERUNITS_STROKEWIDTH: number;
@@ -14037,6 +13917,7 @@ interface SVGMaskElement extends SVGElement {
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
+    cloneNode(deep?: boolean): SVGMaskElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGMaskElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGMaskElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -14050,6 +13931,7 @@ declare var SVGMaskElement: {
 
 /** Corresponds to the <metadata> element. */
 interface SVGMetadataElement extends SVGElement {
+    cloneNode(deep?: boolean): SVGMetadataElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGMetadataElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGMetadataElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -14094,6 +13976,7 @@ declare var SVGNumberList: {
 interface SVGPathElement extends SVGGraphicsElement {
     /** @deprecated */
     readonly pathSegList: SVGPathSegList;
+    cloneNode(deep?: boolean): SVGPathElement;
     /** @deprecated */
     createSVGPathSegArcAbs(x: number, y: number, r1: number, r2: number, angle: number, largeArcFlag: boolean, sweepFlag: boolean): SVGPathSegArcAbs;
     /** @deprecated */
@@ -14432,6 +14315,7 @@ interface SVGPatternElement extends SVGElement, SVGFitToViewBox, SVGURIReference
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
+    cloneNode(deep?: boolean): SVGPatternElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGPatternElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGPatternElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -14463,6 +14347,7 @@ declare var SVGPointList: {
 
 /** Provides access to the properties of <polygon> elements, as well as methods to manipulate them. */
 interface SVGPolygonElement extends SVGGeometryElement, SVGAnimatedPoints {
+    cloneNode(deep?: boolean): SVGPolygonElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGPolygonElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGPolygonElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -14476,6 +14361,7 @@ declare var SVGPolygonElement: {
 
 /** Provides access to the properties of <polyline> elements, as well as methods to manipulate them. */
 interface SVGPolylineElement extends SVGGeometryElement, SVGAnimatedPoints {
+    cloneNode(deep?: boolean): SVGPolylineElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGPolylineElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGPolylineElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -14534,6 +14420,7 @@ interface SVGRadialGradientElement extends SVGGradientElement {
     readonly fx: SVGAnimatedLength;
     readonly fy: SVGAnimatedLength;
     readonly r: SVGAnimatedLength;
+    cloneNode(deep?: boolean): SVGRadialGradientElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGRadialGradientElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGRadialGradientElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -14553,6 +14440,7 @@ interface SVGRectElement extends SVGGeometryElement {
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
+    cloneNode(deep?: boolean): SVGRectElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGRectElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGRectElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -14596,6 +14484,7 @@ interface SVGSVGElement extends SVGGraphicsElement, DocumentEvent, SVGFitToViewB
     animationsPaused(): boolean;
     checkEnclosure(element: SVGElement, rect: SVGRect): boolean;
     checkIntersection(element: SVGElement, rect: SVGRect): boolean;
+    cloneNode(deep?: boolean): SVGSVGElement;
     createSVGAngle(): SVGAngle;
     createSVGLength(): SVGLength;
     createSVGMatrix(): SVGMatrix;
@@ -14638,6 +14527,7 @@ declare var SVGSVGElement: {
 /** Corresponds to the SVG <script> element. */
 interface SVGScriptElement extends SVGElement, SVGURIReference {
     type: string;
+    cloneNode(deep?: boolean): SVGScriptElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGScriptElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGScriptElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -14652,6 +14542,7 @@ declare var SVGScriptElement: {
 /** Corresponds to the <stop> element. */
 interface SVGStopElement extends SVGElement {
     readonly offset: SVGAnimatedNumber;
+    cloneNode(deep?: boolean): SVGStopElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGStopElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGStopElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -14688,6 +14579,7 @@ interface SVGStyleElement extends SVGElement {
     media: string;
     title: string;
     type: string;
+    cloneNode(deep?: boolean): SVGStyleElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGStyleElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGStyleElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -14701,6 +14593,7 @@ declare var SVGStyleElement: {
 
 /** Corresponds to the <switch> element. */
 interface SVGSwitchElement extends SVGGraphicsElement {
+    cloneNode(deep?: boolean): SVGSwitchElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGSwitchElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGSwitchElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -14714,6 +14607,7 @@ declare var SVGSwitchElement: {
 
 /** Corresponds to the <symbol> element. */
 interface SVGSymbolElement extends SVGElement, SVGFitToViewBox {
+    cloneNode(deep?: boolean): SVGSymbolElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGSymbolElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGSymbolElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -14727,6 +14621,7 @@ declare var SVGSymbolElement: {
 
 /** A <tspan> element. */
 interface SVGTSpanElement extends SVGTextPositioningElement {
+    cloneNode(deep?: boolean): SVGTSpanElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTSpanElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTSpanElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -14747,6 +14642,7 @@ interface SVGTests {
 interface SVGTextContentElement extends SVGGraphicsElement {
     readonly lengthAdjust: SVGAnimatedEnumeration;
     readonly textLength: SVGAnimatedLength;
+    cloneNode(deep?: boolean): SVGTextContentElement;
     getCharNumAtPosition(point?: DOMPointInit): number;
     getComputedTextLength(): number;
     getEndPositionOfChar(charnum: number): DOMPoint;
@@ -14775,6 +14671,7 @@ declare var SVGTextContentElement: {
 
 /** Corresponds to the <text> elements. */
 interface SVGTextElement extends SVGTextPositioningElement {
+    cloneNode(deep?: boolean): SVGTextElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTextElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTextElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -14791,6 +14688,7 @@ interface SVGTextPathElement extends SVGTextContentElement, SVGURIReference {
     readonly method: SVGAnimatedEnumeration;
     readonly spacing: SVGAnimatedEnumeration;
     readonly startOffset: SVGAnimatedLength;
+    cloneNode(deep?: boolean): SVGTextPathElement;
     readonly TEXTPATH_METHODTYPE_ALIGN: number;
     readonly TEXTPATH_METHODTYPE_STRETCH: number;
     readonly TEXTPATH_METHODTYPE_UNKNOWN: number;
@@ -14821,6 +14719,7 @@ interface SVGTextPositioningElement extends SVGTextContentElement {
     readonly rotate: SVGAnimatedNumberList;
     readonly x: SVGAnimatedLengthList;
     readonly y: SVGAnimatedLengthList;
+    cloneNode(deep?: boolean): SVGTextPositioningElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTextPositioningElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTextPositioningElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -14834,6 +14733,7 @@ declare var SVGTextPositioningElement: {
 
 /** Corresponds to the <title> element. */
 interface SVGTitleElement extends SVGElement {
+    cloneNode(deep?: boolean): SVGTitleElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTitleElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGTitleElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -14923,6 +14823,7 @@ interface SVGUseElement extends SVGGraphicsElement, SVGURIReference {
     readonly width: SVGAnimatedLength;
     readonly x: SVGAnimatedLength;
     readonly y: SVGAnimatedLength;
+    cloneNode(deep?: boolean): SVGUseElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGUseElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGUseElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -14938,6 +14839,7 @@ declare var SVGUseElement: {
 interface SVGViewElement extends SVGElement, SVGFitToViewBox, SVGZoomAndPan {
     /** @deprecated */
     readonly viewTarget: SVGStringList;
+    cloneNode(deep?: boolean): SVGViewElement;
     addEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGViewElement, ev: SVGElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof SVGElementEventMap>(type: K, listener: (this: SVGViewElement, ev: SVGElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -15208,6 +15110,10 @@ declare var ServiceWorkerRegistration: {
 interface ShadowRoot extends DocumentFragment, DocumentOrShadowRoot, InnerHTML {
     readonly host: Element;
     readonly mode: ShadowRootMode;
+    /**
+     * Throws a "NotSupportedError" DOMException if context object is a shadow root.
+     */
+    cloneNode(deep?: boolean): never;
 }
 
 declare var ShadowRoot: {
@@ -15215,6 +15121,22 @@ declare var ShadowRoot: {
     new(): ShadowRoot;
 };
 
+interface SharedWorker extends EventTarget, AbstractWorker {
+    /**
+     * Returns sharedWorker's MessagePort object which can be used to communicate with the global environment.
+     */
+    readonly port: MessagePort;
+    addEventListener<K extends keyof AbstractWorkerEventMap>(type: K, listener: (this: SharedWorker, ev: AbstractWorkerEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
+    removeEventListener<K extends keyof AbstractWorkerEventMap>(type: K, listener: (this: SharedWorker, ev: AbstractWorkerEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
+    removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
+}
+
+declare var SharedWorker: {
+    prototype: SharedWorker;
+    new(scriptURL: string, options?: string | WorkerOptions): SharedWorker;
+};
+
 interface Slotable {
     readonly assignedSlot: HTMLSlotElement | null;
 }
@@ -15231,7 +15153,6 @@ interface SourceBufferEventMap {
 interface SourceBuffer extends EventTarget {
     appendWindowEnd: number;
     appendWindowStart: number;
-    readonly audioTracks: AudioTrackList;
     readonly buffered: TimeRanges;
     mode: AppendMode;
     onabort: ((this: SourceBuffer, ev: Event) => any) | null;
@@ -15239,10 +15160,8 @@ interface SourceBuffer extends EventTarget {
     onupdate: ((this: SourceBuffer, ev: Event) => any) | null;
     onupdateend: ((this: SourceBuffer, ev: Event) => any) | null;
     onupdatestart: ((this: SourceBuffer, ev: Event) => any) | null;
-    readonly textTracks: TextTrackList;
     timestampOffset: number;
     readonly updating: boolean;
-    readonly videoTracks: VideoTrackList;
     abort(): void;
     appendBuffer(data: BufferSource): void;
     remove(start: number, end: number): void;
@@ -15598,8 +15517,8 @@ interface StyleSheet {
     disabled: boolean;
     readonly href: string | null;
     readonly media: MediaList;
-    readonly ownerNode: Node;
-    readonly parentStyleSheet: StyleSheet | null;
+    readonly ownerNode: Element | ProcessingInstruction | null;
+    readonly parentStyleSheet: CSSStyleSheet | null;
     readonly title: string | null;
     readonly type: string;
 }
@@ -15612,8 +15531,8 @@ declare var StyleSheet: {
 /** A list of StyleSheet. */
 interface StyleSheetList {
     readonly length: number;
-    item(index: number): StyleSheet | null;
-    [index: number]: StyleSheet;
+    item(index: number): CSSStyleSheet | null;
+    [index: number]: CSSStyleSheet;
 }
 
 declare var StyleSheetList: {
@@ -15623,24 +15542,24 @@ declare var StyleSheetList: {
 
 /** This Web Crypto API interface provides a number of low-level cryptographic functions. It is accessed via the Crypto.subtle properties available in a window context (via Window.crypto). */
 interface SubtleCrypto {
-    decrypt(algorithm: string | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<ArrayBuffer>;
-    deriveBits(algorithm: string | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, baseKey: CryptoKey, length: number): PromiseLike<ArrayBuffer>;
-    deriveKey(algorithm: string | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, baseKey: CryptoKey, derivedKeyType: string | AesDerivedKeyParams | HmacImportParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, extractable: boolean, keyUsages: string[]): PromiseLike<CryptoKey>;
-    digest(algorithm: string | Algorithm, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<ArrayBuffer>;
-    encrypt(algorithm: string | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<ArrayBuffer>;
+    decrypt(algorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<ArrayBuffer>;
+    deriveBits(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, baseKey: CryptoKey, length: number): PromiseLike<ArrayBuffer>;
+    deriveKey(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, baseKey: CryptoKey, derivedKeyType: string | AesDerivedKeyParams | HmacImportParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike<CryptoKey>;
+    digest(algorithm: AlgorithmIdentifier, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<ArrayBuffer>;
+    encrypt(algorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<ArrayBuffer>;
     exportKey(format: "jwk", key: CryptoKey): PromiseLike<JsonWebKey>;
     exportKey(format: "raw" | "pkcs8" | "spki", key: CryptoKey): PromiseLike<ArrayBuffer>;
     exportKey(format: string, key: CryptoKey): PromiseLike<JsonWebKey | ArrayBuffer>;
-    generateKey(algorithm: string, extractable: boolean, keyUsages: string[]): PromiseLike<CryptoKeyPair | CryptoKey>;
-    generateKey(algorithm: RsaHashedKeyGenParams | EcKeyGenParams | DhKeyGenParams, extractable: boolean, keyUsages: string[]): PromiseLike<CryptoKeyPair>;
-    generateKey(algorithm: AesKeyGenParams | HmacKeyGenParams | Pbkdf2Params, extractable: boolean, keyUsages: string[]): PromiseLike<CryptoKey>;
-    importKey(format: "jwk", keyData: JsonWebKey, algorithm: string | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: string[]): PromiseLike<CryptoKey>;
-    importKey(format: "raw" | "pkcs8" | "spki", keyData: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, algorithm: string | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: string[]): PromiseLike<CryptoKey>;
-    importKey(format: string, keyData: JsonWebKey | Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, algorithm: string | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: string[]): PromiseLike<CryptoKey>;
-    sign(algorithm: string | RsaPssParams | EcdsaParams | AesCmacParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<ArrayBuffer>;
-    unwrapKey(format: string, wrappedKey: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, unwrappingKey: CryptoKey, unwrapAlgorithm: string | Algorithm, unwrappedKeyAlgorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): PromiseLike<CryptoKey>;
-    verify(algorithm: string | RsaPssParams | EcdsaParams | AesCmacParams, key: CryptoKey, signature: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<boolean>;
-    wrapKey(format: string, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: string | Algorithm): PromiseLike<ArrayBuffer>;
+    generateKey(algorithm: AlgorithmIdentifier, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike<CryptoKeyPair | CryptoKey>;
+    generateKey(algorithm: RsaHashedKeyGenParams | EcKeyGenParams | DhKeyGenParams, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike<CryptoKeyPair>;
+    generateKey(algorithm: AesKeyGenParams | HmacKeyGenParams | Pbkdf2Params, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike<CryptoKey>;
+    importKey(format: "jwk", keyData: JsonWebKey, algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike<CryptoKey>;
+    importKey(format: "raw" | "pkcs8" | "spki", keyData: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike<CryptoKey>;
+    importKey(format: string, keyData: JsonWebKey | Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike<CryptoKey>;
+    sign(algorithm: AlgorithmIdentifier | RsaPssParams | EcdsaParams | AesCmacParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<ArrayBuffer>;
+    unwrapKey(format: "raw" | "pkcs8" | "spki" | "jwk" | string, wrappedKey: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, unwrappingKey: CryptoKey, unwrapAlgorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, unwrappedKeyAlgorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike<CryptoKey>;
+    verify(algorithm: AlgorithmIdentifier | RsaPssParams | EcdsaParams | AesCmacParams, key: CryptoKey, signature: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<boolean>;
+    wrapKey(format: "raw" | "pkcs8" | "spki" | "jwk" | string, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams): PromiseLike<ArrayBuffer>;
 }
 
 declare var SubtleCrypto: {
@@ -15666,6 +15585,7 @@ interface Text extends CharacterData, Slotable {
      * Returns the combined data of all direct Text node siblings.
      */
     readonly wholeText: string;
+    cloneNode(deep?: boolean): Text;
     /**
      * Splits data at the given offset and returns the remainder as Text node.
      */
@@ -15848,33 +15768,58 @@ declare var TextMetrics: {
 
 interface TextTrackEventMap {
     "cuechange": Event;
-    "error": Event;
-    "load": Event;
 }
 
 /** This interface also inherits properties from EventTarget. */
 interface TextTrack extends EventTarget {
-    readonly activeCues: TextTrackCueList;
-    readonly cues: TextTrackCueList;
+    /**
+     * Returns the text track cues from the text track list of cues that are currently active (i.e. that start before the current playback position and end after it), as a TextTrackCueList object.
+     */
+    readonly activeCues: TextTrackCueList | null;
+    /**
+     * Returns the text track list of cues, as a TextTrackCueList object.
+     */
+    readonly cues: TextTrackCueList | null;
+    /**
+     * Returns the ID of the given track.
+     * 
+     * For in-band tracks, this is the ID that can be used with a fragment if the format supports media fragment syntax, and that can be used with the getTrackById() method.
+     * 
+     * For TextTrack objects corresponding to track elements, this is the ID of the track element.
+     */
+    readonly id: string;
+    /**
+     * Returns the text track in-band metadata track dispatch type string.
+     */
     readonly inBandMetadataTrackDispatchType: string;
-    readonly kind: string;
+    /**
+     * Returns the text track kind string.
+     */
+    readonly kind: TextTrackKind;
+    /**
+     * Returns the text track label, if there is one, or the empty string otherwise (indicating that a custom label probably needs to be generated from the other attributes of the object if the object is exposed to the user).
+     */
     readonly label: string;
+    /**
+     * Returns the text track language string.
+     */
     readonly language: string;
-    mode: TextTrackMode | number;
+    /**
+     * Returns the text track mode, represented by a string from the following list:
+     * 
+     * Can be set, to change the mode.
+     */
+    mode: TextTrackMode;
     oncuechange: ((this: TextTrack, ev: Event) => any) | null;
-    onerror: ((this: TextTrack, ev: Event) => any) | null;
-    onload: ((this: TextTrack, ev: Event) => any) | null;
-    readonly readyState: number;
     readonly sourceBuffer: SourceBuffer | null;
+    /**
+     * Adds the given cue to textTrack's text track list of cues.
+     */
     addCue(cue: TextTrackCue): void;
+    /**
+     * Removes the given cue from textTrack's text track list of cues.
+     */
     removeCue(cue: TextTrackCue): void;
-    readonly DISABLED: number;
-    readonly ERROR: number;
-    readonly HIDDEN: number;
-    readonly LOADED: number;
-    readonly LOADING: number;
-    readonly NONE: number;
-    readonly SHOWING: number;
     addEventListener<K extends keyof TextTrackEventMap>(type: K, listener: (this: TextTrack, ev: TextTrackEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof TextTrackEventMap>(type: K, listener: (this: TextTrack, ev: TextTrackEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -15884,13 +15829,6 @@ interface TextTrack extends EventTarget {
 declare var TextTrack: {
     prototype: TextTrack;
     new(): TextTrack;
-    readonly DISABLED: number;
-    readonly ERROR: number;
-    readonly HIDDEN: number;
-    readonly LOADED: number;
-    readonly LOADING: number;
-    readonly NONE: number;
-    readonly SHOWING: number;
 };
 
 interface TextTrackCueEventMap {
@@ -15900,15 +15838,36 @@ interface TextTrackCueEventMap {
 
 /** TextTrackCues represent a string of text that will be displayed for some duration of time on a TextTrack. This includes the start and end times that the cue will be displayed. A TextTrackCue cannot be used directly, instead one of the derived types (e.g. VTTCue) must be used. */
 interface TextTrackCue extends EventTarget {
+    /**
+     * Returns the text track cue end time, in seconds.
+     * 
+     * Can be set.
+     */
     endTime: number;
+    /**
+     * Returns the text track cue identifier.
+     * 
+     * Can be set.
+     */
     id: string;
     onenter: ((this: TextTrackCue, ev: Event) => any) | null;
     onexit: ((this: TextTrackCue, ev: Event) => any) | null;
+    /**
+     * Returns true if the text track cue pause-on-exit flag is set, false otherwise.
+     * 
+     * Can be set.
+     */
     pauseOnExit: boolean;
+    /**
+     * Returns the text track cue start time, in seconds.
+     * 
+     * Can be set.
+     */
     startTime: number;
-    text: string;
-    readonly track: TextTrack;
-    getCueAsHTML(): DocumentFragment;
+    /**
+     * Returns the TextTrack object to which this text track cue belongs, if any, or null otherwise.
+     */
+    readonly track: TextTrack | null;
     addEventListener<K extends keyof TextTrackCueEventMap>(type: K, listener: (this: TextTrackCue, ev: TextTrackCueEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof TextTrackCueEventMap>(type: K, listener: (this: TextTrackCue, ev: TextTrackCueEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -15917,13 +15876,20 @@ interface TextTrackCue extends EventTarget {
 
 declare var TextTrackCue: {
     prototype: TextTrackCue;
-    new(startTime: number, endTime: number, text: string): TextTrackCue;
+    new(): TextTrackCue;
 };
 
 interface TextTrackCueList {
+    /**
+     * Returns the number of cues in the list.
+     */
     readonly length: number;
-    getCueById(id: string): TextTrackCue;
-    item(index: number): TextTrackCue;
+    /**
+     * Returns the first text track cue (in text track cue order) with text track cue identifier id.
+     * 
+     * Returns null if none of the cues have the given identifier or if the argument is the empty string.
+     */
+    getCueById(id: string): TextTrackCue | null;
     [index: number]: TextTrackCue;
 }
 
@@ -15943,7 +15909,7 @@ interface TextTrackList extends EventTarget {
     onaddtrack: ((this: TextTrackList, ev: TrackEvent) => any) | null;
     onchange: ((this: TextTrackList, ev: Event) => any) | null;
     onremovetrack: ((this: TextTrackList, ev: TrackEvent) => any) | null;
-    item(index: number): TextTrack;
+    getTrackById(id: string): TextTrack | null;
     addEventListener<K extends keyof TextTrackListEventMap>(type: K, listener: (this: TextTrackList, ev: TextTrackListEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof TextTrackListEventMap>(type: K, listener: (this: TextTrackList, ev: TextTrackListEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -15958,8 +15924,21 @@ declare var TextTrackList: {
 
 /** Used to represent a set of time ranges, primarily for the purpose of tracking which portions of media have been buffered when loading it for use by the <audio> and <video> elements. */
 interface TimeRanges {
+    /**
+     * Returns the number of ranges in the object.
+     */
     readonly length: number;
+    /**
+     * Returns the time for the end of the range with the given index.
+     * 
+     * Throws an "IndexSizeError" DOMException if the index is out of range.
+     */
     end(index: number): number;
+    /**
+     * Returns the time for the start of the range with the given index.
+     * 
+     * Throws an "IndexSizeError" DOMException if the index is out of range.
+     */
     start(index: number): number;
 }
 
@@ -16022,12 +16001,15 @@ declare var TouchList: {
 
 /** The TrackEvent interface, part of the HTML DOM specification, is used for events which represent changes to the set of available tracks on an HTML media element; these events are addtrack and removetrack. */
 interface TrackEvent extends Event {
-    readonly track: VideoTrack | AudioTrack | TextTrack | null;
+    /**
+     * Returns the track object (TextTrack, AudioTrack, or VideoTrack) to which the event relates.
+     */
+    readonly track: TextTrack | null;
 }
 
 declare var TrackEvent: {
     prototype: TrackEvent;
-    new(typeArg: string, eventInitDict?: TrackEventInit): TrackEvent;
+    new(type: string, eventInitDict?: TrackEventInit): TrackEvent;
 };
 
 interface TransformStream<I = any, O = any> {
@@ -16331,10 +16313,8 @@ declare var ValidityState: {
 
 /** Returned by the HTMLVideoElement.getVideoPlaybackQuality() method and contains metrics that can be used to determine the playback quality of a video. */
 interface VideoPlaybackQuality {
-    readonly corruptedVideoFrames: number;
     readonly creationTime: number;
     readonly droppedVideoFrames: number;
-    readonly totalFrameDelay: number;
     readonly totalVideoFrames: number;
 }
 
@@ -16343,48 +16323,6 @@ declare var VideoPlaybackQuality: {
     new(): VideoPlaybackQuality;
 };
 
-/** A single video track from a <video> element. */
-interface VideoTrack {
-    readonly id: string;
-    kind: string;
-    readonly label: string;
-    language: string;
-    selected: boolean;
-    readonly sourceBuffer: SourceBuffer | null;
-}
-
-declare var VideoTrack: {
-    prototype: VideoTrack;
-    new(): VideoTrack;
-};
-
-interface VideoTrackListEventMap {
-    "addtrack": TrackEvent;
-    "change": Event;
-    "removetrack": TrackEvent;
-}
-
-/** Used to represent a list of the video tracks contained within a <video> element, with each track represented by a separate VideoTrack object in the list. */
-interface VideoTrackList extends EventTarget {
-    readonly length: number;
-    onaddtrack: ((this: VideoTrackList, ev: TrackEvent) => any) | null;
-    onchange: ((this: VideoTrackList, ev: Event) => any) | null;
-    onremovetrack: ((this: VideoTrackList, ev: TrackEvent) => any) | null;
-    readonly selectedIndex: number;
-    getTrackById(id: string): VideoTrack | null;
-    item(index: number): VideoTrack;
-    addEventListener<K extends keyof VideoTrackListEventMap>(type: K, listener: (this: VideoTrackList, ev: VideoTrackListEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
-    addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
-    removeEventListener<K extends keyof VideoTrackListEventMap>(type: K, listener: (this: VideoTrackList, ev: VideoTrackListEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
-    removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
-    [index: number]: VideoTrack;
-}
-
-declare var VideoTrackList: {
-    prototype: VideoTrackList;
-    new(): VideoTrackList;
-};
-
 interface WEBGL_color_buffer_float {
     readonly FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT: GLenum;
     readonly RGBA32F_EXT: GLenum;
@@ -18610,7 +18548,7 @@ interface WindowEventMap extends GlobalEventHandlersEventMap, WindowEventHandler
 }
 
 /** A window containing a DOM document; the document property points to the DOM document loaded in that window. */
-interface Window extends EventTarget, AnimationFrameProvider, GlobalEventHandlers, WindowConsole, WindowEventHandlers, WindowLocalStorage, WindowOrWorkerGlobalScope, WindowSessionStorage {
+interface Window extends EventTarget, AnimationFrameProvider, GlobalEventHandlers, WindowEventHandlers, WindowLocalStorage, WindowOrWorkerGlobalScope, WindowSessionStorage {
     readonly applicationCache: ApplicationCache;
     readonly clientInformation: Navigator;
     readonly closed: boolean;
@@ -18628,7 +18566,6 @@ interface Window extends EventTarget, AnimationFrameProvider, GlobalEventHandler
     readonly history: History;
     readonly innerHeight: number;
     readonly innerWidth: number;
-    readonly isSecureContext: boolean;
     readonly length: number;
     location: Location;
     readonly locationbar: BarProp;
@@ -18741,10 +18678,6 @@ declare var Window: {
     new(): Window;
 };
 
-interface WindowConsole {
-    readonly console: Console;
-}
-
 interface WindowEventHandlersEventMap {
     "afterprint": Event;
     "beforeprint": Event;
@@ -18795,14 +18728,15 @@ interface WindowOrWorkerGlobalScope {
     readonly caches: CacheStorage;
     readonly crypto: Crypto;
     readonly indexedDB: IDBFactory;
+    readonly isSecureContext: boolean;
     readonly origin: string;
     readonly performance: Performance;
     atob(data: string): string;
     btoa(data: string): string;
     clearInterval(handle?: number): void;
     clearTimeout(handle?: number): void;
-    createImageBitmap(image: ImageBitmapSource): Promise<ImageBitmap>;
-    createImageBitmap(image: ImageBitmapSource, sx: number, sy: number, sw: number, sh: number): Promise<ImageBitmap>;
+    createImageBitmap(image: ImageBitmapSource, options?: ImageBitmapOptions): Promise<ImageBitmap>;
+    createImageBitmap(image: ImageBitmapSource, sx: number, sy: number, sw: number, sh: number, options?: ImageBitmapOptions): Promise<ImageBitmap>;
     fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
     queueMicrotask(callback: VoidFunction): void;
     setInterval(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;
@@ -18815,13 +18749,21 @@ interface WindowSessionStorage {
 
 interface WorkerEventMap extends AbstractWorkerEventMap {
     "message": MessageEvent;
+    "messageerror": MessageEvent;
 }
 
 /** This Web Workers API interface represents a background task that can be easily created and can send messages back to its creator. Creating a worker is as simple as calling the Worker() constructor and specifying a script to be run in the worker thread. */
 interface Worker extends EventTarget, AbstractWorker {
     onmessage: ((this: Worker, ev: MessageEvent) => any) | null;
+    onmessageerror: ((this: Worker, ev: MessageEvent) => any) | null;
+    /**
+     * Clones message and transmits it to worker's global environment. transfer can be passed as a list of objects that are to be transferred rather than cloned.
+     */
     postMessage(message: any, transfer: Transferable[]): void;
     postMessage(message: any, options?: PostMessageOptions): void;
+    /**
+     * Aborts worker's associated global environment.
+     */
     terminate(): void;
     addEventListener<K extends keyof WorkerEventMap>(type: K, listener: (this: Worker, ev: WorkerEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -18873,6 +18815,7 @@ interface WritableStreamDefaultWriter<W = any> {
 
 /** An XML document. It inherits from the generic Document and does not add any specific methods or properties to it: nevertheless, several algorithms behave differently with the two types of documents. */
 interface XMLDocument extends Document {
+    cloneNode(deep?: boolean): XMLDocument;
     addEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: XMLDocument, ev: DocumentEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: XMLDocument, ev: DocumentEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -19145,6 +19088,40 @@ declare var webkitRTCPeerConnection: {
 
 declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
 
+interface Console {
+    memory: any;
+    assert(condition?: boolean, ...data: any[]): void;
+    clear(): void;
+    count(label?: string): void;
+    countReset(label?: string): void;
+    debug(...data: any[]): void;
+    dir(item?: any, options?: any): void;
+    dirxml(...data: any[]): void;
+    error(...data: any[]): void;
+    exception(message?: string, ...optionalParams: any[]): void;
+    group(...data: any[]): void;
+    groupCollapsed(...data: any[]): void;
+    groupEnd(): void;
+    info(...data: any[]): void;
+    log(...data: any[]): void;
+    table(tabularData?: any, properties?: string[]): void;
+    time(label?: string): void;
+    timeEnd(label?: string): void;
+    timeLog(label?: string, ...data: any[]): void;
+    timeStamp(label?: string): void;
+    trace(...data: any[]): void;
+    warn(...data: any[]): void;
+}
+
+declare var console: Console;
+
+/** Holds useful CSS-related methods. No object with this interface are implemented: it contains only static methods and therefore is a utilitarian interface. */
+declare namespace CSS {
+    function escape(ident: string): string;
+    function supports(property: string, value: string): boolean;
+    function supports(conditionText: string): boolean;
+}
+
 declare namespace WebAssembly {
     interface CompileError {
     }
@@ -19275,7 +19252,7 @@ interface BlobCallback {
 }
 
 interface CustomElementConstructor {
-    new (): HTMLElement;
+    new (...params: any[]): HTMLElement;
 }
 
 interface DecodeErrorCallback {
@@ -19618,7 +19595,6 @@ declare var frames: Window;
 declare var history: History;
 declare var innerHeight: number;
 declare var innerWidth: number;
-declare var isSecureContext: boolean;
 declare var length: number;
 declare var location: Location;
 declare var locationbar: BarProp;
@@ -19726,7 +19702,6 @@ declare function toString(): string;
 declare function dispatchEvent(event: Event): boolean;
 declare var sessionStorage: Storage;
 declare var localStorage: Storage;
-declare var console: Console;
 /**
  * Fires when the user aborts the download.
  * @param ev The event.
@@ -19997,14 +19972,15 @@ declare function requestAnimationFrame(callback: FrameRequestCallback): number;
 declare var caches: CacheStorage;
 declare var crypto: Crypto;
 declare var indexedDB: IDBFactory;
+declare var isSecureContext: boolean;
 declare var origin: string;
 declare var performance: Performance;
 declare function atob(data: string): string;
 declare function btoa(data: string): string;
 declare function clearInterval(handle?: number): void;
 declare function clearTimeout(handle?: number): void;
-declare function createImageBitmap(image: ImageBitmapSource): Promise<ImageBitmap>;
-declare function createImageBitmap(image: ImageBitmapSource, sx: number, sy: number, sw: number, sh: number): Promise<ImageBitmap>;
+declare function createImageBitmap(image: ImageBitmapSource, options?: ImageBitmapOptions): Promise<ImageBitmap>;
+declare function createImageBitmap(image: ImageBitmapSource, sx: number, sy: number, sw: number, sh: number, options?: ImageBitmapOptions): Promise<ImageBitmap>;
 declare function fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
 declare function queueMicrotask(callback: VoidFunction): void;
 declare function setInterval(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;
@@ -20041,6 +20017,7 @@ type OffscreenRenderingContext = OffscreenCanvasRenderingContext2D | ImageBitmap
 type MessageEventSource = WindowProxy | MessagePort | ServiceWorker;
 type HTMLOrSVGScriptElement = HTMLScriptElement | SVGScriptElement;
 type ImageBitmapSource = CanvasImageSource | Blob | ImageData;
+type MediaProvider = MediaStream | MediaSource | Blob;
 type OnErrorEventHandler = OnErrorEventHandlerNonNull | null;
 type OnBeforeUnloadEventHandler = OnBeforeUnloadEventHandlerNonNull | null;
 type TimerHandler = string | Function;
@@ -20113,6 +20090,7 @@ type CanvasTextBaseline = "alphabetic" | "bottom" | "hanging" | "ideographic" |
 type ChannelCountMode = "clamped-max" | "explicit" | "max";
 type ChannelInterpretation = "discrete" | "speakers";
 type ClientTypes = "all" | "sharedworker" | "window" | "worker";
+type ColorSpaceConversion = "default" | "none";
 type CompositeOperation = "accumulate" | "add" | "replace";
 type CompositeOperationOrAuto = "accumulate" | "add" | "auto" | "replace";
 type CredentialMediationRequirement = "optional" | "required" | "silent";
@@ -20130,6 +20108,7 @@ type GamepadMappingType = "" | "standard";
 type IDBCursorDirection = "next" | "nextunique" | "prev" | "prevunique";
 type IDBRequestReadyState = "done" | "pending";
 type IDBTransactionMode = "readonly" | "readwrite" | "versionchange";
+type ImageOrientation = "flipY" | "none";
 type ImageSmoothingQuality = "high" | "low" | "medium";
 type IterationCompositeOperation = "accumulate" | "replace";
 type KeyFormat = "jwk" | "pkcs8" | "raw" | "spki";
@@ -20163,6 +20142,7 @@ type PermissionName = "accelerometer" | "ambient-light-sensor" | "background-syn
 type PermissionState = "denied" | "granted" | "prompt";
 type PlaybackDirection = "alternate" | "alternate-reverse" | "normal" | "reverse";
 type PositionAlignSetting = "auto" | "center" | "line-left" | "line-right";
+type PremultiplyAlpha = "default" | "none" | "premultiply";
 type PublicKeyCredentialType = "public-key";
 type PushEncryptionKeyName = "auth" | "p256dh";
 type PushPermissionState = "denied" | "granted" | "prompt";
@@ -20202,6 +20182,7 @@ type RequestCredentials = "include" | "omit" | "same-origin";
 type RequestDestination = "" | "audio" | "audioworklet" | "document" | "embed" | "font" | "image" | "manifest" | "object" | "paintworklet" | "report" | "script" | "sharedworker" | "style" | "track" | "video" | "worker" | "xslt";
 type RequestMode = "cors" | "navigate" | "no-cors" | "same-origin";
 type RequestRedirect = "error" | "follow" | "manual";
+type ResizeQuality = "high" | "low" | "medium" | "pixelated";
 type ResponseType = "basic" | "cors" | "default" | "error" | "opaque" | "opaqueredirect";
 type ScopedCredentialType = "ScopedCred";
 type ScrollBehavior = "auto" | "smooth";
diff --git a/lib/lib.dom.iterable.d.ts b/lib/lib.dom.iterable.d.ts
index f8a7b15b3f7..1200443b3f1 100644
--- a/lib/lib.dom.iterable.d.ts
+++ b/lib/lib.dom.iterable.d.ts
@@ -29,10 +29,6 @@ interface AudioParam {
 interface AudioParamMap extends ReadonlyMap<string, AudioParam> {
 }
 
-interface AudioTrackList {
-    [Symbol.iterator](): IterableIterator<AudioTrack>;
-}
-
 interface BaseAudioContext {
     createIIRFilter(feedforward: Iterable<number>, feedback: Iterable<number>): IIRFilterNode;
     createPeriodicWave(real: Iterable<number>, imag: Iterable<number>, constraints?: PeriodicWaveConstraints): PeriodicWave;
@@ -245,7 +241,7 @@ interface SpeechRecognitionResultList {
 }
 
 interface StyleSheetList {
-    [Symbol.iterator](): IterableIterator<StyleSheet>;
+    [Symbol.iterator](): IterableIterator<CSSStyleSheet>;
 }
 
 interface TextTrackCueList {
@@ -280,10 +276,6 @@ interface VRDisplay {
     requestPresent(layers: Iterable<VRLayer>): Promise<void>;
 }
 
-interface VideoTrackList {
-    [Symbol.iterator](): IterableIterator<VideoTrack>;
-}
-
 interface WEBGL_draw_buffers {
     drawBuffersWEBGL(buffers: Iterable<GLenum>): void;
 }
diff --git a/lib/lib.es2015.iterable.d.ts b/lib/lib.es2015.iterable.d.ts
index eb06bd46c28..4b44a16365a 100644
--- a/lib/lib.es2015.iterable.d.ts
+++ b/lib/lib.es2015.iterable.d.ts
@@ -220,18 +220,18 @@ interface PromiseConstructor {
     /**
      * Creates a Promise that is resolved with an array of results when all of the provided Promises
      * resolve, or rejected when any Promise is rejected.
-     * @param values An array of Promises.
+     * @param values An iterable of Promises.
      * @returns A new Promise.
      */
-    all<TAll>(values: Iterable<TAll>): Promise<(awaited TAll)[]>;
+    all<T>(values: Iterable<T | PromiseLike<T>>): Promise<(awaited T)[]>;
 
     /**
      * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
      * or rejected.
-     * @param values An array of Promises.
+     * @param values An iterable of Promises.
      * @returns A new Promise.
      */
-    race<T>(values: Iterable<T>): Promise<awaited T>;
+    race<T>(values: Iterable<T | PromiseLike<T>>): Promise<awaited T>;
 }
 
 declare namespace Reflect {
diff --git a/lib/lib.es2015.promise.d.ts b/lib/lib.es2015.promise.d.ts
index ee0519c4c10..85a1a90768d 100644
--- a/lib/lib.es2015.promise.d.ts
+++ b/lib/lib.es2015.promise.d.ts
@@ -38,7 +38,7 @@ interface PromiseConstructor {
      * @param values An array of Promises.
      * @returns A new Promise.
      */
-    all<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: readonly [T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]): Promise<[awaited T1, awaited T2, awaited T3, awaited T4, awaited T5, awaited T6, awaited T7, awaited T8, awaited T9, awaited T10]>;
+    all<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: readonly [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>, T10 | PromiseLike<T10>]): Promise<[awaited T1, awaited T2, awaited T3, awaited T4, awaited T5, awaited T6, awaited T7, awaited T8, awaited T9, awaited T10]>;
 
     /**
      * Creates a Promise that is resolved with an array of results when all of the provided Promises
@@ -46,7 +46,63 @@ interface PromiseConstructor {
      * @param values An array of Promises.
      * @returns A new Promise.
      */
-    all<T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: readonly [T1, T2, T3, T4, T5, T6, T7, T8, T9]): Promise<[awaited T1, awaited T2, awaited T3, awaited T4, awaited T5, awaited T6, awaited T7, awaited T8, awaited T9]>;
+    all<T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: readonly [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>]): Promise<[awaited T1, awaited T2, awaited T3, awaited T4, awaited T5, awaited T6, awaited T7, awaited T8, awaited T9]>;
+    
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T1, T2, T3, T4, T5, T6, T7, T8>(values: readonly [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>]): Promise<[awaited T1, awaited T2, awaited T3, awaited T4, awaited T5, awaited T6, awaited T7, awaited T8]>;
+    
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T1, T2, T3, T4, T5, T6, T7>(values: readonly [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>]): Promise<[awaited T1, awaited T2, awaited T3, awaited T4, awaited T5, awaited T6, awaited T7]>;
+    
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T1, T2, T3, T4, T5, T6>(values: readonly [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>]): Promise<[awaited T1, awaited T2, awaited T3, awaited T4, awaited T5, awaited T6]>;
+    
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T1, T2, T3, T4, T5>(values: readonly [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>, T5 | PromiseLike<T5>]): Promise<[awaited T1, awaited T2, awaited T3, awaited T4, awaited T5]>;
+    
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T1, T2, T3, T4>(values: readonly [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike<T4>]): Promise<[awaited T1, awaited T2, awaited T3, awaited T4]>;
+    
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T1, T2, T3>(values: readonly [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>]): Promise<[awaited T1, awaited T2, awaited T3]>;
+    
+    /**
+     * Creates a Promise that is resolved with an array of results when all of the provided Promises
+     * resolve, or rejected when any Promise is rejected.
+     * @param values An array of Promises.
+     * @returns A new Promise.
+     */
+    all<T1, T2>(values: readonly [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>]): Promise<[awaited T1, awaited T2]>;
 
     /**
      * Creates a Promise that is resolved with an array of results when all of the provided Promises
@@ -54,7 +110,7 @@ interface PromiseConstructor {
      * @param values An array of Promises.
      * @returns A new Promise.
      */
-    all<T1, T2, T3, T4, T5, T6, T7, T8>(values: readonly [T1, T2, T3, T4, T5, T6, T7, T8]): Promise<[awaited T1, awaited T2, awaited T3, awaited T4, awaited T5, awaited T6, awaited T7, awaited T8]>;
+    all<T extends readonly unknown[] | []>(values: T): Promise<{ -readonly [P in keyof T]: awaited T[P] }>;
 
     /**
      * Creates a Promise that is resolved with an array of results when all of the provided Promises
@@ -62,55 +118,10 @@ interface PromiseConstructor {
      * @param values An array of Promises.
      * @returns A new Promise.
      */
-    all<T1, T2, T3, T4, T5, T6, T7>(values: readonly [T1, T2, T3, T4, T5, T6, T7]): Promise<[awaited T1, awaited T2, awaited T3, awaited T4, awaited T5, awaited T6, awaited T7]>;
+    all<T>(values: readonly (T | PromiseLike<T>)[]): Promise<(awaited T)[]>;
 
-    /**
-     * Creates a Promise that is resolved with an array of results when all of the provided Promises
-     * resolve, or rejected when any Promise is rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    all<T1, T2, T3, T4, T5, T6>(values: readonly [T1, T2, T3, T4, T5, T6]): Promise<[awaited T1, awaited T2, awaited T3, awaited T4, awaited T5, awaited T6]>;
-
-    /**
-     * Creates a Promise that is resolved with an array of results when all of the provided Promises
-     * resolve, or rejected when any Promise is rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    all<T1, T2, T3, T4, T5>(values: readonly [T1, T2, T3, T4, T5]): Promise<[awaited T1, awaited T2, awaited T3, awaited T4, awaited T5]>;
-
-    /**
-     * Creates a Promise that is resolved with an array of results when all of the provided Promises
-     * resolve, or rejected when any Promise is rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    all<T1, T2, T3, T4>(values: readonly [T1, T2, T3, T4]): Promise<[awaited T1, awaited T2, awaited T3, awaited T4]>;
-
-    /**
-     * Creates a Promise that is resolved with an array of results when all of the provided Promises
-     * resolve, or rejected when any Promise is rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    all<T1, T2, T3>(values: readonly [T1, T2, T3]): Promise<[awaited T1, awaited T2, awaited T3]>;
-
-    /**
-     * Creates a Promise that is resolved with an array of results when all of the provided Promises
-     * resolve, or rejected when any Promise is rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    all<T1, T2>(values: readonly [T1, T2]): Promise<[awaited T1, awaited T2]>;
-
-    /**
-     * Creates a Promise that is resolved with an array of results when all of the provided Promises
-     * resolve, or rejected when any Promise is rejected.
-     * @param values An array of Promises.
-     * @returns A new Promise.
-     */
-    all<T>(values: readonly T[]): Promise<(awaited T)[]>;
+    // see: lib.es2015.iterable.d.ts
+    // all<T>(values: Iterable<T | PromiseLike<T>>): Promise<(awaited T)[]>;
 
     /**
      * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
@@ -118,15 +129,10 @@ interface PromiseConstructor {
      * @param values An array of Promises.
      * @returns A new Promise.
      */
-    race<T>(values: readonly T[]): Promise<awaited T>;
+    race<T>(values: readonly (T | PromiseLike<T>)[]): Promise<awaited T>;
 
-    /**
-     * Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
-     * or rejected.
-     * @param values An iterable of Promises.
-     * @returns A new Promise.
-     */
-    race<T>(values: Iterable<T>): Promise<awaited T>;
+    // see: lib.es2015.iterable.d.ts
+    // race<T>(values: Iterable<T | PromiseLike<T>>): Promise<awaited T>;
 
     /**
      * Creates a new rejected promise for the provided reason.
@@ -140,7 +146,7 @@ interface PromiseConstructor {
      * @param value A promise.
      * @returns A promise whose internal state matches the provided promise.
      */
-    resolve<T>(value: T): Promise<awaited T>;
+    resolve<T>(value: T | PromiseLike<T>): Promise<awaited T>;
 
     /**
      * Creates a new resolved promise .
diff --git a/lib/lib.es2018.promise.d.ts b/lib/lib.es2018.promise.d.ts
index 1a95d7c87c0..a745dd4b11b 100644
--- a/lib/lib.es2018.promise.d.ts
+++ b/lib/lib.es2018.promise.d.ts
@@ -28,5 +28,5 @@ interface Promise<T> {
      * @param onfinally The callback to execute when the Promise is settled (fulfilled or rejected).
      * @returns A Promise for the completion of the callback.
      */
-    finally(onfinally?: (() => void) | undefined | null): Promise<T>
+    finally(onfinally?: (() => void | PromiseLike<void>) | undefined | null): Promise<awaited T>
 }
diff --git a/lib/lib.es2019.object.d.ts b/lib/lib.es2019.object.d.ts
index 6a7b5667e14..09b937af044 100644
--- a/lib/lib.es2019.object.d.ts
+++ b/lib/lib.es2019.object.d.ts
@@ -25,7 +25,7 @@ interface ObjectConstructor {
      * Returns an object created by key-value entries for properties and methods
      * @param entries An iterable object that contains key-value entries for properties and methods.
      */
-    fromEntries<T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k in PropertyKey]: T };
+    fromEntries<T = any>(entries: Iterable<readonly [PropertyKey, T]>): { [k: string]: T };
 
     /**
      * Returns an object created by key-value entries for properties and methods
diff --git a/lib/lib.es2020.promise.d.ts b/lib/lib.es2020.promise.d.ts
index a3b2c0aa88a..b04fdf8b31c 100644
--- a/lib/lib.es2020.promise.d.ts
+++ b/lib/lib.es2020.promise.d.ts
@@ -37,8 +37,7 @@ interface PromiseConstructor {
      * @param values An array of Promises.
      * @returns A new Promise.
      */
-    allSettled<T extends readonly unknown[] | readonly [unknown]>(values: T):
-        Promise<{ -readonly [P in keyof T]: PromiseSettledResult<T[P] extends PromiseLike<infer U> ? U : T[P]> }>;
+    allSettled<T extends readonly unknown[] | []>(values: T): Promise<{ -readonly [P in keyof T]: PromiseSettledResult<awaited T[P]> }>;
 
     /**
      * Creates a Promise that is resolved with an array of results when all
@@ -46,5 +45,5 @@ interface PromiseConstructor {
      * @param values An array of Promises.
      * @returns A new Promise.
      */
-    allSettled<T>(values: Iterable<T>): Promise<PromiseSettledResult<T extends PromiseLike<infer U> ? U : T>[]>;
+    allSettled<T>(values: Iterable<T | PromiseLike<T>>): Promise<PromiseSettledResult<awaited T>[]>;
 }
diff --git a/lib/lib.es5.d.ts b/lib/lib.es5.d.ts
index eb34e6d5f94..5e308b88314 100644
--- a/lib/lib.es5.d.ts
+++ b/lib/lib.es5.d.ts
@@ -1407,7 +1407,7 @@ interface PromiseLike<T> {
      * @param onrejected The callback to execute when the Promise is rejected.
      * @returns A Promise for the completion of which ever callback is executed.
      */
-    then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: awaited T) => TResult1) | undefined | null, onrejected?: ((reason: any) => TResult2) | undefined | null): PromiseLike<awaited TResult1 | awaited TResult2>;
+    then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: awaited T) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): PromiseLike<awaited TResult1 | awaited TResult2>;
 }
 
 /**
@@ -1420,14 +1420,14 @@ interface Promise<T> {
      * @param onrejected The callback to execute when the Promise is rejected.
      * @returns A Promise for the completion of which ever callback is executed.
      */
-    then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: awaited T) => TResult1) | undefined | null, onrejected?: ((reason: any) => TResult2) | undefined | null): Promise<awaited TResult1 | awaited TResult2>;
+    then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: awaited T) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): Promise<awaited TResult1 | awaited TResult2>;
 
     /**
      * Attaches a callback for only the rejection of the Promise.
      * @param onrejected The callback to execute when the Promise is rejected.
      * @returns A Promise for the completion of the callback.
      */
-    catch<TResult = never>(onrejected?: ((reason: any) => TResult) | undefined | null): Promise<awaited T | awaited TResult>;
+    catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null): Promise<awaited T | awaited TResult>;
 }
 
 interface ArrayLike<T> {
diff --git a/lib/lib.esnext.promise.d.ts b/lib/lib.esnext.promise.d.ts
index 6a56c551288..85d2c6d3c5c 100644
--- a/lib/lib.esnext.promise.d.ts
+++ b/lib/lib.esnext.promise.d.ts
@@ -39,5 +39,5 @@ interface PromiseConstructor {
      * @param values An array or iterable of Promises.
      * @returns A new Promise.
      */
-    any<T>(values: (T | PromiseLike<T>)[] | Iterable<T | PromiseLike<T>>): Promise<T>
+    any<T>(values: (T | PromiseLike<T>)[] | Iterable<T | PromiseLike<T>>): Promise<awaited T>
 }
diff --git a/lib/lib.webworker.d.ts b/lib/lib.webworker.d.ts
index f156d916e88..88def7ad320 100644
--- a/lib/lib.webworker.d.ts
+++ b/lib/lib.webworker.d.ts
@@ -239,6 +239,15 @@ interface IDBVersionChangeEventInit extends EventInit {
     oldVersion?: number;
 }
 
+interface ImageBitmapOptions {
+    colorSpaceConversion?: ColorSpaceConversion;
+    imageOrientation?: ImageOrientation;
+    premultiplyAlpha?: PremultiplyAlpha;
+    resizeHeight?: number;
+    resizeQuality?: ResizeQuality;
+    resizeWidth?: number;
+}
+
 interface ImageBitmapRenderingContextSettings {
     alpha?: boolean;
 }
@@ -774,7 +783,7 @@ interface CanvasFillStrokeStyles {
     fillStyle: string | CanvasGradient | CanvasPattern;
     strokeStyle: string | CanvasGradient | CanvasPattern;
     createLinearGradient(x0: number, y0: number, x1: number, y1: number): CanvasGradient;
-    createPattern(image: CanvasImageSource, repetition: string): CanvasPattern | null;
+    createPattern(image: CanvasImageSource, repetition: string | null): CanvasPattern | null;
     createRadialGradient(x0: number, y0: number, r0: number, x1: number, y1: number, r1: number): CanvasGradient;
 }
 
@@ -944,40 +953,6 @@ interface ConcatParams extends Algorithm {
     publicInfo?: Uint8Array;
 }
 
-/** Provides access to the browser's debugging console (e.g. the Web Console in Firefox). The specifics of how it works varies from browser to browser, but there is a de facto set of features that are typically provided. */
-interface Console {
-    memory: any;
-    assert(condition?: boolean, message?: string, ...data: any[]): void;
-    clear(): void;
-    count(label?: string): void;
-    debug(message?: any, ...optionalParams: any[]): void;
-    dir(value?: any, ...optionalParams: any[]): void;
-    dirxml(value: any): void;
-    error(message?: any, ...optionalParams: any[]): void;
-    exception(message?: string, ...optionalParams: any[]): void;
-    group(groupTitle?: string, ...optionalParams: any[]): void;
-    groupCollapsed(groupTitle?: string, ...optionalParams: any[]): void;
-    groupEnd(): void;
-    info(message?: any, ...optionalParams: any[]): void;
-    log(message?: any, ...optionalParams: any[]): void;
-    markTimeline(label?: string): void;
-    profile(reportName?: string): void;
-    profileEnd(reportName?: string): void;
-    table(...tabularData: any[]): void;
-    time(label?: string): void;
-    timeEnd(label?: string): void;
-    timeStamp(label?: string): void;
-    timeline(label?: string): void;
-    timelineEnd(label?: string): void;
-    trace(message?: any, ...optionalParams: any[]): void;
-    warn(message?: any, ...optionalParams: any[]): void;
-}
-
-declare var Console: {
-    prototype: Console;
-    new(): Console;
-};
-
 /** This Streams API interface provides a built-in byte length queuing strategy that can be used when constructing streams. */
 interface CountQueuingStrategy extends QueuingStrategy {
     highWaterMark: number;
@@ -1284,12 +1259,24 @@ declare var DOMStringList: {
 
 interface DedicatedWorkerGlobalScopeEventMap extends WorkerGlobalScopeEventMap {
     "message": MessageEvent;
+    "messageerror": MessageEvent;
 }
 
 /** (the Worker global scope) is accessible through the self keyword. Some additional global functions, namespaces objects, and constructors, not typically associated with the worker global scope, but available on it, are listed in the JavaScript Reference. See also: Functions available to workers. */
 interface DedicatedWorkerGlobalScope extends WorkerGlobalScope, AnimationFrameProvider {
+    /**
+     * Returns dedicatedWorkerGlobal's name, i.e. the value given to the Worker constructor. Primarily useful for debugging.
+     */
+    readonly name: string;
     onmessage: ((this: DedicatedWorkerGlobalScope, ev: MessageEvent) => any) | null;
+    onmessageerror: ((this: DedicatedWorkerGlobalScope, ev: MessageEvent) => any) | null;
+    /**
+     * Aborts dedicatedWorkerGlobal.
+     */
     close(): void;
+    /**
+     * Clones message and transmits it to the Worker object associated with dedicatedWorkerGlobal. transfer can be passed as a list of objects that are to be transferred rather than cloned.
+     */
     postMessage(message: any, transfer: Transferable[]): void;
     postMessage(message: any, options?: PostMessageOptions): void;
     addEventListener<K extends keyof DedicatedWorkerGlobalScopeEventMap>(type: K, listener: (this: DedicatedWorkerGlobalScope, ev: DedicatedWorkerGlobalScopeEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
@@ -2198,15 +2185,6 @@ declare var ImageBitmap: {
     new(): ImageBitmap;
 };
 
-interface ImageBitmapOptions {
-    colorSpaceConversion?: "none" | "default";
-    imageOrientation?: "none" | "flipY";
-    premultiplyAlpha?: "none" | "premultiply" | "default";
-    resizeHeight?: number;
-    resizeQuality?: "pixelated" | "low" | "medium" | "high";
-    resizeWidth?: number;
-}
-
 interface ImageBitmapRenderingContext {
     /**
      * Returns the canvas element that the context is bound to.
@@ -2338,10 +2316,6 @@ declare var NavigationPreloadManager: {
     new(): NavigationPreloadManager;
 };
 
-interface NavigatorBeacon {
-    sendBeacon(url: string, data?: Blob | Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer | FormData | string | null): boolean;
-}
-
 interface NavigatorConcurrentHardware {
     readonly hardwareConcurrency: number;
 }
@@ -2355,6 +2329,11 @@ interface NavigatorID {
     readonly userAgent: string;
 }
 
+interface NavigatorLanguage {
+    readonly language: string;
+    readonly languages: ReadonlyArray<string>;
+}
+
 interface NavigatorOnLine {
     readonly onLine: boolean;
 }
@@ -3021,6 +3000,47 @@ declare var ServiceWorkerRegistration: {
     new(): ServiceWorkerRegistration;
 };
 
+interface SharedWorker extends EventTarget, AbstractWorker {
+    /**
+     * Returns sharedWorker's MessagePort object which can be used to communicate with the global environment.
+     */
+    readonly port: MessagePort;
+    addEventListener<K extends keyof AbstractWorkerEventMap>(type: K, listener: (this: SharedWorker, ev: AbstractWorkerEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
+    removeEventListener<K extends keyof AbstractWorkerEventMap>(type: K, listener: (this: SharedWorker, ev: AbstractWorkerEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
+    removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
+}
+
+declare var SharedWorker: {
+    prototype: SharedWorker;
+    new(scriptURL: string, options?: string | WorkerOptions): SharedWorker;
+};
+
+interface SharedWorkerGlobalScopeEventMap extends WorkerGlobalScopeEventMap {
+    "connect": MessageEvent;
+}
+
+interface SharedWorkerGlobalScope extends WorkerGlobalScope {
+    /**
+     * Returns sharedWorkerGlobal's name, i.e. the value given to the SharedWorker constructor. Multiple SharedWorker objects can correspond to the same shared worker (and SharedWorkerGlobalScope), by reusing the same name.
+     */
+    readonly name: string;
+    onconnect: ((this: SharedWorkerGlobalScope, ev: MessageEvent) => any) | null;
+    /**
+     * Aborts sharedWorkerGlobal.
+     */
+    close(): void;
+    addEventListener<K extends keyof SharedWorkerGlobalScopeEventMap>(type: K, listener: (this: SharedWorkerGlobalScope, ev: SharedWorkerGlobalScopeEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
+    addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
+    removeEventListener<K extends keyof SharedWorkerGlobalScopeEventMap>(type: K, listener: (this: SharedWorkerGlobalScope, ev: SharedWorkerGlobalScopeEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
+    removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
+}
+
+declare var SharedWorkerGlobalScope: {
+    prototype: SharedWorkerGlobalScope;
+    new(): SharedWorkerGlobalScope;
+};
+
 interface StorageManager {
     estimate(): Promise<StorageEstimate>;
     persisted(): Promise<boolean>;
@@ -3033,24 +3053,24 @@ declare var StorageManager: {
 
 /** This Web Crypto API interface provides a number of low-level cryptographic functions. It is accessed via the Crypto.subtle properties available in a window context (via Window.crypto). */
 interface SubtleCrypto {
-    decrypt(algorithm: string | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<ArrayBuffer>;
-    deriveBits(algorithm: string | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, baseKey: CryptoKey, length: number): PromiseLike<ArrayBuffer>;
-    deriveKey(algorithm: string | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, baseKey: CryptoKey, derivedKeyType: string | AesDerivedKeyParams | HmacImportParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, extractable: boolean, keyUsages: string[]): PromiseLike<CryptoKey>;
-    digest(algorithm: string | Algorithm, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<ArrayBuffer>;
-    encrypt(algorithm: string | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<ArrayBuffer>;
+    decrypt(algorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<ArrayBuffer>;
+    deriveBits(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, baseKey: CryptoKey, length: number): PromiseLike<ArrayBuffer>;
+    deriveKey(algorithm: AlgorithmIdentifier | EcdhKeyDeriveParams | DhKeyDeriveParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, baseKey: CryptoKey, derivedKeyType: string | AesDerivedKeyParams | HmacImportParams | ConcatParams | HkdfCtrParams | Pbkdf2Params, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike<CryptoKey>;
+    digest(algorithm: AlgorithmIdentifier, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<ArrayBuffer>;
+    encrypt(algorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<ArrayBuffer>;
     exportKey(format: "jwk", key: CryptoKey): PromiseLike<JsonWebKey>;
     exportKey(format: "raw" | "pkcs8" | "spki", key: CryptoKey): PromiseLike<ArrayBuffer>;
     exportKey(format: string, key: CryptoKey): PromiseLike<JsonWebKey | ArrayBuffer>;
-    generateKey(algorithm: string, extractable: boolean, keyUsages: string[]): PromiseLike<CryptoKeyPair | CryptoKey>;
-    generateKey(algorithm: RsaHashedKeyGenParams | EcKeyGenParams | DhKeyGenParams, extractable: boolean, keyUsages: string[]): PromiseLike<CryptoKeyPair>;
-    generateKey(algorithm: AesKeyGenParams | HmacKeyGenParams | Pbkdf2Params, extractable: boolean, keyUsages: string[]): PromiseLike<CryptoKey>;
-    importKey(format: "jwk", keyData: JsonWebKey, algorithm: string | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: string[]): PromiseLike<CryptoKey>;
-    importKey(format: "raw" | "pkcs8" | "spki", keyData: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, algorithm: string | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: string[]): PromiseLike<CryptoKey>;
-    importKey(format: string, keyData: JsonWebKey | Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, algorithm: string | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: string[]): PromiseLike<CryptoKey>;
-    sign(algorithm: string | RsaPssParams | EcdsaParams | AesCmacParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<ArrayBuffer>;
-    unwrapKey(format: string, wrappedKey: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, unwrappingKey: CryptoKey, unwrapAlgorithm: string | Algorithm, unwrappedKeyAlgorithm: string | Algorithm, extractable: boolean, keyUsages: string[]): PromiseLike<CryptoKey>;
-    verify(algorithm: string | RsaPssParams | EcdsaParams | AesCmacParams, key: CryptoKey, signature: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<boolean>;
-    wrapKey(format: string, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: string | Algorithm): PromiseLike<ArrayBuffer>;
+    generateKey(algorithm: AlgorithmIdentifier, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike<CryptoKeyPair | CryptoKey>;
+    generateKey(algorithm: RsaHashedKeyGenParams | EcKeyGenParams | DhKeyGenParams, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike<CryptoKeyPair>;
+    generateKey(algorithm: AesKeyGenParams | HmacKeyGenParams | Pbkdf2Params, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike<CryptoKey>;
+    importKey(format: "jwk", keyData: JsonWebKey, algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike<CryptoKey>;
+    importKey(format: "raw" | "pkcs8" | "spki", keyData: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike<CryptoKey>;
+    importKey(format: string, keyData: JsonWebKey | Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, algorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike<CryptoKey>;
+    sign(algorithm: AlgorithmIdentifier | RsaPssParams | EcdsaParams | AesCmacParams, key: CryptoKey, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<ArrayBuffer>;
+    unwrapKey(format: "raw" | "pkcs8" | "spki" | "jwk" | string, wrappedKey: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, unwrappingKey: CryptoKey, unwrapAlgorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams, unwrappedKeyAlgorithm: AlgorithmIdentifier | RsaHashedImportParams | EcKeyImportParams | HmacImportParams | DhImportKeyParams | AesKeyAlgorithm, extractable: boolean, keyUsages: KeyUsage[]): PromiseLike<CryptoKey>;
+    verify(algorithm: AlgorithmIdentifier | RsaPssParams | EcdsaParams | AesCmacParams, key: CryptoKey, signature: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer, data: Int8Array | Int16Array | Int32Array | Uint8Array | Uint16Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array | DataView | ArrayBuffer): PromiseLike<boolean>;
+    wrapKey(format: "raw" | "pkcs8" | "spki" | "jwk" | string, key: CryptoKey, wrappingKey: CryptoKey, wrapAlgorithm: AlgorithmIdentifier | RsaOaepParams | AesCtrParams | AesCbcParams | AesCmacParams | AesGcmParams | AesCfbParams): PromiseLike<ArrayBuffer>;
 }
 
 declare var SubtleCrypto: {
@@ -5362,11 +5382,6 @@ declare var WebSocket: {
     readonly OPEN: number;
 };
 
-interface WindowBase64 {
-    atob(encodedString: string): string;
-    btoa(rawString: string): string;
-}
-
 /** This ServiceWorker API interface represents the scope of a service worker client that is a document in a browser context, controlled by an active worker. The service worker client independently selects and uses a service worker for its own loading and sub-resources. */
 interface WindowClient extends Client {
     readonly ancestorOrigins: ReadonlyArray<string>;
@@ -5381,22 +5396,19 @@ declare var WindowClient: {
     new(): WindowClient;
 };
 
-interface WindowConsole {
-    readonly console: Console;
-}
-
 interface WindowOrWorkerGlobalScope {
     readonly caches: CacheStorage;
     readonly crypto: Crypto;
     readonly indexedDB: IDBFactory;
+    readonly isSecureContext: boolean;
     readonly origin: string;
     readonly performance: Performance;
     atob(data: string): string;
     btoa(data: string): string;
     clearInterval(handle?: number): void;
     clearTimeout(handle?: number): void;
-    createImageBitmap(image: ImageBitmapSource): Promise<ImageBitmap>;
-    createImageBitmap(image: ImageBitmapSource, sx: number, sy: number, sw: number, sh: number): Promise<ImageBitmap>;
+    createImageBitmap(image: ImageBitmapSource, options?: ImageBitmapOptions): Promise<ImageBitmap>;
+    createImageBitmap(image: ImageBitmapSource, sx: number, sy: number, sw: number, sh: number, options?: ImageBitmapOptions): Promise<ImageBitmap>;
     fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
     queueMicrotask(callback: VoidFunction): void;
     setInterval(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;
@@ -5405,13 +5417,21 @@ interface WindowOrWorkerGlobalScope {
 
 interface WorkerEventMap extends AbstractWorkerEventMap {
     "message": MessageEvent;
+    "messageerror": MessageEvent;
 }
 
 /** This Web Workers API interface represents a background task that can be easily created and can send messages back to its creator. Creating a worker is as simple as calling the Worker() constructor and specifying a script to be run in the worker thread. */
 interface Worker extends EventTarget, AbstractWorker {
     onmessage: ((this: Worker, ev: MessageEvent) => any) | null;
+    onmessageerror: ((this: Worker, ev: MessageEvent) => any) | null;
+    /**
+     * Clones message and transmits it to worker's global environment. transfer can be passed as a list of objects that are to be transferred rather than cloned.
+     */
     postMessage(message: any, transfer: Transferable[]): void;
     postMessage(message: any, options?: PostMessageOptions): void;
+    /**
+     * Aborts worker's associated global environment.
+     */
     terminate(): void;
     addEventListener<K extends keyof WorkerEventMap>(type: K, listener: (this: Worker, ev: WorkerEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
@@ -5426,17 +5446,34 @@ declare var Worker: {
 
 interface WorkerGlobalScopeEventMap {
     "error": ErrorEvent;
+    "languagechange": Event;
+    "offline": Event;
+    "online": Event;
+    "rejectionhandled": PromiseRejectionEvent;
+    "unhandledrejection": PromiseRejectionEvent;
 }
 
 /** This Web Workers API interface is an interface representing the scope of any worker. Workers have no browsing context; this scope contains the information usually conveyed by Window objects — in this case event handlers, the console or the associated WorkerNavigator object. Each WorkerGlobalScope has its own event loop. */
-interface WorkerGlobalScope extends EventTarget, WindowConsole, WindowOrWorkerGlobalScope, WorkerUtils {
-    readonly caches: CacheStorage;
-    readonly isSecureContext: boolean;
+interface WorkerGlobalScope extends EventTarget, WindowOrWorkerGlobalScope {
+    /**
+     * Returns workerGlobal's WorkerLocation object.
+     */
     readonly location: WorkerLocation;
+    readonly navigator: WorkerNavigator;
     onerror: ((this: WorkerGlobalScope, ev: ErrorEvent) => any) | null;
-    readonly performance: Performance;
+    onlanguagechange: ((this: WorkerGlobalScope, ev: Event) => any) | null;
+    onoffline: ((this: WorkerGlobalScope, ev: Event) => any) | null;
+    ononline: ((this: WorkerGlobalScope, ev: Event) => any) | null;
+    onrejectionhandled: ((this: WorkerGlobalScope, ev: PromiseRejectionEvent) => any) | null;
+    onunhandledrejection: ((this: WorkerGlobalScope, ev: PromiseRejectionEvent) => any) | null;
+    /**
+     * Returns workerGlobal.
+     */
     readonly self: WorkerGlobalScope & typeof globalThis;
-    msWriteProfilerMark(profilerMarkName: string): void;
+    /**
+     * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss).
+     */
+    importScripts(...urls: string[]): void;
     addEventListener<K extends keyof WorkerGlobalScopeEventMap>(type: K, listener: (this: WorkerGlobalScope, ev: WorkerGlobalScopeEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
     addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
     removeEventListener<K extends keyof WorkerGlobalScopeEventMap>(type: K, listener: (this: WorkerGlobalScope, ev: WorkerGlobalScopeEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
@@ -5468,7 +5505,7 @@ declare var WorkerLocation: {
 };
 
 /** A subset of the Navigator interface allowed to be accessed from a Worker. Such an object is initialized for each worker and is available via the WorkerGlobalScope.navigator property obtained by calling window.self.navigator. */
-interface WorkerNavigator extends NavigatorBeacon, NavigatorConcurrentHardware, NavigatorID, NavigatorOnLine, NavigatorStorage {
+interface WorkerNavigator extends NavigatorConcurrentHardware, NavigatorID, NavigatorLanguage, NavigatorOnLine, NavigatorStorage {
     readonly permissions: Permissions;
     readonly serviceWorker: ServiceWorkerContainer;
 }
@@ -5478,13 +5515,6 @@ declare var WorkerNavigator: {
     new(): WorkerNavigator;
 };
 
-interface WorkerUtils extends WindowBase64 {
-    readonly indexedDB: IDBFactory;
-    readonly msIndexedDB: IDBFactory;
-    readonly navigator: WorkerNavigator;
-    importScripts(...urls: string[]): void;
-}
-
 /** This Streams API interface provides a standard abstraction for writing streaming data to a destination, known as a sink. This object comes with built-in backpressure and queuing. */
 interface WritableStream<W = any> {
     readonly locked: boolean;
@@ -5666,6 +5696,33 @@ declare var XMLHttpRequestUpload: {
 
 declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
 
+interface Console {
+    memory: any;
+    assert(condition?: boolean, ...data: any[]): void;
+    clear(): void;
+    count(label?: string): void;
+    countReset(label?: string): void;
+    debug(...data: any[]): void;
+    dir(item?: any, options?: any): void;
+    dirxml(...data: any[]): void;
+    error(...data: any[]): void;
+    exception(message?: string, ...optionalParams: any[]): void;
+    group(...data: any[]): void;
+    groupCollapsed(...data: any[]): void;
+    groupEnd(): void;
+    info(...data: any[]): void;
+    log(...data: any[]): void;
+    table(tabularData?: any, properties?: string[]): void;
+    time(label?: string): void;
+    timeEnd(label?: string): void;
+    timeLog(label?: string, ...data: any[]): void;
+    timeStamp(label?: string): void;
+    trace(...data: any[]): void;
+    warn(...data: any[]): void;
+}
+
+declare var console: Console;
+
 declare namespace WebAssembly {
     interface Global {
         value: any;
@@ -5767,14 +5824,14 @@ declare namespace WebAssembly {
     function validate(bytes: BufferSource): boolean;
 }
 
-interface EventHandlerNonNull {
-    (event: Event): any;
-}
-
 interface FrameRequestCallback {
     (time: number): void;
 }
 
+interface OnErrorEventHandlerNonNull {
+    (event: Event | string, source?: string, lineno?: number, colno?: number, error?: Error): any;
+}
+
 interface PerformanceObserverCallback {
     (entries: PerformanceObserverEntryList, observer: PerformanceObserver): void;
 }
@@ -5823,43 +5880,60 @@ interface WritableStreamErrorCallback {
     (reason: any): void | PromiseLike<void>;
 }
 
+/**
+ * Returns dedicatedWorkerGlobal's name, i.e. the value given to the Worker constructor. Primarily useful for debugging.
+ */
+declare var name: string;
 declare var onmessage: ((this: DedicatedWorkerGlobalScope, ev: MessageEvent) => any) | null;
+declare var onmessageerror: ((this: DedicatedWorkerGlobalScope, ev: MessageEvent) => any) | null;
+/**
+ * Aborts dedicatedWorkerGlobal.
+ */
 declare function close(): void;
+/**
+ * Clones message and transmits it to the Worker object associated with dedicatedWorkerGlobal. transfer can be passed as a list of objects that are to be transferred rather than cloned.
+ */
 declare function postMessage(message: any, transfer: Transferable[]): void;
 declare function postMessage(message: any, options?: PostMessageOptions): void;
 /**
  * Dispatches a synthetic event event to target and returns true if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise.
  */
 declare function dispatchEvent(event: Event): boolean;
-declare var caches: CacheStorage;
-declare var isSecureContext: boolean;
+/**
+ * Returns workerGlobal's WorkerLocation object.
+ */
 declare var location: WorkerLocation;
+declare var navigator: WorkerNavigator;
 declare var onerror: ((this: DedicatedWorkerGlobalScope, ev: ErrorEvent) => any) | null;
-declare var performance: Performance;
+declare var onlanguagechange: ((this: DedicatedWorkerGlobalScope, ev: Event) => any) | null;
+declare var onoffline: ((this: DedicatedWorkerGlobalScope, ev: Event) => any) | null;
+declare var ononline: ((this: DedicatedWorkerGlobalScope, ev: Event) => any) | null;
+declare var onrejectionhandled: ((this: DedicatedWorkerGlobalScope, ev: PromiseRejectionEvent) => any) | null;
+declare var onunhandledrejection: ((this: DedicatedWorkerGlobalScope, ev: PromiseRejectionEvent) => any) | null;
+/**
+ * Returns workerGlobal.
+ */
 declare var self: WorkerGlobalScope & typeof globalThis;
-declare function msWriteProfilerMark(profilerMarkName: string): void;
+/**
+ * Fetches each URL in urls, executes them one-by-one in the order they are passed, and then returns (or throws if something went amiss).
+ */
+declare function importScripts(...urls: string[]): void;
 /**
  * Dispatches a synthetic event event to target and returns true if either event's cancelable attribute value is false or its preventDefault() method was not invoked, and false otherwise.
  */
 declare function dispatchEvent(event: Event): boolean;
-declare var indexedDB: IDBFactory;
-declare var msIndexedDB: IDBFactory;
-declare var navigator: WorkerNavigator;
-declare function importScripts(...urls: string[]): void;
-declare function atob(encodedString: string): string;
-declare function btoa(rawString: string): string;
-declare var console: Console;
 declare var caches: CacheStorage;
 declare var crypto: Crypto;
 declare var indexedDB: IDBFactory;
+declare var isSecureContext: boolean;
 declare var origin: string;
 declare var performance: Performance;
 declare function atob(data: string): string;
 declare function btoa(data: string): string;
 declare function clearInterval(handle?: number): void;
 declare function clearTimeout(handle?: number): void;
-declare function createImageBitmap(image: ImageBitmapSource): Promise<ImageBitmap>;
-declare function createImageBitmap(image: ImageBitmapSource, sx: number, sy: number, sw: number, sh: number): Promise<ImageBitmap>;
+declare function createImageBitmap(image: ImageBitmapSource, options?: ImageBitmapOptions): Promise<ImageBitmap>;
+declare function createImageBitmap(image: ImageBitmapSource, sx: number, sy: number, sw: number, sh: number, options?: ImageBitmapOptions): Promise<ImageBitmap>;
 declare function fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
 declare function queueMicrotask(callback: VoidFunction): void;
 declare function setInterval(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;
@@ -5879,6 +5953,7 @@ type CanvasImageSource = ImageBitmap | OffscreenCanvas;
 type OffscreenRenderingContext = OffscreenCanvasRenderingContext2D | ImageBitmapRenderingContext | WebGLRenderingContext | WebGL2RenderingContext;
 type MessageEventSource = MessagePort | ServiceWorker;
 type ImageBitmapSource = CanvasImageSource | Blob | ImageData;
+type OnErrorEventHandler = OnErrorEventHandlerNonNull | null;
 type TimerHandler = string | Function;
 type PerformanceEntryList = PerformanceEntry[];
 type PushMessageDataInit = BufferSource | string;
@@ -5917,11 +5992,13 @@ type CanvasLineJoin = "bevel" | "miter" | "round";
 type CanvasTextAlign = "center" | "end" | "left" | "right" | "start";
 type CanvasTextBaseline = "alphabetic" | "bottom" | "hanging" | "ideographic" | "middle" | "top";
 type ClientTypes = "all" | "sharedworker" | "window" | "worker";
+type ColorSpaceConversion = "default" | "none";
 type EndingType = "native" | "transparent";
 type FrameType = "auxiliary" | "nested" | "none" | "top-level";
 type IDBCursorDirection = "next" | "nextunique" | "prev" | "prevunique";
 type IDBRequestReadyState = "done" | "pending";
 type IDBTransactionMode = "readonly" | "readwrite" | "versionchange";
+type ImageOrientation = "flipY" | "none";
 type ImageSmoothingQuality = "high" | "low" | "medium";
 type KeyFormat = "jwk" | "pkcs8" | "raw" | "spki";
 type KeyType = "private" | "public" | "secret";
@@ -5931,6 +6008,7 @@ type NotificationPermission = "default" | "denied" | "granted";
 type OffscreenRenderingContextId = "2d" | "bitmaprenderer" | "webgl" | "webgl2";
 type PermissionName = "accelerometer" | "ambient-light-sensor" | "background-sync" | "bluetooth" | "camera" | "clipboard" | "device-info" | "geolocation" | "gyroscope" | "magnetometer" | "microphone" | "midi" | "notifications" | "persistent-storage" | "push" | "speaker";
 type PermissionState = "denied" | "granted" | "prompt";
+type PremultiplyAlpha = "default" | "none" | "premultiply";
 type PushEncryptionKeyName = "auth" | "p256dh";
 type PushPermissionState = "denied" | "granted" | "prompt";
 type ReferrerPolicy = "" | "no-referrer" | "no-referrer-when-downgrade" | "origin" | "origin-when-cross-origin" | "same-origin" | "strict-origin" | "strict-origin-when-cross-origin" | "unsafe-url";
@@ -5939,6 +6017,7 @@ type RequestCredentials = "include" | "omit" | "same-origin";
 type RequestDestination = "" | "audio" | "audioworklet" | "document" | "embed" | "font" | "image" | "manifest" | "object" | "paintworklet" | "report" | "script" | "sharedworker" | "style" | "track" | "video" | "worker" | "xslt";
 type RequestMode = "cors" | "navigate" | "no-cors" | "same-origin";
 type RequestRedirect = "error" | "follow" | "manual";
+type ResizeQuality = "high" | "low" | "medium" | "pixelated";
 type ResponseType = "basic" | "cors" | "default" | "error" | "opaque" | "opaqueredirect";
 type ServiceWorkerState = "activated" | "activating" | "installed" | "installing" | "parsed" | "redundant";
 type ServiceWorkerUpdateViaCache = "all" | "imports" | "none";
diff --git a/lib/protocol.d.ts b/lib/protocol.d.ts
index 16e9bfcd603..752b5931c93 100644
--- a/lib/protocol.d.ts
+++ b/lib/protocol.d.ts
@@ -1303,6 +1303,16 @@ declare namespace ts.server.protocol {
          * if true - then file should be recompiled even if it does not have any changes.
          */
         forced?: boolean;
+        includeLinePosition?: boolean;
+        /** if true - return response as object with emitSkipped and diagnostics */
+        richResponse?: boolean;
+    }
+    interface CompileOnSaveEmitFileResponse extends Response {
+        body: boolean | EmitResult;
+    }
+    interface EmitResult {
+        emitSkipped: boolean;
+        diagnostics: Diagnostic[] | DiagnosticWithLinePosition[];
     }
     /**
      * Quickinfo request; value of command field is
diff --git a/lib/tsc.js b/lib/tsc.js
index ee603072d27..8cd0ea5b3c4 100644
--- a/lib/tsc.js
+++ b/lib/tsc.js
@@ -67,7 +67,7 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "3.9";
-    ts.version = ts.versionMajorMinor + ".0-dev";
+    ts.version = ts.versionMajorMinor + ".0-beta";
     function tryGetNativeMap() {
         return typeof Map !== "undefined" && "entries" in Map.prototype ? Map : undefined;
     }
@@ -4522,6 +4522,7 @@ var ts;
         Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: diag(2395, ts.DiagnosticCategory.Error, "Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local_2395", "Individual declarations in merged declaration '{0}' must be all exported or all local."),
         Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: diag(2396, ts.DiagnosticCategory.Error, "Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters_2396", "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters."),
         Declaration_name_conflicts_with_built_in_global_identifier_0: diag(2397, ts.DiagnosticCategory.Error, "Declaration_name_conflicts_with_built_in_global_identifier_0_2397", "Declaration name conflicts with built-in global identifier '{0}'."),
+        constructor_cannot_be_used_as_a_parameter_property_name: diag(2398, ts.DiagnosticCategory.Error, "constructor_cannot_be_used_as_a_parameter_property_name_2398", "'constructor' cannot be used as a parameter property name."),
         Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: diag(2399, ts.DiagnosticCategory.Error, "Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference_2399", "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference."),
         Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: diag(2400, ts.DiagnosticCategory.Error, "Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference_2400", "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference."),
         Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: diag(2401, ts.DiagnosticCategory.Error, "Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference_2401", "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference."),
@@ -4856,6 +4857,7 @@ var ts;
         _0_needs_an_explicit_type_annotation: diag(2782, ts.DiagnosticCategory.Message, "_0_needs_an_explicit_type_annotation_2782", "'{0}' needs an explicit type annotation."),
         _0_is_specified_more_than_once_so_this_usage_will_be_overwritten: diag(2783, ts.DiagnosticCategory.Error, "_0_is_specified_more_than_once_so_this_usage_will_be_overwritten_2783", "'{0}' is specified more than once, so this usage will be overwritten."),
         get_and_set_accessors_cannot_declare_this_parameters: diag(2784, ts.DiagnosticCategory.Error, "get_and_set_accessors_cannot_declare_this_parameters_2784", "'get' and 'set' accessors cannot declare 'this' parameters."),
+        This_spread_always_overwrites_this_property: diag(2785, ts.DiagnosticCategory.Error, "This_spread_always_overwrites_this_property_2785", "This spread always overwrites this property."),
         Import_declaration_0_is_using_private_name_1: diag(4000, ts.DiagnosticCategory.Error, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -5207,6 +5209,7 @@ var ts;
         Synchronously_call_callbacks_and_update_the_state_of_directory_watchers_on_platforms_that_don_t_support_recursive_watching_natively: diag(6228, ts.DiagnosticCategory.Message, "Synchronously_call_callbacks_and_update_the_state_of_directory_watchers_on_platforms_that_don_t_supp_6228", "Synchronously call callbacks and update the state of directory watchers on platforms that don't support recursive watching natively."),
         Tag_0_expects_at_least_1_arguments_but_the_JSX_factory_2_provides_at_most_3: diag(6229, ts.DiagnosticCategory.Error, "Tag_0_expects_at_least_1_arguments_but_the_JSX_factory_2_provides_at_most_3_6229", "Tag '{0}' expects at least '{1}' arguments, but the JSX factory '{2}' provides at most '{3}'."),
         Option_0_can_only_be_specified_in_tsconfig_json_file_or_set_to_false_or_null_on_command_line: diag(6230, ts.DiagnosticCategory.Error, "Option_0_can_only_be_specified_in_tsconfig_json_file_or_set_to_false_or_null_on_command_line_6230", "Option '{0}' can only be specified in 'tsconfig.json' file or set to 'false' or 'null' on command line."),
+        Could_not_resolve_the_path_0_with_the_extensions_Colon_1: diag(6231, ts.DiagnosticCategory.Error, "Could_not_resolve_the_path_0_with_the_extensions_Colon_1_6231", "Could not resolve the path '{0}' with the extensions: {1}."),
         Projects_to_reference: diag(6300, ts.DiagnosticCategory.Message, "Projects_to_reference_6300", "Projects to reference"),
         Enable_project_compilation: diag(6302, ts.DiagnosticCategory.Message, "Enable_project_compilation_6302", "Enable project compilation"),
         Composite_projects_may_not_disable_declaration_emit: diag(6304, ts.DiagnosticCategory.Error, "Composite_projects_may_not_disable_declaration_emit_6304", "Composite projects may not disable declaration emit."),
@@ -5503,7 +5506,15 @@ var ts;
         Set_the_target_option_in_your_configuration_file_to_0: diag(95098, ts.DiagnosticCategory.Message, "Set_the_target_option_in_your_configuration_file_to_0_95098", "Set the 'target' option in your configuration file to '{0}'"),
         Set_the_module_option_in_your_configuration_file_to_0: diag(95099, ts.DiagnosticCategory.Message, "Set_the_module_option_in_your_configuration_file_to_0_95099", "Set the 'module' option in your configuration file to '{0}'"),
         Convert_invalid_character_to_its_html_entity_code: diag(95100, ts.DiagnosticCategory.Message, "Convert_invalid_character_to_its_html_entity_code_95100", "Convert invalid character to its html entity code"),
-        Wrap_invalid_character_in_an_expression_container: diag(95101, ts.DiagnosticCategory.Message, "Wrap_invalid_character_in_an_expression_container_95101", "Wrap invalid character in an expression container"),
+        Convert_all_invalid_characters_to_HTML_entity_code: diag(95101, ts.DiagnosticCategory.Message, "Convert_all_invalid_characters_to_HTML_entity_code_95101", "Convert all invalid characters to HTML entity code"),
+        Add_class_tag: diag(95102, ts.DiagnosticCategory.Message, "Add_class_tag_95102", "Add '@class' tag"),
+        Add_this_tag: diag(95103, ts.DiagnosticCategory.Message, "Add_this_tag_95103", "Add '@this' tag"),
+        Add_this_parameter: diag(95104, ts.DiagnosticCategory.Message, "Add_this_parameter_95104", "Add 'this' parameter."),
+        Convert_function_expression_0_to_arrow_function: diag(95105, ts.DiagnosticCategory.Message, "Convert_function_expression_0_to_arrow_function_95105", "Convert function expression '{0}' to arrow function"),
+        Convert_function_declaration_0_to_arrow_function: diag(95106, ts.DiagnosticCategory.Message, "Convert_function_declaration_0_to_arrow_function_95106", "Convert function declaration '{0}' to arrow function"),
+        Fix_all_implicit_this_errors: diag(95107, ts.DiagnosticCategory.Message, "Fix_all_implicit_this_errors_95107", "Fix all implicit-'this' errors"),
+        Wrap_invalid_character_in_an_expression_container: diag(95108, ts.DiagnosticCategory.Message, "Wrap_invalid_character_in_an_expression_container_95108", "Wrap invalid character in an expression container"),
+        Wrap_all_invalid_characters_in_an_expression_container: diag(95109, ts.DiagnosticCategory.Message, "Wrap_all_invalid_characters_in_an_expression_container_95109", "Wrap all invalid characters in an expression container"),
         No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, ts.DiagnosticCategory.Error, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
         Classes_may_not_have_a_field_named_constructor: diag(18006, ts.DiagnosticCategory.Error, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
         JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, ts.DiagnosticCategory.Error, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
@@ -5740,17 +5751,34 @@ var ts;
     }
     ts.getLineStarts = getLineStarts;
     function computeLineAndCharacterOfPosition(lineStarts, position) {
-        var lineNumber = ts.binarySearch(lineStarts, position, ts.identity, ts.compareValues);
-        if (lineNumber < 0) {
-            lineNumber = ~lineNumber - 1;
-            ts.Debug.assert(lineNumber !== -1, "position cannot precede the beginning of the file");
-        }
+        var lineNumber = computeLineOfPosition(lineStarts, position);
         return {
             line: lineNumber,
             character: position - lineStarts[lineNumber]
         };
     }
     ts.computeLineAndCharacterOfPosition = computeLineAndCharacterOfPosition;
+    function computeLineOfPosition(lineStarts, position, lowerBound) {
+        var lineNumber = ts.binarySearch(lineStarts, position, ts.identity, ts.compareValues, lowerBound);
+        if (lineNumber < 0) {
+            lineNumber = ~lineNumber - 1;
+            ts.Debug.assert(lineNumber !== -1, "position cannot precede the beginning of the file");
+        }
+        return lineNumber;
+    }
+    ts.computeLineOfPosition = computeLineOfPosition;
+    function getLinesBetweenPositions(sourceFile, pos1, pos2) {
+        if (pos1 === pos2)
+            return 0;
+        var lineStarts = getLineStarts(sourceFile);
+        var lower = Math.min(pos1, pos2);
+        var isNegative = lower === pos2;
+        var upper = isNegative ? pos1 : pos2;
+        var lowerLine = computeLineOfPosition(lineStarts, lower);
+        var upperLine = computeLineOfPosition(lineStarts, upper, lowerLine);
+        return isNegative ? lowerLine - upperLine : upperLine - lowerLine;
+    }
+    ts.getLinesBetweenPositions = getLinesBetweenPositions;
     function getLineAndCharacterOfPosition(sourceFile, position) {
         return computeLineAndCharacterOfPosition(getLineStarts(sourceFile), position);
     }
@@ -9617,6 +9645,7 @@ var ts;
     ts.emptyUnderscoreEscapedMap = ts.emptyMap;
     ts.externalHelpersModuleNameText = "tslib";
     ts.defaultMaximumTruncationLength = 160;
+    ts.noTruncationMaximumTruncationLength = 1000000;
     function getDeclarationOfKind(symbol, kind) {
         var declarations = symbol.declarations;
         if (declarations) {
@@ -10018,7 +10047,7 @@ var ts;
             return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos, false, true);
         }
         if (includeJsDoc && ts.hasJSDocNodes(node)) {
-            return getTokenPosOfNode(node.jsDoc[0]);
+            return getTokenPosOfNode(node.jsDoc[0], sourceFile);
         }
         if (node.kind === 325 && node._children.length > 0) {
             return getTokenPosOfNode(node._children[0], sourceFile, includeJsDoc);
@@ -12697,8 +12726,8 @@ var ts;
                 write(s);
             }
         }
-        function writeLine() {
-            if (!lineStart) {
+        function writeLine(force) {
+            if (!lineStart || force) {
                 output += newLine;
                 lineCount++;
                 linePos = output.length;
@@ -12809,6 +12838,14 @@ var ts;
             } });
     }
     ts.getTrailingSemicolonDeferringWriter = getTrailingSemicolonDeferringWriter;
+    function hostUsesCaseSensitiveFileNames(host) {
+        return host.useCaseSensitiveFileNames ? host.useCaseSensitiveFileNames() : false;
+    }
+    ts.hostUsesCaseSensitiveFileNames = hostUsesCaseSensitiveFileNames;
+    function hostGetCanonicalFileName(host) {
+        return ts.createGetCanonicalFileName(hostUsesCaseSensitiveFileNames(host));
+    }
+    ts.hostGetCanonicalFileName = hostGetCanonicalFileName;
     function getResolvedExternalModuleName(host, file, referenceFile) {
         return file.moduleName || getExternalModuleNameFromPath(host, file.fileName, referenceFile && referenceFile.fileName);
     }
@@ -12913,12 +12950,13 @@ var ts;
         }
     }
     ts.writeFileEnsuringDirectories = writeFileEnsuringDirectories;
-    function getLineOfLocalPosition(currentSourceFile, pos) {
-        return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line;
+    function getLineOfLocalPosition(sourceFile, pos) {
+        var lineStarts = ts.getLineStarts(sourceFile);
+        return ts.computeLineOfPosition(lineStarts, pos);
     }
     ts.getLineOfLocalPosition = getLineOfLocalPosition;
     function getLineOfLocalPositionFromLineMap(lineMap, pos) {
-        return ts.computeLineAndCharacterOfPosition(lineMap, pos).line;
+        return ts.computeLineOfPosition(lineMap, pos);
     }
     ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
     function getFirstConstructorWithBody(node) {
@@ -13569,7 +13607,7 @@ var ts;
     }
     ts.rangeIsOnSingleLine = rangeIsOnSingleLine;
     function rangeStartPositionsAreOnSameLine(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), getStartPositionOfRange(range2, sourceFile), sourceFile);
+        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile, false), getStartPositionOfRange(range2, sourceFile, false), sourceFile);
     }
     ts.rangeStartPositionsAreOnSameLine = rangeStartPositionsAreOnSameLine;
     function rangeEndPositionsAreOnSameLine(range1, range2, sourceFile) {
@@ -13577,26 +13615,52 @@ var ts;
     }
     ts.rangeEndPositionsAreOnSameLine = rangeEndPositionsAreOnSameLine;
     function rangeStartIsOnSameLineAsRangeEnd(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), range2.end, sourceFile);
+        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile, false), range2.end, sourceFile);
     }
     ts.rangeStartIsOnSameLineAsRangeEnd = rangeStartIsOnSameLineAsRangeEnd;
     function rangeEndIsOnSameLineAsRangeStart(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile), sourceFile);
+        return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile, false), sourceFile);
     }
     ts.rangeEndIsOnSameLineAsRangeStart = rangeEndIsOnSameLineAsRangeStart;
+    function getLinesBetweenRangeEndAndRangeStart(range1, range2, sourceFile, includeSecondRangeComments) {
+        var range2Start = getStartPositionOfRange(range2, sourceFile, includeSecondRangeComments);
+        return ts.getLinesBetweenPositions(sourceFile, range1.end, range2Start);
+    }
+    ts.getLinesBetweenRangeEndAndRangeStart = getLinesBetweenRangeEndAndRangeStart;
+    function getLinesBetweenRangeEndPositions(range1, range2, sourceFile) {
+        return ts.getLinesBetweenPositions(sourceFile, range1.end, range2.end);
+    }
+    ts.getLinesBetweenRangeEndPositions = getLinesBetweenRangeEndPositions;
     function isNodeArrayMultiLine(list, sourceFile) {
         return !positionsAreOnSameLine(list.pos, list.end, sourceFile);
     }
     ts.isNodeArrayMultiLine = isNodeArrayMultiLine;
     function positionsAreOnSameLine(pos1, pos2, sourceFile) {
-        return pos1 === pos2 ||
-            getLineOfLocalPosition(sourceFile, pos1) === getLineOfLocalPosition(sourceFile, pos2);
+        return ts.getLinesBetweenPositions(sourceFile, pos1, pos2) === 0;
     }
     ts.positionsAreOnSameLine = positionsAreOnSameLine;
-    function getStartPositionOfRange(range, sourceFile) {
-        return positionIsSynthesized(range.pos) ? -1 : ts.skipTrivia(sourceFile.text, range.pos);
+    function getStartPositionOfRange(range, sourceFile, includeComments) {
+        return positionIsSynthesized(range.pos) ? -1 : ts.skipTrivia(sourceFile.text, range.pos, false, includeComments);
     }
     ts.getStartPositionOfRange = getStartPositionOfRange;
+    function getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter(pos, sourceFile, includeComments) {
+        var startPos = ts.skipTrivia(sourceFile.text, pos, false, includeComments);
+        var prevPos = getPreviousNonWhitespacePosition(startPos, sourceFile);
+        return ts.getLinesBetweenPositions(sourceFile, prevPos || 0, startPos);
+    }
+    ts.getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter = getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter;
+    function getLinesBetweenPositionAndNextNonWhitespaceCharacter(pos, sourceFile, includeComments) {
+        var nextPos = ts.skipTrivia(sourceFile.text, pos, false, includeComments);
+        return ts.getLinesBetweenPositions(sourceFile, pos, nextPos);
+    }
+    ts.getLinesBetweenPositionAndNextNonWhitespaceCharacter = getLinesBetweenPositionAndNextNonWhitespaceCharacter;
+    function getPreviousNonWhitespacePosition(pos, sourceFile) {
+        while (pos-- > 0) {
+            if (!ts.isWhiteSpaceLike(sourceFile.text.charCodeAt(pos))) {
+                return pos;
+            }
+        }
+    }
     function isDeclarationNameOfEnumOrNamespace(node) {
         var parseNode = ts.getParseTreeNode(node);
         if (parseNode) {
@@ -18075,7 +18139,9 @@ var ts;
                         parseErrorAtRange(openingTag, ts.Diagnostics.JSX_fragment_has_no_corresponding_closing_tag);
                     }
                     else {
-                        parseErrorAtRange(openingTag.tagName, ts.Diagnostics.JSX_element_0_has_no_corresponding_closing_tag, ts.getTextOfNodeFromSourceText(sourceText, openingTag.tagName));
+                        var tag = openingTag.tagName;
+                        var start = ts.skipTrivia(sourceText, tag.pos);
+                        parseErrorAt(start, tag.end, ts.Diagnostics.JSX_element_0_has_no_corresponding_closing_tag, ts.getTextOfNodeFromSourceText(sourceText, openingTag.tagName));
                     }
                     return undefined;
                 case 30:
@@ -29243,7 +29309,7 @@ var ts;
                 return true;
             }
             if (isUsedInFunctionOrInstanceProperty(usage, declaration, container)) {
-                if (compilerOptions.target === 99 && !!compilerOptions.useDefineForClassFields) {
+                if (compilerOptions.target === 99 && !!compilerOptions.useDefineForClassFields && ts.getContainingClass(declaration)) {
                     return (ts.isPropertyDeclaration(declaration) || ts.isParameterPropertyDeclaration(declaration, declaration.parent)) &&
                         !isPropertyImmediatelyReferencedWithinDeclaration(declaration, usage, true);
                 }
@@ -30500,7 +30566,7 @@ var ts;
             return getPackagesSet().has(ts.getTypesPackageName(packageName));
         }
         function resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias) {
-            if (moduleSymbol) {
+            if (moduleSymbol === null || moduleSymbol === void 0 ? void 0 : moduleSymbol.exports) {
                 var exportEquals = resolveSymbol(moduleSymbol.exports.get("export="), dontResolveAlias);
                 var exported = getCommonJsExportEquals(getMergedSymbol(exportEquals), getMergedSymbol(moduleSymbol));
                 return getMergedSymbol(exported) || moduleSymbol;
@@ -31219,7 +31285,7 @@ var ts;
             var sourceFile = enclosingDeclaration && ts.getSourceFileOfNode(enclosingDeclaration);
             printer.writeNode(4, typeNode, sourceFile, writer);
             var result = writer.getText();
-            var maxLength = noTruncation ? undefined : ts.defaultMaximumTruncationLength * 2;
+            var maxLength = noTruncation ? ts.noTruncationMaximumTruncationLength * 2 : ts.defaultMaximumTruncationLength * 2;
             if (maxLength && result && result.length >= maxLength) {
                 return result.substr(0, maxLength - "...".length) + "...";
             }
@@ -31279,9 +31345,13 @@ var ts;
                     tracker: tracker && tracker.trackSymbol ? tracker : { trackSymbol: ts.noop, moduleResolverHost: flags & 134217728 ? {
                             getCommonSourceDirectory: host.getCommonSourceDirectory ? function () { return host.getCommonSourceDirectory(); } : function () { return ""; },
                             getSourceFiles: function () { return host.getSourceFiles(); },
-                            getCurrentDirectory: ts.maybeBind(host, host.getCurrentDirectory),
+                            getCurrentDirectory: function () { return host.getCurrentDirectory(); },
                             getProbableSymlinks: ts.maybeBind(host, host.getProbableSymlinks),
-                            useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames)
+                            useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames),
+                            redirectTargetsMap: host.redirectTargetsMap,
+                            getProjectReferenceRedirect: function (fileName) { return host.getProjectReferenceRedirect(fileName); },
+                            isSourceOfProjectReferenceRedirect: function (fileName) { return host.isSourceOfProjectReferenceRedirect(fileName); },
+                            fileExists: function (fileName) { return host.fileExists(fileName); },
                         } : undefined },
                     encounteredError: false,
                     visitedTypes: undefined,
@@ -31295,7 +31365,7 @@ var ts;
             function checkTruncationLength(context) {
                 if (context.truncating)
                     return context.truncating;
-                return context.truncating = !(context.flags & 1) && context.approximateLength > ts.defaultMaximumTruncationLength;
+                return context.truncating = context.approximateLength > ((context.flags & 1) ? ts.noTruncationMaximumTruncationLength : ts.defaultMaximumTruncationLength);
             }
             function typeToTypeNodeHelper(type, context) {
                 if (cancellationToken && cancellationToken.throwIfCancellationRequested) {
@@ -32130,7 +32200,7 @@ var ts;
                     var isBundle_1 = (compilerOptions.out || compilerOptions.outFile);
                     var moduleResolverHost = context.tracker.moduleResolverHost;
                     var specifierCompilerOptions = isBundle_1 ? __assign(__assign({}, compilerOptions), { baseUrl: moduleResolverHost.getCommonSourceDirectory() }) : compilerOptions;
-                    specifier = ts.first(ts.moduleSpecifiers.getModuleSpecifiers(symbol, specifierCompilerOptions, contextFile, moduleResolverHost, host.getSourceFiles(), { importModuleSpecifierPreference: isBundle_1 ? "non-relative" : "relative" }, host.redirectTargetsMap));
+                    specifier = ts.first(ts.moduleSpecifiers.getModuleSpecifiers(symbol, specifierCompilerOptions, contextFile, moduleResolverHost, { importModuleSpecifierPreference: isBundle_1 ? "non-relative" : "relative" }));
                     links.specifierCache = links.specifierCache || ts.createMap();
                     links.specifierCache.set(contextFile.path, specifier);
                 }
@@ -33079,7 +33149,7 @@ var ts;
                                     var getCanonicalFileName = ts.createGetCanonicalFileName(!!host.useCaseSensitiveFileNames);
                                     var resolverHost = {
                                         getCanonicalFileName: getCanonicalFileName,
-                                        getCurrentDirectory: context.tracker.moduleResolverHost.getCurrentDirectory ? function () { return context.tracker.moduleResolverHost.getCurrentDirectory(); } : function () { return ""; },
+                                        getCurrentDirectory: function () { return context.tracker.moduleResolverHost.getCurrentDirectory(); },
                                         getCommonSourceDirectory: function () { return context.tracker.moduleResolverHost.getCommonSourceDirectory(); }
                                     };
                                     var newName = ts.getResolvedExternalModuleName(resolverHost, targetFile);
@@ -33735,7 +33805,7 @@ var ts;
             }
             if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 233) {
                 var forOfStatement = declaration.parent.parent;
-                return checkRightHandSideOfForOf(forOfStatement.expression, forOfStatement.awaitModifier) || anyType;
+                return checkRightHandSideOfForOf(forOfStatement) || anyType;
             }
             if (ts.isBindingPattern(declaration.parent)) {
                 return getTypeForBindingElement(declaration);
@@ -36530,7 +36600,9 @@ var ts;
             return true;
         }
         function getSignatureOfTypeTag(node) {
-            var typeTag = ts.isInJSFile(node) ? ts.getJSDocTypeTag(node) : undefined;
+            if (!(ts.isInJSFile(node) && ts.isFunctionLikeDeclaration(node)))
+                return undefined;
+            var typeTag = ts.getJSDocTypeTag(node);
             var signature = typeTag && typeTag.typeExpression && getSingleCallSignature(getTypeFromTypeNode(typeTag.typeExpression));
             return signature && getErasedSignature(signature);
         }
@@ -38345,45 +38417,64 @@ var ts;
             return type;
         }
         function getConditionalType(root, mapper) {
-            var checkType = instantiateType(root.checkType, mapper);
-            var extendsType = instantiateType(root.extendsType, mapper);
-            if (checkType === wildcardType || extendsType === wildcardType) {
-                return wildcardType;
+            var result;
+            var extraTypes;
+            var _loop_11 = function () {
+                var checkType = instantiateType(root.checkType, mapper);
+                var checkTypeInstantiable = isGenericObjectType(checkType) || isGenericIndexType(checkType);
+                var extendsType = instantiateType(root.extendsType, mapper);
+                if (checkType === wildcardType || extendsType === wildcardType) {
+                    return { value: wildcardType };
+                }
+                var combinedMapper = void 0;
+                if (root.inferTypeParameters) {
+                    var context = createInferenceContext(root.inferTypeParameters, undefined, 0);
+                    if (!checkTypeInstantiable || !ts.some(root.inferTypeParameters, function (t) { return t === extendsType; })) {
+                        inferTypes(context.inferences, checkType, extendsType, 128 | 256);
+                    }
+                    combinedMapper = mergeTypeMappers(mapper, context.mapper);
+                }
+                var inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
+                if (!checkTypeInstantiable && !isGenericObjectType(inferredExtendsType) && !isGenericIndexType(inferredExtendsType)) {
+                    if (!(inferredExtendsType.flags & 3) && (checkType.flags & 1 || !isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType)))) {
+                        if (checkType.flags & 1) {
+                            (extraTypes || (extraTypes = [])).push(instantiateTypeWithoutDepthIncrease(root.trueType, combinedMapper || mapper));
+                        }
+                        var falseType_1 = root.falseType;
+                        if (falseType_1.flags & 16777216) {
+                            var newRoot = falseType_1.root;
+                            if (newRoot.node.parent === root.node && (!newRoot.isDistributive || newRoot.checkType === root.checkType)) {
+                                root = newRoot;
+                                return "continue";
+                            }
+                        }
+                        result = instantiateTypeWithoutDepthIncrease(falseType_1, mapper);
+                        return "break";
+                    }
+                    if (inferredExtendsType.flags & 3 || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(inferredExtendsType))) {
+                        result = instantiateTypeWithoutDepthIncrease(root.trueType, combinedMapper || mapper);
+                        return "break";
+                    }
+                }
+                var erasedCheckType = getActualTypeVariable(checkType);
+                result = createType(16777216);
+                result.root = root;
+                result.checkType = erasedCheckType;
+                result.extendsType = extendsType;
+                result.mapper = mapper;
+                result.combinedMapper = combinedMapper;
+                result.aliasSymbol = root.aliasSymbol;
+                result.aliasTypeArguments = instantiateTypes(root.aliasTypeArguments, mapper);
+                return "break";
+            };
+            while (true) {
+                var state_4 = _loop_11();
+                if (typeof state_4 === "object")
+                    return state_4.value;
+                if (state_4 === "break")
+                    break;
             }
-            var checkTypeInstantiable = isGenericObjectType(checkType) || isGenericIndexType(checkType);
-            var combinedMapper;
-            if (root.inferTypeParameters) {
-                var context = createInferenceContext(root.inferTypeParameters, undefined, 0);
-                if (!checkTypeInstantiable || !ts.some(root.inferTypeParameters, function (t) { return t === extendsType; })) {
-                    inferTypes(context.inferences, checkType, extendsType, 128 | 256);
-                }
-                combinedMapper = mergeTypeMappers(mapper, context.mapper);
-            }
-            var inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
-            if (!checkTypeInstantiable && !isGenericObjectType(inferredExtendsType) && !isGenericIndexType(inferredExtendsType)) {
-                if (inferredExtendsType.flags & 3) {
-                    return instantiateType(root.trueType, combinedMapper || mapper);
-                }
-                if (checkType.flags & 1) {
-                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), instantiateType(root.falseType, mapper)]);
-                }
-                if (!isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType))) {
-                    return instantiateType(root.falseType, mapper);
-                }
-                if (isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(inferredExtendsType))) {
-                    return instantiateType(root.trueType, combinedMapper || mapper);
-                }
-            }
-            var erasedCheckType = getActualTypeVariable(checkType);
-            var result = createType(16777216);
-            result.root = root;
-            result.checkType = erasedCheckType;
-            result.extendsType = extendsType;
-            result.mapper = mapper;
-            result.combinedMapper = combinedMapper;
-            result.aliasSymbol = root.aliasSymbol;
-            result.aliasTypeArguments = instantiateTypes(root.aliasTypeArguments, mapper);
-            return result;
+            return extraTypes ? getUnionType(ts.append(extraTypes, result)) : result;
         }
         function getTrueTypeFromConditionalType(type) {
             return type.resolvedTrueType || (type.resolvedTrueType = instantiateType(type.root.trueType, type.mapper));
@@ -39198,6 +39289,12 @@ var ts;
             instantiationDepth--;
             return result;
         }
+        function instantiateTypeWithoutDepthIncrease(type, mapper) {
+            instantiationDepth--;
+            var result = instantiateType(type, mapper);
+            instantiationDepth++;
+            return result;
+        }
         function instantiateTypeWorker(type, mapper) {
             var _a;
             var flags = type.flags;
@@ -40499,7 +40596,7 @@ var ts;
                     reducedTarget = findMatchingDiscriminantType(source, target, isRelatedTo) || filterPrimitivesIfContainsNonPrimitive(target);
                     checkTypes = reducedTarget.flags & 1048576 ? reducedTarget.types : [reducedTarget];
                 }
-                var _loop_11 = function (prop) {
+                var _loop_12 = function (prop) {
                     if (shouldCheckAsExcessProperty(prop, source.symbol) && !isIgnoredJsxProperty(source, prop)) {
                         if (!isKnownProperty(reducedTarget, prop.escapedName, isComparingJsxAttributes)) {
                             if (reportErrors) {
@@ -40544,9 +40641,9 @@ var ts;
                 };
                 for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    var state_4 = _loop_11(prop);
-                    if (typeof state_4 === "object")
-                        return state_4.value;
+                    var state_5 = _loop_12(prop);
+                    if (typeof state_5 === "object")
+                        return state_5.value;
                 }
                 return false;
             }
@@ -40935,12 +41032,12 @@ var ts;
                                 return result;
                             }
                         }
-                        var defaultConstraint = getDefaultConstraintOfConditionalType(source);
-                        if (defaultConstraint) {
-                            if (result = isRelatedTo(defaultConstraint, target, reportErrors)) {
-                                resetErrorInfo(saveErrorInfo);
-                                return result;
-                            }
+                    }
+                    var defaultConstraint = getDefaultConstraintOfConditionalType(source);
+                    if (defaultConstraint) {
+                        if (result = isRelatedTo(defaultConstraint, target, reportErrors)) {
+                            resetErrorInfo(saveErrorInfo);
+                            return result;
                         }
                     }
                 }
@@ -41099,11 +41196,11 @@ var ts;
                 }
                 var discriminantCombinations = ts.cartesianProduct(sourceDiscriminantTypes);
                 var matchingTypes = [];
-                var _loop_12 = function (combination) {
+                var _loop_13 = function (combination) {
                     var hasMatch = false;
                     outer: for (var _i = 0, _a = target.types; _i < _a.length; _i++) {
                         var type = _a[_i];
-                        var _loop_13 = function (i) {
+                        var _loop_14 = function (i) {
                             var sourceProperty = sourcePropertiesFiltered[i];
                             var targetProperty = getPropertyOfType(type, sourceProperty.escapedName);
                             if (!targetProperty)
@@ -41116,8 +41213,8 @@ var ts;
                             }
                         };
                         for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
-                            var state_6 = _loop_13(i);
-                            switch (state_6) {
+                            var state_7 = _loop_14(i);
+                            switch (state_7) {
                                 case "continue-outer": continue outer;
                             }
                         }
@@ -41130,9 +41227,9 @@ var ts;
                 };
                 for (var _a = 0, discriminantCombinations_1 = discriminantCombinations; _a < discriminantCombinations_1.length; _a++) {
                     var combination = discriminantCombinations_1[_a];
-                    var state_5 = _loop_12(combination);
-                    if (typeof state_5 === "object")
-                        return state_5.value;
+                    var state_6 = _loop_13(combination);
+                    if (typeof state_6 === "object")
+                        return state_6.value;
                 }
                 var result = -1;
                 for (var _b = 0, matchingTypes_1 = matchingTypes; _b < matchingTypes_1.length; _b++) {
@@ -41657,7 +41754,7 @@ var ts;
             if (!variances) {
                 cache.variances = ts.emptyArray;
                 variances = [];
-                var _loop_14 = function (tp) {
+                var _loop_15 = function (tp) {
                     var unmeasurable = false;
                     var unreliable = false;
                     var oldHandler = outofbandVarianceMarkerHandler;
@@ -41680,7 +41777,7 @@ var ts;
                 };
                 for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
                     var tp = typeParameters_1[_i];
-                    _loop_14(tp);
+                    _loop_15(tp);
                 }
                 cache.variances = variances;
             }
@@ -42653,7 +42750,7 @@ var ts;
         function inferTypes(inferences, originalSource, originalTarget, priority, contravariant) {
             if (priority === void 0) { priority = 0; }
             if (contravariant === void 0) { contravariant = false; }
-            var symbolStack;
+            var symbolOrTypeStack;
             var visited;
             var bivariant = false;
             var propagationType;
@@ -42795,8 +42892,8 @@ var ts;
                     priority = savePriority;
                 }
                 else if (target.flags & 134217728) {
-                    var targetTypes = [target.awaitedType, createPromiseLikeType(target.awaitedType)];
-                    inferToMultipleTypes(source, targetTypes, target.flags);
+                    inferFromTypes(source, target.awaitedType);
+                    inferFromTypes(source, createPromiseLikeType(target.awaitedType));
                 }
                 else if (target.flags & 3145728) {
                     inferToMultipleTypes(source, target.types, target.flags);
@@ -42912,20 +43009,36 @@ var ts;
                 }
                 return typeVariable;
             }
+            function isPromiseForType(promiseType, promisedType) {
+                var _a;
+                return isThenableType(promiseType) && unwrapAwaitedType((_a = getPromisedTypeOfPromise(promiseType)) !== null && _a !== void 0 ? _a : errorType) === promisedType;
+            }
             function inferToMultipleTypes(source, targets, targetFlags) {
                 var typeVariableCount = 0;
                 if (targetFlags & 1048576) {
                     var nakedTypeVariable = void 0;
-                    var sources = source.flags & 1048576 ? source.types : [source];
-                    var matched_1 = new Array(sources.length);
-                    var inferenceCircularity = false;
                     for (var _i = 0, targets_2 = targets; _i < targets_2.length; _i++) {
                         var t = targets_2[_i];
                         if (getInferenceInfoForType(t)) {
                             nakedTypeVariable = t;
                             typeVariableCount++;
                         }
-                        else {
+                    }
+                    if (typeVariableCount === 1 && targets.length === 2) {
+                        for (var _a = 0, targets_3 = targets; _a < targets_3.length; _a++) {
+                            var t = targets_3[_a];
+                            if (!getInferenceInfoForType(t) && isPromiseForType(t, nakedTypeVariable)) {
+                                inferFromTypes(mapType(source, function (s) { var _a; return (_a = getPromisedTypeOfPromise(s)) !== null && _a !== void 0 ? _a : s; }), nakedTypeVariable);
+                                return;
+                            }
+                        }
+                    }
+                    var sources = source.flags & 1048576 ? source.types : [source];
+                    var matched_1 = new Array(sources.length);
+                    var inferenceCircularity = false;
+                    for (var _b = 0, targets_4 = targets; _b < targets_4.length; _b++) {
+                        var t = targets_4[_b];
+                        if (!getInferenceInfoForType(t)) {
                             for (var i = 0; i < sources.length; i++) {
                                 var saveInferencePriority = inferencePriority;
                                 inferencePriority = 512;
@@ -42953,8 +43066,8 @@ var ts;
                     }
                 }
                 else {
-                    for (var _a = 0, targets_3 = targets; _a < targets_3.length; _a++) {
-                        var t = targets_3[_a];
+                    for (var _c = 0, targets_5 = targets; _c < targets_5.length; _c++) {
+                        var t = targets_5[_c];
                         if (getInferenceInfoForType(t)) {
                             typeVariableCount++;
                         }
@@ -42964,8 +43077,8 @@ var ts;
                     }
                 }
                 if (targetFlags & 2097152 ? typeVariableCount === 1 : typeVariableCount > 0) {
-                    for (var _b = 0, targets_4 = targets; _b < targets_4.length; _b++) {
-                        var t = targets_4[_b];
+                    for (var _d = 0, targets_6 = targets; _d < targets_6.length; _d++) {
+                        var t = targets_6[_d];
                         if (getInferenceInfoForType(t)) {
                             inferWithPriority(source, t, 1);
                         }
@@ -43011,15 +43124,15 @@ var ts;
             function inferFromObjectTypes(source, target) {
                 var isNonConstructorObject = target.flags & 524288 &&
                     !(ts.getObjectFlags(target) & 16 && target.symbol && target.symbol.flags & 32);
-                var symbol = isNonConstructorObject ? target.symbol : undefined;
-                if (symbol) {
-                    if (ts.contains(symbolStack, symbol)) {
+                var symbolOrType = isNonConstructorObject ? isTupleType(target) ? target.target : target.symbol : undefined;
+                if (symbolOrType) {
+                    if (ts.contains(symbolOrTypeStack, symbolOrType)) {
                         inferencePriority = -1;
                         return;
                     }
-                    (symbolStack || (symbolStack = [])).push(symbol);
+                    (symbolOrTypeStack || (symbolOrTypeStack = [])).push(symbolOrType);
                     inferFromObjectTypesWorker(source, target);
-                    symbolStack.pop();
+                    symbolOrTypeStack.pop();
                 }
                 else {
                     inferFromObjectTypesWorker(source, target);
@@ -43315,6 +43428,11 @@ var ts;
             }
             return false;
         }
+        function containsTruthyCheck(source, target) {
+            return isMatchingReference(source, target) ||
+                (target.kind === 210 && target.operatorToken.kind === 55 &&
+                    (containsTruthyCheck(source, target.left) || containsTruthyCheck(source, target.right)));
+        }
         function getAccessedPropertyName(access) {
             return access.kind === 195 ? access.name.escapedText :
                 ts.isStringOrNumericLiteralLike(access.argumentExpression) ? ts.escapeLeadingUnderscores(access.argumentExpression.text) :
@@ -43552,7 +43670,7 @@ var ts;
                 case 232:
                     return stringType;
                 case 233:
-                    return checkRightHandSideOfForOf(parent.expression, parent.awaitModifier) || errorType;
+                    return checkRightHandSideOfForOf(parent) || errorType;
                 case 210:
                     return getAssignedTypeOfBinaryExpression(parent);
                 case 204:
@@ -43590,7 +43708,7 @@ var ts;
                 return stringType;
             }
             if (node.parent.parent.kind === 233) {
-                return checkRightHandSideOfForOf(node.parent.parent.expression, node.parent.parent.awaitModifier) || errorType;
+                return checkRightHandSideOfForOf(node.parent.parent) || errorType;
             }
             return errorType;
         }
@@ -43806,20 +43924,29 @@ var ts;
             return isLengthPushOrUnshift || isElementAssignment;
         }
         function isDeclarationWithExplicitTypeAnnotation(declaration) {
-            return !!(declaration && (declaration.kind === 243 || declaration.kind === 157 ||
+            return (declaration.kind === 243 || declaration.kind === 157 ||
                 declaration.kind === 160 || declaration.kind === 159) &&
-                ts.getEffectiveTypeAnnotationNode(declaration));
+                !!ts.getEffectiveTypeAnnotationNode(declaration);
         }
         function getExplicitTypeOfSymbol(symbol, diagnostic) {
             if (symbol.flags & (16 | 8192 | 32 | 512)) {
                 return getTypeOfSymbol(symbol);
             }
             if (symbol.flags & (3 | 4)) {
-                if (isDeclarationWithExplicitTypeAnnotation(symbol.valueDeclaration)) {
-                    return getTypeOfSymbol(symbol);
-                }
-                if (diagnostic && symbol.valueDeclaration) {
-                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(symbol.valueDeclaration, ts.Diagnostics._0_needs_an_explicit_type_annotation, symbolToString(symbol)));
+                var declaration = symbol.valueDeclaration;
+                if (declaration) {
+                    if (isDeclarationWithExplicitTypeAnnotation(declaration)) {
+                        return getTypeOfSymbol(symbol);
+                    }
+                    if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 233) {
+                        var expressionType = getTypeOfDottedName(declaration.parent.parent.expression, undefined);
+                        if (expressionType) {
+                            return getForOfIterationType(declaration.parent.parent, expressionType);
+                        }
+                    }
+                    if (diagnostic) {
+                        ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(declaration, ts.Diagnostics._0_needs_an_explicit_type_annotation, symbolToString(symbol)));
+                    }
                 }
             }
         }
@@ -44489,14 +44616,20 @@ var ts;
                 if (type.flags & 1 && literal.text === "function") {
                     return type;
                 }
+                if (assumeTrue && type.flags & 2 && literal.text === "object") {
+                    if (typeOfExpr.parent.parent.kind === 210) {
+                        var expr = typeOfExpr.parent.parent;
+                        if (expr.operatorToken.kind === 55 && expr.right === typeOfExpr.parent && containsTruthyCheck(reference, expr.left)) {
+                            return nonPrimitiveType;
+                        }
+                    }
+                    return getUnionType([nonPrimitiveType, nullType]);
+                }
                 var facts = assumeTrue ?
                     typeofEQFacts.get(literal.text) || 128 :
                     typeofNEFacts.get(literal.text) || 32768;
                 return getTypeWithFacts(assumeTrue ? mapType(type, narrowTypeForTypeof) : type, facts);
                 function narrowTypeForTypeof(type) {
-                    if (type.flags & 2 && literal.text === "object") {
-                        return getUnionType([nonPrimitiveType, nullType]);
-                    }
                     var targetType = literal.text === "function" ? globalFunctionType : typeofTypesByName.get(literal.text);
                     if (targetType) {
                         if (isTypeSubtypeOf(type, targetType)) {
@@ -44706,7 +44839,10 @@ var ts;
                         }
                         if (strictNullChecks && assumeTrue && optionalChainContainsReference(predicateArgument, reference) &&
                             !(getTypeFacts(predicate.type) & 65536)) {
-                            return getTypeWithFacts(type, 2097152);
+                            type = getTypeWithFacts(type, 2097152);
+                        }
+                        if (isMatchingReferenceDiscriminant(predicateArgument, declaredType)) {
+                            return narrowTypeByDiscriminant(type, predicateArgument, function (t) { return getNarrowedType(t, predicate.type, assumeTrue, isTypeSubtypeOf); });
                         }
                     }
                 }
@@ -46248,8 +46384,8 @@ var ts;
         function checkObjectLiteral(node, checkMode) {
             var inDestructuringPattern = ts.isAssignmentTarget(node);
             checkGrammarObjectLiteralExpression(node, inDestructuringPattern);
-            var propertiesTable;
-            var allPropertiesTable = ts.createSymbolTable();
+            var allPropertiesTable = strictNullChecks ? ts.createSymbolTable() : undefined;
+            var propertiesTable = ts.createSymbolTable();
             var propertiesArray = [];
             var spread = emptyObjectType;
             var contextualType = getApparentTypeOfContextualType(node);
@@ -46264,7 +46400,6 @@ var ts;
             var patternWithComputedProperties = false;
             var hasComputedStringProperty = false;
             var hasComputedNumberProperty = false;
-            propertiesTable = ts.createSymbolTable();
             var offset = 0;
             for (var i = 0; i < node.properties.length; i++) {
                 var memberDecl = node.properties[i];
@@ -46319,7 +46454,7 @@ var ts;
                     prop.type = type;
                     prop.target = member;
                     member = prop;
-                    allPropertiesTable.set(prop.escapedName, prop);
+                    allPropertiesTable === null || allPropertiesTable === void 0 ? void 0 : allPropertiesTable.set(prop.escapedName, prop);
                 }
                 else if (memberDecl.kind === 284) {
                     if (languageVersion < 2) {
@@ -46337,15 +46472,8 @@ var ts;
                         error(memberDecl, ts.Diagnostics.Spread_types_may_only_be_created_from_object_types);
                         return errorType;
                     }
-                    for (var _i = 0, _a = getPropertiesOfType(type); _i < _a.length; _i++) {
-                        var right = _a[_i];
-                        var rightType = getTypeOfSymbol(right);
-                        var left = allPropertiesTable.get(right.escapedName);
-                        if (strictNullChecks &&
-                            left &&
-                            !maybeTypeOfKind(rightType, 98304)) {
-                            error(left.valueDeclaration, ts.Diagnostics._0_is_specified_more_than_once_so_this_usage_will_be_overwritten, ts.unescapeLeadingUnderscores(left.escapedName));
-                        }
+                    if (allPropertiesTable) {
+                        checkSpreadPropOverrides(type, allPropertiesTable, memberDecl);
                     }
                     spread = getSpreadType(spread, type, node.symbol, objectFlags, inConstContext);
                     offset = i + 1;
@@ -46374,8 +46502,8 @@ var ts;
                 propertiesArray.push(member);
             }
             if (contextualTypeHasPattern && node.parent.kind !== 284) {
-                for (var _b = 0, _c = getPropertiesOfType(contextualType); _b < _c.length; _b++) {
-                    var prop = _c[_b];
+                for (var _i = 0, _a = getPropertiesOfType(contextualType); _i < _a.length; _i++) {
+                    var prop = _a[_i];
                     if (!propertiesTable.get(prop.escapedName) && !getPropertyOfType(spread, prop.escapedName)) {
                         if (!(prop.flags & 16777216)) {
                             error(prop.valueDeclaration || prop.bindingElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
@@ -46469,6 +46597,7 @@ var ts;
         }
         function createJsxAttributesTypeFromAttributesProperty(openingLikeElement, checkMode) {
             var attributes = openingLikeElement.attributes;
+            var allAttributesTable = strictNullChecks ? ts.createSymbolTable() : undefined;
             var attributesTable = ts.createSymbolTable();
             var spread = emptyJsxObjectType;
             var hasSpreadAnyType = false;
@@ -46491,6 +46620,7 @@ var ts;
                     attributeSymbol.type = exprType;
                     attributeSymbol.target = member;
                     attributesTable.set(attributeSymbol.escapedName, attributeSymbol);
+                    allAttributesTable === null || allAttributesTable === void 0 ? void 0 : allAttributesTable.set(attributeSymbol.escapedName, attributeSymbol);
                     if (attributeDecl.name.escapedText === jsxChildrenPropertyName) {
                         explicitlySpecifyChildrenAttribute = true;
                     }
@@ -46507,6 +46637,9 @@ var ts;
                     }
                     if (isValidSpreadType(exprType)) {
                         spread = getSpreadType(spread, exprType, attributes.symbol, objectFlags, false);
+                        if (allAttributesTable) {
+                            checkSpreadPropOverrides(exprType, allAttributesTable, attributeDecl);
+                        }
                     }
                     else {
                         typeToIntersect = typeToIntersect ? getIntersectionType([typeToIntersect, exprType]) : exprType;
@@ -46568,6 +46701,16 @@ var ts;
             }
             return childrenTypes;
         }
+        function checkSpreadPropOverrides(type, props, spread) {
+            for (var _i = 0, _a = getPropertiesOfType(type); _i < _a.length; _i++) {
+                var right = _a[_i];
+                var left = props.get(right.escapedName);
+                if (left && !maybeTypeOfKind(getTypeOfSymbol(right), 98304)) {
+                    var diagnostic = error(left.valueDeclaration, ts.Diagnostics._0_is_specified_more_than_once_so_this_usage_will_be_overwritten, ts.unescapeLeadingUnderscores(left.escapedName));
+                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(spread, ts.Diagnostics.This_spread_always_overwrites_this_property));
+                }
+            }
+        }
         function checkJsxAttributes(node, checkMode) {
             return createJsxAttributesTypeFromAttributesProperty(node.parent, checkMode);
         }
@@ -48160,7 +48303,7 @@ var ts;
                         var min_3 = Number.MAX_VALUE;
                         var minIndex = 0;
                         var i_1 = 0;
-                        var _loop_15 = function (c) {
+                        var _loop_16 = function (c) {
                             var chain_2 = function () { return ts.chainDiagnosticMessages(undefined, ts.Diagnostics.Overload_0_of_1_2_gave_the_following_error, i_1 + 1, candidates.length, signatureToString(c)); };
                             var diags_2 = getSignatureApplicabilityError(node, args, c, assignableRelation, 0, true, chain_2);
                             if (diags_2) {
@@ -48178,7 +48321,7 @@ var ts;
                         };
                         for (var _a = 0, candidatesForArgumentError_1 = candidatesForArgumentError; _a < candidatesForArgumentError_1.length; _a++) {
                             var c = candidatesForArgumentError_1[_a];
-                            _loop_15(c);
+                            _loop_16(c);
                         }
                         var diags_3 = max > 1 ? allDiagnostics[minIndex] : ts.flatten(allDiagnostics);
                         ts.Debug.assert(diags_3.length > 0, "No errors reported for 3 or fewer overload signatures");
@@ -48299,7 +48442,7 @@ var ts;
             }
             var _a = ts.minAndMax(candidates, getNumNonRestParameters), minArgumentCount = _a.min, maxNonRestParam = _a.max;
             var parameters = [];
-            var _loop_16 = function (i) {
+            var _loop_17 = function (i) {
                 var symbols = ts.mapDefined(candidates, function (s) { return signatureHasRestParameter(s) ?
                     i < s.parameters.length - 1 ? s.parameters[i] : ts.last(s.parameters) :
                     i < s.parameters.length ? s.parameters[i] : undefined; });
@@ -48307,7 +48450,7 @@ var ts;
                 parameters.push(createCombinedSymbolFromTypes(symbols, ts.mapDefined(candidates, function (candidate) { return tryGetTypeAtPosition(candidate, i); })));
             };
             for (var i = 0; i < maxNonRestParam; i++) {
-                _loop_16(i);
+                _loop_17(i);
             }
             var restParameterSymbols = ts.mapDefined(candidates, function (c) { return signatureHasRestParameter(c) ? ts.last(c.parameters) : undefined; });
             var flags = 0;
@@ -49267,7 +49410,7 @@ var ts;
         function createPromiseType(promisedType) {
             var globalPromiseType = getGlobalPromiseType(true);
             if (globalPromiseType !== emptyGenericType) {
-                promisedType = getAwaitedType(promisedType) || unknownType;
+                promisedType = unwrapAwaitedType(getAwaitedType(promisedType) || unknownType);
                 return createTypeReference(globalPromiseType, [promisedType]);
             }
             return unknownType;
@@ -49275,7 +49418,7 @@ var ts;
         function createPromiseLikeType(promisedType) {
             var globalPromiseLikeType = getGlobalPromiseLikeType(true);
             if (globalPromiseLikeType !== emptyGenericType) {
-                promisedType = getAwaitedType(promisedType) || unknownType;
+                promisedType = unwrapAwaitedType(getAwaitedType(promisedType) || unknownType);
                 return createTypeReference(globalPromiseLikeType, [promisedType]);
             }
             return unknownType;
@@ -51074,6 +51217,9 @@ var ts;
                 if (!(func.kind === 163 && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
+                if (func.kind === 163 && ts.isIdentifier(node.name) && node.name.escapedText === "constructor") {
+                    error(node.name, ts.Diagnostics.constructor_cannot_be_used_as_a_parameter_property_name);
+                }
             }
             if (node.questionToken && ts.isBindingPattern(node.name) && func.body) {
                 error(node, ts.Diagnostics.A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature);
@@ -53115,7 +53261,7 @@ var ts;
             }
             else {
                 var varExpr = node.initializer;
-                var iteratedType = checkRightHandSideOfForOf(node.expression, node.awaitModifier);
+                var iteratedType = checkRightHandSideOfForOf(node);
                 if (varExpr.kind === 193 || varExpr.kind === 194) {
                     checkDestructuringAssignment(varExpr, iteratedType || errorType);
                 }
@@ -53170,10 +53316,12 @@ var ts;
                 checkVariableDeclaration(decl);
             }
         }
-        function checkRightHandSideOfForOf(rhsExpression, awaitModifier) {
-            var expressionType = checkNonNullExpression(rhsExpression);
-            var use = awaitModifier ? 15 : 13;
-            return checkIteratedTypeOrElementType(use, expressionType, undefinedType, rhsExpression);
+        function checkRightHandSideOfForOf(statement) {
+            return getForOfIterationType(statement, checkNonNullExpression(statement.expression));
+        }
+        function getForOfIterationType(statement, expressionType) {
+            var use = statement.awaitModifier ? 15 : 13;
+            return checkIteratedTypeOrElementType(use, expressionType, undefinedType, statement.expression);
         }
         function checkIteratedTypeOrElementType(use, inputType, sentType, errorNode) {
             if (isTypeAny(inputType)) {
@@ -54044,7 +54192,7 @@ var ts;
         }
         function issueMemberSpecificError(node, typeWithThis, baseWithThis, broadDiag) {
             var issuedMemberError = false;
-            var _loop_17 = function (member) {
+            var _loop_18 = function (member) {
                 if (ts.hasStaticModifier(member)) {
                     return "continue";
                 }
@@ -54062,7 +54210,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_17(member);
+                _loop_18(member);
             }
             if (!issuedMemberError) {
                 checkTypeAssignableTo(typeWithThis, baseWithThis, node.name || node, broadDiag);
@@ -55757,7 +55905,7 @@ var ts;
         function getTypeOfAssignmentPattern(expr) {
             ts.Debug.assert(expr.kind === 194 || expr.kind === 193);
             if (expr.parent.kind === 233) {
-                var iteratedType = checkRightHandSideOfForOf(expr.parent.expression, expr.parent.awaitModifier);
+                var iteratedType = checkRightHandSideOfForOf(expr.parent);
                 return checkDestructuringAssignment(expr, iteratedType || errorType);
             }
             if (expr.parent.kind === 210) {
@@ -60102,6 +60250,10 @@ var ts;
         return tag;
     }
     ts.createJSDocParamTag = createJSDocParamTag;
+    function createJSDocClassTag() {
+        return createJSDocTag(311, "class");
+    }
+    ts.createJSDocClassTag = createJSDocClassTag;
     function createJSDocComment(comment, tags) {
         var node = createSynthesizedNode(304);
         node.comment = comment;
@@ -61008,6 +61160,11 @@ var ts;
         return node;
     }
     ts.moveSyntheticComments = moveSyntheticComments;
+    function ignoreSourceNewlines(node) {
+        getOrCreateEmitNode(node).flags |= 134217728;
+        return node;
+    }
+    ts.ignoreSourceNewlines = ignoreSourceNewlines;
     function getConstantValue(node) {
         var emitNode = node.emitNode;
         return emitNode && emitNode.constantValue;
@@ -74966,7 +75123,7 @@ var ts;
                         declFileName = paths.declarationFilePath || paths.jsFilePath || file.fileName;
                     }
                     if (declFileName) {
-                        var specifier = ts.moduleSpecifiers.getModuleSpecifier(__assign(__assign({}, options), { baseUrl: options.baseUrl && ts.toPath(options.baseUrl, host.getCurrentDirectory(), host.getCanonicalFileName) }), currentSourceFile, ts.toPath(outputFilePath, host.getCurrentDirectory(), host.getCanonicalFileName), ts.toPath(declFileName, host.getCurrentDirectory(), host.getCanonicalFileName), host, host.getSourceFiles(), undefined, host.redirectTargetsMap);
+                        var specifier = ts.moduleSpecifiers.getModuleSpecifier(__assign(__assign({}, options), { baseUrl: options.baseUrl && ts.toPath(options.baseUrl, host.getCurrentDirectory(), host.getCanonicalFileName) }), currentSourceFile, ts.toPath(outputFilePath, host.getCurrentDirectory(), host.getCanonicalFileName), ts.toPath(declFileName, host.getCurrentDirectory(), host.getCanonicalFileName), host, undefined);
                         if (!ts.pathIsRelative(specifier)) {
                             recordTypeReferenceDirectivesIfNecessary([specifier]);
                             return;
@@ -74975,7 +75132,7 @@ var ts;
                         if (ts.startsWith(fileName, "./") && ts.hasExtension(fileName)) {
                             fileName = fileName.substring(2);
                         }
-                        if (ts.startsWith(fileName, "node_modules/") || fileName.indexOf("/node_modules/") !== -1) {
+                        if (ts.startsWith(fileName, "node_modules/") || ts.pathContainsNodeModules(fileName)) {
                             return;
                         }
                         references.push({ pos: -1, end: -1, fileName: fileName });
@@ -76757,6 +76914,7 @@ var ts;
             getLibFileFromReference: ts.notImplemented,
             isSourceFileFromExternalLibrary: ts.returnFalse,
             getResolvedProjectReferenceToRedirect: ts.returnUndefined,
+            getProjectReferenceRedirect: ts.returnUndefined,
             isSourceOfProjectReferenceRedirect: ts.returnFalse,
             writeFile: function (name, text, writeByteOrderMark) {
                 switch (name) {
@@ -76795,7 +76953,6 @@ var ts;
             isEmitBlocked: ts.returnFalse,
             readFile: function (f) { return host.readFile(f); },
             fileExists: function (f) { return host.fileExists(f); },
-            directoryExists: host.directoryExists && (function (f) { return host.directoryExists(f); }),
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
             getProgramBuildInfo: ts.returnUndefined,
             getSourceFileFromReference: ts.returnUndefined,
@@ -76821,6 +76978,7 @@ var ts;
         var tempFlags;
         var reservedNamesStack;
         var reservedNames;
+        var preserveSourceNewlines = printerOptions.preserveSourceNewlines;
         var writer;
         var ownWriter;
         var write = writeBase;
@@ -77097,14 +77255,19 @@ var ts;
         function pipelineEmit(emitHint, node) {
             var savedLastNode = lastNode;
             var savedLastSubstitution = lastSubstitution;
+            var savedPreserveSourceNewlines = preserveSourceNewlines;
             lastNode = node;
             lastSubstitution = undefined;
+            if (preserveSourceNewlines && !!(ts.getEmitFlags(node) & 134217728)) {
+                preserveSourceNewlines = false;
+            }
             var pipelinePhase = getPipelinePhase(0, emitHint, node);
             pipelinePhase(emitHint, node);
             ts.Debug.assert(lastNode === node);
             var substitute = lastSubstitution;
             lastNode = savedLastNode;
             lastSubstitution = savedLastSubstitution;
+            preserveSourceNewlines = savedPreserveSourceNewlines;
             return substitute || node;
         }
         function getPipelinePhase(phase, emitHint, node) {
@@ -78013,9 +78176,9 @@ var ts;
         function emitPropertyAccessExpression(node) {
             var expression = ts.cast(emitExpression(node.expression), ts.isExpression);
             var token = node.questionDotToken || ts.createNode(24, node.expression.end, node.name.pos);
-            var indentBeforeDot = needsIndentation(node, node.expression, token);
-            var indentAfterDot = needsIndentation(node, token, node.name);
-            increaseIndentIf(indentBeforeDot, false);
+            var linesBeforeDot = getLinesBetweenNodes(node, node.expression, token);
+            var linesAfterDot = getLinesBetweenNodes(node, token, node.name);
+            writeLinesAndIndent(linesBeforeDot, false);
             var shouldEmitDotDot = token.kind !== 28 &&
                 mayNeedDotDotForPropertyAccess(expression) &&
                 !writer.hasTrailingComment() &&
@@ -78029,9 +78192,9 @@ var ts;
             else {
                 emitTokenWithComment(token.kind, node.expression.end, writePunctuation, node);
             }
-            increaseIndentIf(indentAfterDot, false);
+            writeLinesAndIndent(linesAfterDot, false);
             emit(node.name);
-            decreaseIndentIf(indentBeforeDot, indentAfterDot);
+            decreaseIndentIf(linesBeforeDot, linesAfterDot);
         }
         function mayNeedDotDotForPropertyAccess(expression) {
             expression = ts.skipPartiallyEmittedExpressions(expression);
@@ -78079,7 +78242,16 @@ var ts;
         }
         function emitParenthesizedExpression(node) {
             var openParenPos = emitTokenWithComment(20, node.pos, writePunctuation, node);
+            var leadingNewlines = preserveSourceNewlines && getLeadingLineTerminatorCount(node, [node.expression], 0);
+            if (leadingNewlines) {
+                writeLinesAndIndent(leadingNewlines, false);
+            }
             emitExpression(node.expression);
+            var trailingNewlines = preserveSourceNewlines && getClosingLineTerminatorCount(node, [node.expression], 0);
+            if (trailingNewlines) {
+                writeLine(trailingNewlines);
+            }
+            decreaseIndentIf(leadingNewlines);
             emitTokenWithComment(21, node.expression ? node.expression.end : openParenPos, writePunctuation, node);
         }
         function emitFunctionExpression(node) {
@@ -78148,20 +78320,20 @@ var ts;
                     }
                     case 1: {
                         var isCommaOperator = node.operatorToken.kind !== 27;
-                        var indentBeforeOperator = needsIndentation(node, node.left, node.operatorToken);
-                        var indentAfterOperator = needsIndentation(node, node.operatorToken, node.right);
-                        increaseIndentIf(indentBeforeOperator, isCommaOperator);
+                        var linesBeforeOperator = getLinesBetweenNodes(node, node.left, node.operatorToken);
+                        var linesAfterOperator = getLinesBetweenNodes(node, node.operatorToken, node.right);
+                        writeLinesAndIndent(linesBeforeOperator, isCommaOperator);
                         emitLeadingCommentsOfPosition(node.operatorToken.pos);
                         writeTokenNode(node.operatorToken, node.operatorToken.kind === 97 ? writeKeyword : writeOperator);
                         emitTrailingCommentsOfPosition(node.operatorToken.end, true);
-                        increaseIndentIf(indentAfterOperator, true);
+                        writeLinesAndIndent(linesAfterOperator, true);
                         maybePipelineEmitExpression(node.right);
                         break;
                     }
                     case 2: {
-                        var indentBeforeOperator = needsIndentation(node, node.left, node.operatorToken);
-                        var indentAfterOperator = needsIndentation(node, node.operatorToken, node.right);
-                        decreaseIndentIf(indentBeforeOperator, indentAfterOperator);
+                        var linesBeforeOperator = getLinesBetweenNodes(node, node.left, node.operatorToken);
+                        var linesAfterOperator = getLinesBetweenNodes(node, node.operatorToken, node.right);
+                        decreaseIndentIf(linesBeforeOperator, linesAfterOperator);
                         stackIndex--;
                         break;
                     }
@@ -78189,21 +78361,21 @@ var ts;
             }
         }
         function emitConditionalExpression(node) {
-            var indentBeforeQuestion = needsIndentation(node, node.condition, node.questionToken);
-            var indentAfterQuestion = needsIndentation(node, node.questionToken, node.whenTrue);
-            var indentBeforeColon = needsIndentation(node, node.whenTrue, node.colonToken);
-            var indentAfterColon = needsIndentation(node, node.colonToken, node.whenFalse);
+            var linesBeforeQuestion = getLinesBetweenNodes(node, node.condition, node.questionToken);
+            var linesAfterQuestion = getLinesBetweenNodes(node, node.questionToken, node.whenTrue);
+            var linesBeforeColon = getLinesBetweenNodes(node, node.whenTrue, node.colonToken);
+            var linesAfterColon = getLinesBetweenNodes(node, node.colonToken, node.whenFalse);
             emitExpression(node.condition);
-            increaseIndentIf(indentBeforeQuestion, true);
+            writeLinesAndIndent(linesBeforeQuestion, true);
             emit(node.questionToken);
-            increaseIndentIf(indentAfterQuestion, true);
+            writeLinesAndIndent(linesAfterQuestion, true);
             emitExpression(node.whenTrue);
-            decreaseIndentIf(indentBeforeQuestion, indentAfterQuestion);
-            increaseIndentIf(indentBeforeColon, true);
+            decreaseIndentIf(linesBeforeQuestion, linesAfterQuestion);
+            writeLinesAndIndent(linesBeforeColon, true);
             emit(node.colonToken);
-            increaseIndentIf(indentAfterColon, true);
+            writeLinesAndIndent(linesAfterColon, true);
             emitExpression(node.whenFalse);
-            decreaseIndentIf(indentBeforeColon, indentAfterColon);
+            decreaseIndentIf(linesBeforeColon, linesAfterColon);
         }
         function emitTemplateExpression(node) {
             emit(node.head);
@@ -78525,14 +78697,14 @@ var ts;
             if (!ts.nodeIsSynthesized(body) && !ts.rangeIsOnSingleLine(body, currentSourceFile)) {
                 return false;
             }
-            if (shouldWriteLeadingLineTerminator(body, body.statements, 2)
-                || shouldWriteClosingLineTerminator(body, body.statements, 2)) {
+            if (getLeadingLineTerminatorCount(body, body.statements, 2)
+                || getClosingLineTerminatorCount(body, body.statements, 2)) {
                 return false;
             }
             var previousStatement;
             for (var _a = 0, _b = body.statements; _a < _b.length; _a++) {
                 var statement = _b[_a];
-                if (shouldWriteSeparatingLineTerminator(previousStatement, statement, 2)) {
+                if (getSeparatingLineTerminatorCount(previousStatement, statement, 2) > 0) {
                     return false;
                 }
                 previousStatement = statement;
@@ -79449,7 +79621,7 @@ var ts;
                 onBeforeEmitNodeArray(children);
             }
             if (isEmpty) {
-                if (format & 1) {
+                if (format & 1 && !(preserveSourceNewlines && ts.rangeIsOnSingleLine(parentNode, currentSourceFile))) {
                     writeLine();
                 }
                 else if (format & 256 && !(format & 524288)) {
@@ -79459,8 +79631,9 @@ var ts;
             else {
                 var mayEmitInterveningComments = (format & 262144) === 0;
                 var shouldEmitInterveningComments = mayEmitInterveningComments;
-                if (shouldWriteLeadingLineTerminator(parentNode, children, format)) {
-                    writeLine();
+                var leadingLineTerminatorCount = getLeadingLineTerminatorCount(parentNode, children, format);
+                if (leadingLineTerminatorCount) {
+                    writeLine(leadingLineTerminatorCount);
                     shouldEmitInterveningComments = false;
                 }
                 else if (format & 256) {
@@ -79484,12 +79657,13 @@ var ts;
                         }
                         writeDelimiter(format);
                         recordBundleFileInternalSectionEnd(previousSourceFileTextKind);
-                        if (shouldWriteSeparatingLineTerminator(previousSibling, child, format)) {
+                        var separatingLineTerminatorCount = getSeparatingLineTerminatorCount(previousSibling, child, format);
+                        if (separatingLineTerminatorCount > 0) {
                             if ((format & (3 | 128)) === 0) {
                                 increaseIndent();
                                 shouldDecreaseIndentAfterEmit = true;
                             }
-                            writeLine();
+                            writeLine(separatingLineTerminatorCount);
                             shouldEmitInterveningComments = false;
                         }
                         else if (previousSibling && format & 512) {
@@ -79524,8 +79698,9 @@ var ts;
                     decreaseIndent();
                 }
                 recordBundleFileInternalSectionEnd(previousSourceFileTextKind);
-                if (shouldWriteClosingLineTerminator(parentNode, children, format)) {
-                    writeLine();
+                var closingLineTerminatorCount = getClosingLineTerminatorCount(parentNode, children, format);
+                if (closingLineTerminatorCount) {
+                    writeLine(closingLineTerminatorCount);
                 }
                 else if (format & 256) {
                     writeSpace();
@@ -79577,8 +79752,11 @@ var ts;
         function writeProperty(s) {
             writer.writeProperty(s);
         }
-        function writeLine() {
-            writer.writeLine();
+        function writeLine(count) {
+            if (count === void 0) { count = 1; }
+            for (var i = 0; i < count; i++) {
+                writer.writeLine(i > 0);
+            }
         }
         function increaseIndent() {
             writer.increaseIndent();
@@ -79625,10 +79803,10 @@ var ts;
                 }
             }
         }
-        function increaseIndentIf(value, writeSpaceIfNotIndenting) {
-            if (value) {
+        function writeLinesAndIndent(lineCount, writeSpaceIfNotIndenting) {
+            if (lineCount) {
                 increaseIndent();
-                writeLine();
+                writeLine(lineCount);
             }
             else if (writeSpaceIfNotIndenting) {
                 writeSpace();
@@ -79642,70 +79820,84 @@ var ts;
                 decreaseIndent();
             }
         }
-        function shouldWriteLeadingLineTerminator(parentNode, children, format) {
-            if (format & 1) {
-                return true;
-            }
-            if (format & 2) {
+        function getLeadingLineTerminatorCount(parentNode, children, format) {
+            if (format & 2 || preserveSourceNewlines) {
                 if (format & 65536) {
-                    return true;
+                    return 1;
                 }
-                var firstChild = children[0];
-                if (firstChild === undefined) {
-                    return !ts.rangeIsOnSingleLine(parentNode, currentSourceFile);
+                var firstChild_1 = children[0];
+                if (firstChild_1 === undefined) {
+                    return ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
                 }
-                else if (ts.positionIsSynthesized(parentNode.pos) || ts.nodeIsSynthesized(firstChild)) {
-                    return synthesizedNodeStartsOnNewLine(firstChild, format);
+                if (firstChild_1.kind === 11) {
+                    return 0;
                 }
-                else {
-                    return !ts.rangeStartPositionsAreOnSameLine(parentNode, firstChild, currentSourceFile);
+                if (!ts.positionIsSynthesized(parentNode.pos) && !ts.nodeIsSynthesized(firstChild_1) && firstChild_1.parent === parentNode) {
+                    if (preserveSourceNewlines) {
+                        return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter(firstChild_1.pos, currentSourceFile, includeComments); });
+                    }
+                    return ts.rangeStartPositionsAreOnSameLine(parentNode, firstChild_1, currentSourceFile) ? 0 : 1;
+                }
+                if (synthesizedNodeStartsOnNewLine(firstChild_1, format)) {
+                    return 1;
                 }
             }
-            else {
-                return false;
-            }
+            return format & 1 ? 1 : 0;
         }
-        function shouldWriteSeparatingLineTerminator(previousNode, nextNode, format) {
-            if (format & 1) {
-                return true;
-            }
-            else if (format & 2) {
+        function getSeparatingLineTerminatorCount(previousNode, nextNode, format) {
+            if (format & 2 || preserveSourceNewlines) {
                 if (previousNode === undefined || nextNode === undefined) {
-                    return false;
+                    return 0;
                 }
-                else if (ts.nodeIsSynthesized(previousNode) || ts.nodeIsSynthesized(nextNode)) {
-                    return synthesizedNodeStartsOnNewLine(previousNode, format) || synthesizedNodeStartsOnNewLine(nextNode, format);
+                if (nextNode.kind === 11) {
+                    return 0;
                 }
-                else {
-                    return !ts.rangeEndIsOnSameLineAsRangeStart(previousNode, nextNode, currentSourceFile);
+                else if (!ts.nodeIsSynthesized(previousNode) && !ts.nodeIsSynthesized(nextNode) && previousNode.parent === nextNode.parent) {
+                    if (preserveSourceNewlines) {
+                        return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenRangeEndAndRangeStart(previousNode, nextNode, currentSourceFile, includeComments); });
+                    }
+                    return ts.rangeEndIsOnSameLineAsRangeStart(previousNode, nextNode, currentSourceFile) ? 0 : 1;
+                }
+                else if (synthesizedNodeStartsOnNewLine(previousNode, format) || synthesizedNodeStartsOnNewLine(nextNode, format)) {
+                    return 1;
                 }
             }
-            else {
-                return ts.getStartsOnNewLine(nextNode);
+            else if (ts.getStartsOnNewLine(nextNode)) {
+                return 1;
             }
+            return format & 1 ? 1 : 0;
         }
-        function shouldWriteClosingLineTerminator(parentNode, children, format) {
-            if (format & 1) {
-                return (format & 131072) === 0;
-            }
-            else if (format & 2) {
+        function getClosingLineTerminatorCount(parentNode, children, format) {
+            if (format & 2 || preserveSourceNewlines) {
                 if (format & 65536) {
-                    return true;
+                    return 1;
                 }
-                var lastChild = ts.lastOrUndefined(children);
-                if (lastChild === undefined) {
-                    return !ts.rangeIsOnSingleLine(parentNode, currentSourceFile);
+                var lastChild_1 = ts.lastOrUndefined(children);
+                if (lastChild_1 === undefined) {
+                    return ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
                 }
-                else if (ts.positionIsSynthesized(parentNode.pos) || ts.nodeIsSynthesized(lastChild)) {
-                    return synthesizedNodeStartsOnNewLine(lastChild, format);
+                if (!ts.positionIsSynthesized(parentNode.pos) && !ts.nodeIsSynthesized(lastChild_1) && lastChild_1.parent === parentNode) {
+                    if (preserveSourceNewlines) {
+                        return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenPositionAndNextNonWhitespaceCharacter(lastChild_1.end, currentSourceFile, includeComments); });
+                    }
+                    return ts.rangeEndPositionsAreOnSameLine(parentNode, lastChild_1, currentSourceFile) ? 0 : 1;
                 }
-                else {
-                    return !ts.rangeEndPositionsAreOnSameLine(parentNode, lastChild, currentSourceFile);
+                if (synthesizedNodeStartsOnNewLine(lastChild_1, format)) {
+                    return 1;
                 }
             }
-            else {
-                return false;
+            if (format & 1 && !(format & 131072)) {
+                return 1;
             }
+            return 0;
+        }
+        function getEffectiveLines(getLineDifference) {
+            ts.Debug.assert(!!preserveSourceNewlines);
+            var lines = getLineDifference(true);
+            if (lines === 0) {
+                return getLineDifference(false);
+            }
+            return lines;
         }
         function synthesizedNodeStartsOnNewLine(node, format) {
             if (ts.nodeIsSynthesized(node)) {
@@ -79717,20 +79909,23 @@ var ts;
             }
             return (format & 65536) !== 0;
         }
-        function needsIndentation(parent, node1, node2) {
+        function getLinesBetweenNodes(parent, node1, node2) {
             if (ts.getEmitFlags(parent) & 131072) {
-                return false;
+                return 0;
             }
             parent = skipSynthesizedParentheses(parent);
             node1 = skipSynthesizedParentheses(node1);
             node2 = skipSynthesizedParentheses(node2);
             if (ts.getStartsOnNewLine(node2)) {
-                return true;
+                return 1;
             }
-            return !ts.nodeIsSynthesized(parent)
-                && !ts.nodeIsSynthesized(node1)
-                && !ts.nodeIsSynthesized(node2)
-                && !ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile);
+            if (!ts.nodeIsSynthesized(parent) && !ts.nodeIsSynthesized(node1) && !ts.nodeIsSynthesized(node2)) {
+                if (preserveSourceNewlines) {
+                    return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenRangeEndAndRangeStart(node1, node2, currentSourceFile, includeComments); });
+                }
+                return ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile) ? 0 : 1;
+            }
+            return 0;
         }
         function isEmptyBlock(block) {
             return block.statements.length === 0
@@ -81327,14 +81522,14 @@ var ts;
         var mapFromToProjectReferenceRedirectSource;
         var useSourceOfProjectReferenceRedirect = !!((_a = host.useSourceOfProjectReferenceRedirect) === null || _a === void 0 ? void 0 : _a.call(host)) &&
             !options.disableSourceOfProjectReferenceRedirect;
-        var onProgramCreateComplete = updateHostForUseSourceOfProjectReferenceRedirect({
+        var _b = updateHostForUseSourceOfProjectReferenceRedirect({
             compilerHost: host,
             useSourceOfProjectReferenceRedirect: useSourceOfProjectReferenceRedirect,
             toPath: toPath,
             getResolvedProjectReferences: getResolvedProjectReferences,
             getSourceOfProjectReferenceRedirect: getSourceOfProjectReferenceRedirect,
             forEachResolvedProjectReference: forEachResolvedProjectReference
-        });
+        }), onProgramCreateComplete = _b.onProgramCreateComplete, fileExists = _b.fileExists;
         var shouldCreateNewSourceFile = shouldProgramCreateNewSourceFiles(oldProgram, options);
         var structuralIsReused;
         structuralIsReused = tryReuseStructureFromOldProgram();
@@ -81353,8 +81548,8 @@ var ts;
                         var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out;
                         if (useSourceOfProjectReferenceRedirect) {
                             if (out || ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) {
-                                for (var _b = 0, _c = parsedRef.commandLine.fileNames; _b < _c.length; _b++) {
-                                    var fileName = _c[_b];
+                                for (var _c = 0, _d = parsedRef.commandLine.fileNames; _c < _d.length; _c++) {
+                                    var fileName = _d[_c];
                                     processSourceFile(fileName, false, false, undefined);
                                 }
                             }
@@ -81364,8 +81559,8 @@ var ts;
                                 processSourceFile(ts.changeExtension(out, ".d.ts"), false, false, undefined);
                             }
                             else if (ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) {
-                                for (var _d = 0, _e = parsedRef.commandLine.fileNames; _d < _e.length; _d++) {
-                                    var fileName = _e[_d];
+                                for (var _e = 0, _f = parsedRef.commandLine.fileNames; _e < _f.length; _e++) {
+                                    var fileName = _f[_e];
                                     if (!ts.fileExtensionIs(fileName, ".d.ts") && !ts.fileExtensionIs(fileName, ".json")) {
                                         processSourceFile(ts.getOutputDeclarationFileName(fileName, parsedRef.commandLine, !host.useCaseSensitiveFileNames()), false, false, undefined);
                                     }
@@ -81407,8 +81602,8 @@ var ts;
         ts.Debug.assert(!!missingFilePaths);
         if (oldProgram && host.onReleaseOldSourceFile) {
             var oldSourceFiles = oldProgram.getSourceFiles();
-            for (var _f = 0, oldSourceFiles_1 = oldSourceFiles; _f < oldSourceFiles_1.length; _f++) {
-                var oldSourceFile = oldSourceFiles_1[_f];
+            for (var _g = 0, oldSourceFiles_1 = oldSourceFiles; _g < oldSourceFiles_1.length; _g++) {
+                var oldSourceFile = oldSourceFiles_1[_g];
                 var newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
                 if (shouldCreateNewSourceFile || !newFile ||
                     (oldSourceFile.resolvedPath === oldSourceFile.path && newFile.resolvedPath !== oldSourceFile.path)) {
@@ -81471,6 +81666,7 @@ var ts;
             forEachResolvedProjectReference: forEachResolvedProjectReference,
             isSourceOfProjectReferenceRedirect: isSourceOfProjectReferenceRedirect,
             emitBuildInfo: emitBuildInfo,
+            fileExists: fileExists,
             getProbableSymlinks: getProbableSymlinks,
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
         };
@@ -81822,18 +82018,38 @@ var ts;
             return oldProgram.structureIsReused = 2;
         }
         function getEmitHost(writeFileCallback) {
-            return __assign(__assign({ getPrependNodes: getPrependNodes,
-                getCanonicalFileName: getCanonicalFileName, getCommonSourceDirectory: program.getCommonSourceDirectory, getCompilerOptions: program.getCompilerOptions, getCurrentDirectory: function () { return currentDirectory; }, getNewLine: function () { return host.getNewLine(); }, getSourceFile: program.getSourceFile, getSourceFileByPath: program.getSourceFileByPath, getSourceFiles: program.getSourceFiles, getLibFileFromReference: program.getLibFileFromReference, isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
+            return {
+                getPrependNodes: getPrependNodes,
+                getCanonicalFileName: getCanonicalFileName,
+                getCommonSourceDirectory: program.getCommonSourceDirectory,
+                getCompilerOptions: program.getCompilerOptions,
+                getCurrentDirectory: function () { return currentDirectory; },
+                getNewLine: function () { return host.getNewLine(); },
+                getSourceFile: program.getSourceFile,
+                getSourceFileByPath: program.getSourceFileByPath,
+                getSourceFiles: program.getSourceFiles,
+                getLibFileFromReference: program.getLibFileFromReference,
+                isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
                 getResolvedProjectReferenceToRedirect: getResolvedProjectReferenceToRedirect,
+                getProjectReferenceRedirect: getProjectReferenceRedirect,
                 isSourceOfProjectReferenceRedirect: isSourceOfProjectReferenceRedirect,
-                getProbableSymlinks: getProbableSymlinks, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, fileExists: function (f) {
+                getProbableSymlinks: getProbableSymlinks,
+                writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }),
+                isEmitBlocked: isEmitBlocked,
+                readFile: function (f) { return host.readFile(f); },
+                fileExists: function (f) {
                     var path = toPath(f);
                     if (getSourceFileByPath(path))
                         return true;
                     if (ts.contains(missingFilePaths, path))
                         return false;
                     return host.fileExists(f);
-                } }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {})), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); }, redirectTargetsMap: redirectTargetsMap });
+                },
+                useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
+                getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); },
+                getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); },
+                redirectTargetsMap: redirectTargetsMap,
+            };
         }
         function emitBuildInfo(writeFileCallback) {
             ts.Debug.assert(!options.out && !options.outFile);
@@ -82418,7 +82634,7 @@ var ts;
                 }
                 var sourceFileWithAddedExtension = ts.forEach(supportedExtensions, function (extension) { return getSourceFile(fileName + extension); });
                 if (fail && !sourceFileWithAddedExtension)
-                    fail(ts.Diagnostics.File_0_not_found, fileName + ".ts");
+                    fail(ts.Diagnostics.Could_not_resolve_the_path_0_with_the_extensions_Colon_1, fileName, "'" + supportedExtensions.join("', '") + "'");
                 return sourceFileWithAddedExtension;
             }
         }
@@ -83339,16 +83555,8 @@ var ts;
         var originalGetDirectories = host.compilerHost.getDirectories;
         var originalRealpath = host.compilerHost.realpath;
         if (!host.useSourceOfProjectReferenceRedirect)
-            return ts.noop;
-        host.compilerHost.fileExists = function (file) {
-            if (originalFileExists.call(host.compilerHost, file))
-                return true;
-            if (!host.getResolvedProjectReferences())
-                return false;
-            if (!ts.isDeclarationFileName(file))
-                return false;
-            return fileOrDirectoryExistsUsingSource(file, true);
-        };
+            return { onProgramCreateComplete: ts.noop, fileExists: fileExists };
+        host.compilerHost.fileExists = fileExists;
         if (originalDirectoryExists) {
             host.compilerHost.directoryExists = function (path) {
                 if (originalDirectoryExists.call(host.compilerHost, path)) {
@@ -83390,12 +83598,21 @@ var ts;
                     originalRealpath.call(host.compilerHost, s);
             };
         }
-        return onProgramCreateComplete;
+        return { onProgramCreateComplete: onProgramCreateComplete, fileExists: fileExists };
         function onProgramCreateComplete() {
             host.compilerHost.fileExists = originalFileExists;
             host.compilerHost.directoryExists = originalDirectoryExists;
             host.compilerHost.getDirectories = originalGetDirectories;
         }
+        function fileExists(file) {
+            if (originalFileExists.call(host.compilerHost, file))
+                return true;
+            if (!host.getResolvedProjectReferences())
+                return false;
+            if (!ts.isDeclarationFileName(file))
+                return false;
+            return fileOrDirectoryExistsUsingSource(file, true);
+        }
         function fileExistsIfProjectReferenceDts(file) {
             var source = host.getSourceOfProjectReferenceRedirect(file);
             return source !== undefined ?
@@ -83558,8 +83775,8 @@ var ts;
 (function (ts) {
     function getFileEmitOutput(program, sourceFile, emitOnlyDtsFiles, cancellationToken, customTransformers, forceDtsEmit) {
         var outputFiles = [];
-        var emitResult = program.emit(sourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers, forceDtsEmit);
-        return { outputFiles: outputFiles, emitSkipped: emitResult.emitSkipped, exportedModulesFromDeclarationEmit: emitResult.exportedModulesFromDeclarationEmit };
+        var _a = program.emit(sourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers, forceDtsEmit), emitSkipped = _a.emitSkipped, diagnostics = _a.diagnostics, exportedModulesFromDeclarationEmit = _a.exportedModulesFromDeclarationEmit;
+        return { outputFiles: outputFiles, emitSkipped: emitSkipped, diagnostics: diagnostics, exportedModulesFromDeclarationEmit: exportedModulesFromDeclarationEmit };
         function writeFile(fileName, text, writeByteOrderMark) {
             outputFiles.push({ name: fileName, writeByteOrderMark: writeByteOrderMark, text: text });
         }
@@ -83719,12 +83936,14 @@ var ts;
         }
         BuilderState.getFilesAffectedBy = getFilesAffectedBy;
         function updateSignaturesFromCache(state, signatureCache) {
-            signatureCache.forEach(function (signature, path) {
-                state.fileInfos.get(path).signature = signature;
-                state.hasCalledUpdateShapeSignature.set(path, true);
-            });
+            signatureCache.forEach(function (signature, path) { return updateSignatureOfFile(state, signature, path); });
         }
         BuilderState.updateSignaturesFromCache = updateSignaturesFromCache;
+        function updateSignatureOfFile(state, signature, path) {
+            state.fileInfos.get(path).signature = signature;
+            state.hasCalledUpdateShapeSignature.set(path, true);
+        }
+        BuilderState.updateSignatureOfFile = updateSignatureOfFile;
         function updateShapeSignature(state, programOfThisState, sourceFile, cacheToUpdateSignature, cancellationToken, computeHash, exportedModulesMapCache) {
             ts.Debug.assert(!!sourceFile);
             ts.Debug.assert(!exportedModulesMapCache || !!state.exportedModulesMap, "Compute visible to outside map only if visibleToOutsideReferencedMap present in the state");
@@ -85262,37 +85481,37 @@ var ts;
                     ts.getEmitModuleResolutionKind(compilerOptions) !== ts.ModuleResolutionKind.NodeJs || ts.endsWith(oldImportSpecifier, "index") ? 1 : 0,
             };
         }
-        function updateModuleSpecifier(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, oldImportSpecifier) {
-            var res = getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, getPreferencesForUpdate(compilerOptions, oldImportSpecifier));
+        function updateModuleSpecifier(compilerOptions, importingSourceFileName, toFileName, host, oldImportSpecifier) {
+            var res = getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, getPreferencesForUpdate(compilerOptions, oldImportSpecifier));
             if (res === oldImportSpecifier)
                 return undefined;
             return res;
         }
         moduleSpecifiers.updateModuleSpecifier = updateModuleSpecifier;
-        function getModuleSpecifier(compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, files, preferences, redirectTargetsMap) {
+        function getModuleSpecifier(compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, preferences) {
             if (preferences === void 0) { preferences = {}; }
-            return getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, getPreferences(preferences, compilerOptions, importingSourceFile));
+            return getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, getPreferences(preferences, compilerOptions, importingSourceFile));
         }
         moduleSpecifiers.getModuleSpecifier = getModuleSpecifier;
-        function getNodeModulesPackageName(compilerOptions, importingSourceFileName, nodeModulesFileName, host, files, redirectTargetsMap) {
+        function getNodeModulesPackageName(compilerOptions, importingSourceFileName, nodeModulesFileName, host) {
             var info = getInfo(importingSourceFileName, host);
-            var modulePaths = getAllModulePaths(files, importingSourceFileName, nodeModulesFileName, info.getCanonicalFileName, host, redirectTargetsMap);
+            var modulePaths = getAllModulePaths(importingSourceFileName, nodeModulesFileName, host);
             return ts.firstDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions, true); });
         }
         moduleSpecifiers.getNodeModulesPackageName = getNodeModulesPackageName;
-        function getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, preferences) {
+        function getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, preferences) {
             var info = getInfo(importingSourceFileName, host);
-            var modulePaths = getAllModulePaths(files, importingSourceFileName, toFileName, info.getCanonicalFileName, host, redirectTargetsMap);
+            var modulePaths = getAllModulePaths(importingSourceFileName, toFileName, host);
             return ts.firstDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions); }) ||
                 getLocalModuleSpecifier(toFileName, info, compilerOptions, preferences);
         }
-        function getModuleSpecifiers(moduleSymbol, compilerOptions, importingSourceFile, host, files, userPreferences, redirectTargetsMap) {
+        function getModuleSpecifiers(moduleSymbol, compilerOptions, importingSourceFile, host, userPreferences) {
             var ambient = tryGetModuleNameFromAmbientModule(moduleSymbol);
             if (ambient)
                 return [ambient];
             var info = getInfo(importingSourceFile.path, host);
             var moduleSourceFile = ts.getSourceFileOfNode(moduleSymbol.valueDeclaration || ts.getNonAugmentationDeclaration(moduleSymbol));
-            var modulePaths = getAllModulePaths(files, importingSourceFile.path, moduleSourceFile.originalFileName, info.getCanonicalFileName, host, redirectTargetsMap);
+            var modulePaths = getAllModulePaths(importingSourceFile.path, moduleSourceFile.originalFileName, host);
             var preferences = getPreferences(userPreferences, compilerOptions, importingSourceFile);
             var global = ts.mapDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions); });
             return global.length ? global : modulePaths.map(function (moduleFileName) { return getLocalModuleSpecifier(moduleFileName, info, compilerOptions, preferences); });
@@ -85349,10 +85568,12 @@ var ts;
         function comparePathsByNumberOfDirectorySeparators(a, b) {
             return ts.compareValues(numberOfDirectorySeparators(a), numberOfDirectorySeparators(b));
         }
-        function forEachFileNameOfModule(files, importingFileName, importedFileName, getCanonicalFileName, host, redirectTargetsMap, preferSymlinks, cb) {
-            var redirects = redirectTargetsMap.get(importedFileName);
-            var importedFileNames = redirects ? __spreadArrays(redirects, [importedFileName]) : [importedFileName];
-            var cwd = host.getCurrentDirectory ? host.getCurrentDirectory() : "";
+        function forEachFileNameOfModule(importingFileName, importedFileName, host, preferSymlinks, cb) {
+            var getCanonicalFileName = ts.hostGetCanonicalFileName(host);
+            var cwd = host.getCurrentDirectory();
+            var referenceRedirect = host.isSourceOfProjectReferenceRedirect(importedFileName) ? host.getProjectReferenceRedirect(importedFileName) : undefined;
+            var redirects = host.redirectTargetsMap.get(ts.toPath(importedFileName, cwd, getCanonicalFileName)) || ts.emptyArray;
+            var importedFileNames = __spreadArrays((referenceRedirect ? [referenceRedirect] : ts.emptyArray), [importedFileName], redirects);
             var targets = importedFileNames.map(function (f) { return ts.getNormalizedAbsolutePath(f, cwd); });
             if (!preferSymlinks) {
                 var result_10 = ts.forEach(targets, cb);
@@ -85360,8 +85581,8 @@ var ts;
                     return result_10;
             }
             var links = host.getProbableSymlinks
-                ? host.getProbableSymlinks(files)
-                : ts.discoverProbableSymlinks(files, getCanonicalFileName, cwd);
+                ? host.getProbableSymlinks(host.getSourceFiles())
+                : ts.discoverProbableSymlinks(host.getSourceFiles(), getCanonicalFileName, cwd);
             var compareStrings = (!host.useCaseSensitiveFileNames || host.useCaseSensitiveFileNames()) ? ts.compareStringsCaseSensitive : ts.compareStringsCaseInsensitive;
             var result = ts.forEachEntry(links, function (resolved, path) {
                 if (ts.startsWithDirectory(importingFileName, resolved, getCanonicalFileName)) {
@@ -85382,19 +85603,24 @@ var ts;
                 (preferSymlinks ? ts.forEach(targets, cb) : undefined);
         }
         moduleSpecifiers.forEachFileNameOfModule = forEachFileNameOfModule;
-        function getAllModulePaths(files, importingFileName, importedFileName, getCanonicalFileName, host, redirectTargetsMap) {
-            var cwd = host.getCurrentDirectory ? host.getCurrentDirectory() : "";
+        function getAllModulePaths(importingFileName, importedFileName, host) {
+            var cwd = host.getCurrentDirectory();
+            var getCanonicalFileName = ts.hostGetCanonicalFileName(host);
             var allFileNames = ts.createMap();
-            forEachFileNameOfModule(files, importingFileName, importedFileName, getCanonicalFileName, host, redirectTargetsMap, true, function (path) {
+            var importedFileFromNodeModules = false;
+            forEachFileNameOfModule(importingFileName, importedFileName, host, true, function (path) {
                 allFileNames.set(path, getCanonicalFileName(path));
+                importedFileFromNodeModules = importedFileFromNodeModules || ts.pathContainsNodeModules(path);
             });
             var sortedPaths = [];
-            var _loop_18 = function (directory) {
+            var _loop_19 = function (directory) {
                 var directoryStart = ts.ensureTrailingDirectorySeparator(directory);
                 var pathsInDirectory;
                 allFileNames.forEach(function (canonicalFileName, fileName) {
                     if (ts.startsWith(canonicalFileName, directoryStart)) {
-                        (pathsInDirectory || (pathsInDirectory = [])).push(fileName);
+                        if (!importedFileFromNodeModules || ts.pathContainsNodeModules(fileName)) {
+                            (pathsInDirectory || (pathsInDirectory = [])).push(fileName);
+                        }
                         allFileNames.delete(fileName);
                     }
                 });
@@ -85412,9 +85638,9 @@ var ts;
             };
             var out_directory_1;
             for (var directory = ts.getDirectoryPath(ts.toPath(importingFileName, cwd, getCanonicalFileName)); allFileNames.size !== 0;) {
-                var state_7 = _loop_18(directory);
+                var state_8 = _loop_19(directory);
                 directory = out_directory_1;
-                if (state_7 === "break")
+                if (state_8 === "break")
                     break;
             }
             if (allFileNames.size) {
diff --git a/lib/tsserver.js b/lib/tsserver.js
index e2697170d6a..e3b0d8eefe4 100644
--- a/lib/tsserver.js
+++ b/lib/tsserver.js
@@ -94,7 +94,7 @@ var ts;
     // If changing the text in this section, be sure to test `configurePrerelease` too.
     ts.versionMajorMinor = "3.9";
     /** The version of the TypeScript compiler release */
-    ts.version = ts.versionMajorMinor + ".0-dev";
+    ts.version = ts.versionMajorMinor + ".0-beta";
     /**
      * Returns the native Map implementation if it is available and compatible (i.e. supports iteration).
      */
@@ -4445,6 +4445,7 @@ var ts;
         EmitFlags[EmitFlags["NoAsciiEscaping"] = 16777216] = "NoAsciiEscaping";
         /*@internal*/ EmitFlags[EmitFlags["TypeScriptClassWrapper"] = 33554432] = "TypeScriptClassWrapper";
         /*@internal*/ EmitFlags[EmitFlags["NeverApplyImportHelper"] = 67108864] = "NeverApplyImportHelper";
+        /*@internal*/ EmitFlags[EmitFlags["IgnoreSourceNewlines"] = 134217728] = "IgnoreSourceNewlines";
     })(EmitFlags = ts.EmitFlags || (ts.EmitFlags = {}));
     /**
      * Used by the checker, this enum keeps track of external emit helpers that should be type
@@ -7022,6 +7023,7 @@ var ts;
         Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: diag(2395, ts.DiagnosticCategory.Error, "Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local_2395", "Individual declarations in merged declaration '{0}' must be all exported or all local."),
         Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: diag(2396, ts.DiagnosticCategory.Error, "Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters_2396", "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters."),
         Declaration_name_conflicts_with_built_in_global_identifier_0: diag(2397, ts.DiagnosticCategory.Error, "Declaration_name_conflicts_with_built_in_global_identifier_0_2397", "Declaration name conflicts with built-in global identifier '{0}'."),
+        constructor_cannot_be_used_as_a_parameter_property_name: diag(2398, ts.DiagnosticCategory.Error, "constructor_cannot_be_used_as_a_parameter_property_name_2398", "'constructor' cannot be used as a parameter property name."),
         Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: diag(2399, ts.DiagnosticCategory.Error, "Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference_2399", "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference."),
         Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: diag(2400, ts.DiagnosticCategory.Error, "Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference_2400", "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference."),
         Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: diag(2401, ts.DiagnosticCategory.Error, "Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference_2401", "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference."),
@@ -7356,6 +7358,7 @@ var ts;
         _0_needs_an_explicit_type_annotation: diag(2782, ts.DiagnosticCategory.Message, "_0_needs_an_explicit_type_annotation_2782", "'{0}' needs an explicit type annotation."),
         _0_is_specified_more_than_once_so_this_usage_will_be_overwritten: diag(2783, ts.DiagnosticCategory.Error, "_0_is_specified_more_than_once_so_this_usage_will_be_overwritten_2783", "'{0}' is specified more than once, so this usage will be overwritten."),
         get_and_set_accessors_cannot_declare_this_parameters: diag(2784, ts.DiagnosticCategory.Error, "get_and_set_accessors_cannot_declare_this_parameters_2784", "'get' and 'set' accessors cannot declare 'this' parameters."),
+        This_spread_always_overwrites_this_property: diag(2785, ts.DiagnosticCategory.Error, "This_spread_always_overwrites_this_property_2785", "This spread always overwrites this property."),
         Import_declaration_0_is_using_private_name_1: diag(4000, ts.DiagnosticCategory.Error, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -7707,6 +7710,7 @@ var ts;
         Synchronously_call_callbacks_and_update_the_state_of_directory_watchers_on_platforms_that_don_t_support_recursive_watching_natively: diag(6228, ts.DiagnosticCategory.Message, "Synchronously_call_callbacks_and_update_the_state_of_directory_watchers_on_platforms_that_don_t_supp_6228", "Synchronously call callbacks and update the state of directory watchers on platforms that don't support recursive watching natively."),
         Tag_0_expects_at_least_1_arguments_but_the_JSX_factory_2_provides_at_most_3: diag(6229, ts.DiagnosticCategory.Error, "Tag_0_expects_at_least_1_arguments_but_the_JSX_factory_2_provides_at_most_3_6229", "Tag '{0}' expects at least '{1}' arguments, but the JSX factory '{2}' provides at most '{3}'."),
         Option_0_can_only_be_specified_in_tsconfig_json_file_or_set_to_false_or_null_on_command_line: diag(6230, ts.DiagnosticCategory.Error, "Option_0_can_only_be_specified_in_tsconfig_json_file_or_set_to_false_or_null_on_command_line_6230", "Option '{0}' can only be specified in 'tsconfig.json' file or set to 'false' or 'null' on command line."),
+        Could_not_resolve_the_path_0_with_the_extensions_Colon_1: diag(6231, ts.DiagnosticCategory.Error, "Could_not_resolve_the_path_0_with_the_extensions_Colon_1_6231", "Could not resolve the path '{0}' with the extensions: {1}."),
         Projects_to_reference: diag(6300, ts.DiagnosticCategory.Message, "Projects_to_reference_6300", "Projects to reference"),
         Enable_project_compilation: diag(6302, ts.DiagnosticCategory.Message, "Enable_project_compilation_6302", "Enable project compilation"),
         Composite_projects_may_not_disable_declaration_emit: diag(6304, ts.DiagnosticCategory.Error, "Composite_projects_may_not_disable_declaration_emit_6304", "Composite projects may not disable declaration emit."),
@@ -8003,7 +8007,15 @@ var ts;
         Set_the_target_option_in_your_configuration_file_to_0: diag(95098, ts.DiagnosticCategory.Message, "Set_the_target_option_in_your_configuration_file_to_0_95098", "Set the 'target' option in your configuration file to '{0}'"),
         Set_the_module_option_in_your_configuration_file_to_0: diag(95099, ts.DiagnosticCategory.Message, "Set_the_module_option_in_your_configuration_file_to_0_95099", "Set the 'module' option in your configuration file to '{0}'"),
         Convert_invalid_character_to_its_html_entity_code: diag(95100, ts.DiagnosticCategory.Message, "Convert_invalid_character_to_its_html_entity_code_95100", "Convert invalid character to its html entity code"),
-        Wrap_invalid_character_in_an_expression_container: diag(95101, ts.DiagnosticCategory.Message, "Wrap_invalid_character_in_an_expression_container_95101", "Wrap invalid character in an expression container"),
+        Convert_all_invalid_characters_to_HTML_entity_code: diag(95101, ts.DiagnosticCategory.Message, "Convert_all_invalid_characters_to_HTML_entity_code_95101", "Convert all invalid characters to HTML entity code"),
+        Add_class_tag: diag(95102, ts.DiagnosticCategory.Message, "Add_class_tag_95102", "Add '@class' tag"),
+        Add_this_tag: diag(95103, ts.DiagnosticCategory.Message, "Add_this_tag_95103", "Add '@this' tag"),
+        Add_this_parameter: diag(95104, ts.DiagnosticCategory.Message, "Add_this_parameter_95104", "Add 'this' parameter."),
+        Convert_function_expression_0_to_arrow_function: diag(95105, ts.DiagnosticCategory.Message, "Convert_function_expression_0_to_arrow_function_95105", "Convert function expression '{0}' to arrow function"),
+        Convert_function_declaration_0_to_arrow_function: diag(95106, ts.DiagnosticCategory.Message, "Convert_function_declaration_0_to_arrow_function_95106", "Convert function declaration '{0}' to arrow function"),
+        Fix_all_implicit_this_errors: diag(95107, ts.DiagnosticCategory.Message, "Fix_all_implicit_this_errors_95107", "Fix all implicit-'this' errors"),
+        Wrap_invalid_character_in_an_expression_container: diag(95108, ts.DiagnosticCategory.Message, "Wrap_invalid_character_in_an_expression_container_95108", "Wrap invalid character in an expression container"),
+        Wrap_all_invalid_characters_in_an_expression_container: diag(95109, ts.DiagnosticCategory.Message, "Wrap_all_invalid_characters_in_an_expression_container_95109", "Wrap all invalid characters in an expression container"),
         No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, ts.DiagnosticCategory.Error, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
         Classes_may_not_have_a_field_named_constructor: diag(18006, ts.DiagnosticCategory.Error, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
         JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, ts.DiagnosticCategory.Error, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
@@ -8305,11 +8317,20 @@ var ts;
     }
     ts.getLineStarts = getLineStarts;
     /* @internal */
+    function computeLineAndCharacterOfPosition(lineStarts, position) {
+        var lineNumber = computeLineOfPosition(lineStarts, position);
+        return {
+            line: lineNumber,
+            character: position - lineStarts[lineNumber]
+        };
+    }
+    ts.computeLineAndCharacterOfPosition = computeLineAndCharacterOfPosition;
     /**
+     * @internal
      * We assume the first line starts at position 0 and 'position' is non-negative.
      */
-    function computeLineAndCharacterOfPosition(lineStarts, position) {
-        var lineNumber = ts.binarySearch(lineStarts, position, ts.identity, ts.compareValues);
+    function computeLineOfPosition(lineStarts, position, lowerBound) {
+        var lineNumber = ts.binarySearch(lineStarts, position, ts.identity, ts.compareValues, lowerBound);
         if (lineNumber < 0) {
             // If the actual position was not found,
             // the binary search returns the 2's-complement of the next line start
@@ -8321,12 +8342,22 @@ var ts;
             lineNumber = ~lineNumber - 1;
             ts.Debug.assert(lineNumber !== -1, "position cannot precede the beginning of the file");
         }
-        return {
-            line: lineNumber,
-            character: position - lineStarts[lineNumber]
-        };
+        return lineNumber;
     }
-    ts.computeLineAndCharacterOfPosition = computeLineAndCharacterOfPosition;
+    ts.computeLineOfPosition = computeLineOfPosition;
+    /** @internal */
+    function getLinesBetweenPositions(sourceFile, pos1, pos2) {
+        if (pos1 === pos2)
+            return 0;
+        var lineStarts = getLineStarts(sourceFile);
+        var lower = Math.min(pos1, pos2);
+        var isNegative = lower === pos2;
+        var upper = isNegative ? pos1 : pos2;
+        var lowerLine = computeLineOfPosition(lineStarts, lower);
+        var upperLine = computeLineOfPosition(lineStarts, upper, lowerLine);
+        return isNegative ? lowerLine - upperLine : upperLine - lowerLine;
+    }
+    ts.getLinesBetweenPositions = getLinesBetweenPositions;
     function getLineAndCharacterOfPosition(sourceFile, position) {
         return computeLineAndCharacterOfPosition(getLineStarts(sourceFile), position);
     }
@@ -12698,6 +12729,7 @@ var ts;
     ts.emptyUnderscoreEscapedMap = ts.emptyMap;
     ts.externalHelpersModuleNameText = "tslib";
     ts.defaultMaximumTruncationLength = 160;
+    ts.noTruncationMaximumTruncationLength = 1000000;
     function getDeclarationOfKind(symbol, kind) {
         var declarations = symbol.declarations;
         if (declarations) {
@@ -13151,7 +13183,7 @@ var ts;
             return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos, /*stopAfterLineBreak*/ false, /*stopAtComments*/ true);
         }
         if (includeJsDoc && ts.hasJSDocNodes(node)) {
-            return getTokenPosOfNode(node.jsDoc[0]);
+            return getTokenPosOfNode(node.jsDoc[0], sourceFile);
         }
         // For a syntax list, it is possible that one of its children has JSDocComment nodes, while
         // the syntax list itself considers them as normal trivia. Therefore if we simply skip
@@ -16111,8 +16143,8 @@ var ts;
                 write(s);
             }
         }
-        function writeLine() {
-            if (!lineStart) {
+        function writeLine(force) {
+            if (!lineStart || force) {
                 output += newLine;
                 lineCount++;
                 linePos = output.length;
@@ -16223,6 +16255,14 @@ var ts;
             } });
     }
     ts.getTrailingSemicolonDeferringWriter = getTrailingSemicolonDeferringWriter;
+    function hostUsesCaseSensitiveFileNames(host) {
+        return host.useCaseSensitiveFileNames ? host.useCaseSensitiveFileNames() : false;
+    }
+    ts.hostUsesCaseSensitiveFileNames = hostUsesCaseSensitiveFileNames;
+    function hostGetCanonicalFileName(host) {
+        return ts.createGetCanonicalFileName(hostUsesCaseSensitiveFileNames(host));
+    }
+    ts.hostGetCanonicalFileName = hostGetCanonicalFileName;
     function getResolvedExternalModuleName(host, file, referenceFile) {
         return file.moduleName || getExternalModuleNameFromPath(host, file.fileName, referenceFile && referenceFile.fileName);
     }
@@ -16343,12 +16383,13 @@ var ts;
         }
     }
     ts.writeFileEnsuringDirectories = writeFileEnsuringDirectories;
-    function getLineOfLocalPosition(currentSourceFile, pos) {
-        return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line;
+    function getLineOfLocalPosition(sourceFile, pos) {
+        var lineStarts = ts.getLineStarts(sourceFile);
+        return ts.computeLineOfPosition(lineStarts, pos);
     }
     ts.getLineOfLocalPosition = getLineOfLocalPosition;
     function getLineOfLocalPositionFromLineMap(lineMap, pos) {
-        return ts.computeLineAndCharacterOfPosition(lineMap, pos).line;
+        return ts.computeLineOfPosition(lineMap, pos);
     }
     ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
     function getFirstConstructorWithBody(node) {
@@ -17119,7 +17160,7 @@ var ts;
     }
     ts.rangeIsOnSingleLine = rangeIsOnSingleLine;
     function rangeStartPositionsAreOnSameLine(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), getStartPositionOfRange(range2, sourceFile), sourceFile);
+        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile, /*includeComments*/ false), getStartPositionOfRange(range2, sourceFile, /*includeComments*/ false), sourceFile);
     }
     ts.rangeStartPositionsAreOnSameLine = rangeStartPositionsAreOnSameLine;
     function rangeEndPositionsAreOnSameLine(range1, range2, sourceFile) {
@@ -17127,26 +17168,52 @@ var ts;
     }
     ts.rangeEndPositionsAreOnSameLine = rangeEndPositionsAreOnSameLine;
     function rangeStartIsOnSameLineAsRangeEnd(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), range2.end, sourceFile);
+        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile, /*includeComments*/ false), range2.end, sourceFile);
     }
     ts.rangeStartIsOnSameLineAsRangeEnd = rangeStartIsOnSameLineAsRangeEnd;
     function rangeEndIsOnSameLineAsRangeStart(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile), sourceFile);
+        return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile, /*includeComments*/ false), sourceFile);
     }
     ts.rangeEndIsOnSameLineAsRangeStart = rangeEndIsOnSameLineAsRangeStart;
+    function getLinesBetweenRangeEndAndRangeStart(range1, range2, sourceFile, includeSecondRangeComments) {
+        var range2Start = getStartPositionOfRange(range2, sourceFile, includeSecondRangeComments);
+        return ts.getLinesBetweenPositions(sourceFile, range1.end, range2Start);
+    }
+    ts.getLinesBetweenRangeEndAndRangeStart = getLinesBetweenRangeEndAndRangeStart;
+    function getLinesBetweenRangeEndPositions(range1, range2, sourceFile) {
+        return ts.getLinesBetweenPositions(sourceFile, range1.end, range2.end);
+    }
+    ts.getLinesBetweenRangeEndPositions = getLinesBetweenRangeEndPositions;
     function isNodeArrayMultiLine(list, sourceFile) {
         return !positionsAreOnSameLine(list.pos, list.end, sourceFile);
     }
     ts.isNodeArrayMultiLine = isNodeArrayMultiLine;
     function positionsAreOnSameLine(pos1, pos2, sourceFile) {
-        return pos1 === pos2 ||
-            getLineOfLocalPosition(sourceFile, pos1) === getLineOfLocalPosition(sourceFile, pos2);
+        return ts.getLinesBetweenPositions(sourceFile, pos1, pos2) === 0;
     }
     ts.positionsAreOnSameLine = positionsAreOnSameLine;
-    function getStartPositionOfRange(range, sourceFile) {
-        return positionIsSynthesized(range.pos) ? -1 : ts.skipTrivia(sourceFile.text, range.pos);
+    function getStartPositionOfRange(range, sourceFile, includeComments) {
+        return positionIsSynthesized(range.pos) ? -1 : ts.skipTrivia(sourceFile.text, range.pos, /*stopAfterLineBreak*/ false, includeComments);
     }
     ts.getStartPositionOfRange = getStartPositionOfRange;
+    function getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter(pos, sourceFile, includeComments) {
+        var startPos = ts.skipTrivia(sourceFile.text, pos, /*stopAfterLineBreak*/ false, includeComments);
+        var prevPos = getPreviousNonWhitespacePosition(startPos, sourceFile);
+        return ts.getLinesBetweenPositions(sourceFile, prevPos || 0, startPos);
+    }
+    ts.getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter = getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter;
+    function getLinesBetweenPositionAndNextNonWhitespaceCharacter(pos, sourceFile, includeComments) {
+        var nextPos = ts.skipTrivia(sourceFile.text, pos, /*stopAfterLineBreak*/ false, includeComments);
+        return ts.getLinesBetweenPositions(sourceFile, pos, nextPos);
+    }
+    ts.getLinesBetweenPositionAndNextNonWhitespaceCharacter = getLinesBetweenPositionAndNextNonWhitespaceCharacter;
+    function getPreviousNonWhitespacePosition(pos, sourceFile) {
+        while (pos-- > 0) {
+            if (!ts.isWhiteSpaceLike(sourceFile.text.charCodeAt(pos))) {
+                return pos;
+            }
+        }
+    }
     /**
      * Determines whether a name was originally the declaration name of an enum or namespace
      * declaration.
@@ -22656,7 +22723,11 @@ var ts;
                         parseErrorAtRange(openingTag, ts.Diagnostics.JSX_fragment_has_no_corresponding_closing_tag);
                     }
                     else {
-                        parseErrorAtRange(openingTag.tagName, ts.Diagnostics.JSX_element_0_has_no_corresponding_closing_tag, ts.getTextOfNodeFromSourceText(sourceText, openingTag.tagName));
+                        // We want the error span to cover only 'Foo.Bar' in < Foo.Bar >
+                        // or to cover only 'Foo' in < Foo >
+                        var tag = openingTag.tagName;
+                        var start = ts.skipTrivia(sourceText, tag.pos);
+                        parseErrorAt(start, tag.end, ts.Diagnostics.JSX_element_0_has_no_corresponding_closing_tag, ts.getTextOfNodeFromSourceText(sourceText, openingTag.tagName));
                     }
                     return undefined;
                 case 30 /* LessThanSlashToken */:
@@ -35691,7 +35762,7 @@ var ts;
                 return true;
             }
             if (isUsedInFunctionOrInstanceProperty(usage, declaration, container)) {
-                if (compilerOptions.target === 99 /* ESNext */ && !!compilerOptions.useDefineForClassFields) {
+                if (compilerOptions.target === 99 /* ESNext */ && !!compilerOptions.useDefineForClassFields && ts.getContainingClass(declaration)) {
                     return (ts.isPropertyDeclaration(declaration) || ts.isParameterPropertyDeclaration(declaration, declaration.parent)) &&
                         !isPropertyImmediatelyReferencedWithinDeclaration(declaration, usage, /*stopAtAnyPropertyDeclaration*/ true);
                 }
@@ -37202,7 +37273,7 @@ var ts;
             return getPackagesSet().has(ts.getTypesPackageName(packageName));
         }
         function resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias) {
-            if (moduleSymbol) {
+            if (moduleSymbol === null || moduleSymbol === void 0 ? void 0 : moduleSymbol.exports) {
                 var exportEquals = resolveSymbol(moduleSymbol.exports.get("export=" /* ExportEquals */), dontResolveAlias);
                 var exported = getCommonJsExportEquals(getMergedSymbol(exportEquals), getMergedSymbol(moduleSymbol));
                 return getMergedSymbol(exported) || moduleSymbol;
@@ -38032,7 +38103,7 @@ var ts;
             var sourceFile = enclosingDeclaration && ts.getSourceFileOfNode(enclosingDeclaration);
             printer.writeNode(4 /* Unspecified */, typeNode, /*sourceFile*/ sourceFile, writer);
             var result = writer.getText();
-            var maxLength = noTruncation ? undefined : ts.defaultMaximumTruncationLength * 2;
+            var maxLength = noTruncation ? ts.noTruncationMaximumTruncationLength * 2 : ts.defaultMaximumTruncationLength * 2;
             if (maxLength && result && result.length >= maxLength) {
                 return result.substr(0, maxLength - "...".length) + "...";
             }
@@ -38093,9 +38164,13 @@ var ts;
                     tracker: tracker && tracker.trackSymbol ? tracker : { trackSymbol: ts.noop, moduleResolverHost: flags & 134217728 /* DoNotIncludeSymbolChain */ ? {
                             getCommonSourceDirectory: host.getCommonSourceDirectory ? function () { return host.getCommonSourceDirectory(); } : function () { return ""; },
                             getSourceFiles: function () { return host.getSourceFiles(); },
-                            getCurrentDirectory: ts.maybeBind(host, host.getCurrentDirectory),
+                            getCurrentDirectory: function () { return host.getCurrentDirectory(); },
                             getProbableSymlinks: ts.maybeBind(host, host.getProbableSymlinks),
-                            useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames)
+                            useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames),
+                            redirectTargetsMap: host.redirectTargetsMap,
+                            getProjectReferenceRedirect: function (fileName) { return host.getProjectReferenceRedirect(fileName); },
+                            isSourceOfProjectReferenceRedirect: function (fileName) { return host.isSourceOfProjectReferenceRedirect(fileName); },
+                            fileExists: function (fileName) { return host.fileExists(fileName); },
                         } : undefined },
                     encounteredError: false,
                     visitedTypes: undefined,
@@ -38109,7 +38184,7 @@ var ts;
             function checkTruncationLength(context) {
                 if (context.truncating)
                     return context.truncating;
-                return context.truncating = !(context.flags & 1 /* NoTruncation */) && context.approximateLength > ts.defaultMaximumTruncationLength;
+                return context.truncating = context.approximateLength > ((context.flags & 1 /* NoTruncation */) ? ts.noTruncationMaximumTruncationLength : ts.defaultMaximumTruncationLength);
             }
             function typeToTypeNodeHelper(type, context) {
                 if (cancellationToken && cancellationToken.throwIfCancellationRequested) {
@@ -38995,7 +39070,7 @@ var ts;
                     // specifier preference
                     var moduleResolverHost = context.tracker.moduleResolverHost;
                     var specifierCompilerOptions = isBundle_1 ? __assign(__assign({}, compilerOptions), { baseUrl: moduleResolverHost.getCommonSourceDirectory() }) : compilerOptions;
-                    specifier = ts.first(ts.moduleSpecifiers.getModuleSpecifiers(symbol, specifierCompilerOptions, contextFile, moduleResolverHost, host.getSourceFiles(), { importModuleSpecifierPreference: isBundle_1 ? "non-relative" : "relative" }, host.redirectTargetsMap));
+                    specifier = ts.first(ts.moduleSpecifiers.getModuleSpecifiers(symbol, specifierCompilerOptions, contextFile, moduleResolverHost, { importModuleSpecifierPreference: isBundle_1 ? "non-relative" : "relative" }));
                     links.specifierCache = links.specifierCache || ts.createMap();
                     links.specifierCache.set(contextFile.path, specifier);
                 }
@@ -40186,7 +40261,7 @@ var ts;
                                     var getCanonicalFileName = ts.createGetCanonicalFileName(!!host.useCaseSensitiveFileNames);
                                     var resolverHost = {
                                         getCanonicalFileName: getCanonicalFileName,
-                                        getCurrentDirectory: context.tracker.moduleResolverHost.getCurrentDirectory ? function () { return context.tracker.moduleResolverHost.getCurrentDirectory(); } : function () { return ""; },
+                                        getCurrentDirectory: function () { return context.tracker.moduleResolverHost.getCurrentDirectory(); },
                                         getCommonSourceDirectory: function () { return context.tracker.moduleResolverHost.getCommonSourceDirectory(); }
                                     };
                                     var newName = ts.getResolvedExternalModuleName(resolverHost, targetFile);
@@ -40931,7 +41006,7 @@ var ts;
                 // [Symbol.iterator] or next). This may be because we accessed properties from anyType,
                 // or it may have led to an error inside getElementTypeOfIterable.
                 var forOfStatement = declaration.parent.parent;
-                return checkRightHandSideOfForOf(forOfStatement.expression, forOfStatement.awaitModifier) || anyType;
+                return checkRightHandSideOfForOf(forOfStatement) || anyType;
             }
             if (ts.isBindingPattern(declaration.parent)) {
                 return getTypeForBindingElement(declaration);
@@ -44143,7 +44218,10 @@ var ts;
             return true;
         }
         function getSignatureOfTypeTag(node) {
-            var typeTag = ts.isInJSFile(node) ? ts.getJSDocTypeTag(node) : undefined;
+            // should be attached to a function declaration or expression
+            if (!(ts.isInJSFile(node) && ts.isFunctionLikeDeclaration(node)))
+                return undefined;
+            var typeTag = ts.getJSDocTypeTag(node);
             var signature = typeTag && typeTag.typeExpression && getSingleCallSignature(getTypeFromTypeNode(typeTag.typeExpression));
             return signature && getErasedSignature(signature);
         }
@@ -46157,65 +46235,89 @@ var ts;
             return type;
         }
         function getConditionalType(root, mapper) {
-            var checkType = instantiateType(root.checkType, mapper);
-            var extendsType = instantiateType(root.extendsType, mapper);
-            if (checkType === wildcardType || extendsType === wildcardType) {
-                return wildcardType;
+            var result;
+            var extraTypes;
+            var _loop_11 = function () {
+                var checkType = instantiateType(root.checkType, mapper);
+                var checkTypeInstantiable = isGenericObjectType(checkType) || isGenericIndexType(checkType);
+                var extendsType = instantiateType(root.extendsType, mapper);
+                if (checkType === wildcardType || extendsType === wildcardType) {
+                    return { value: wildcardType };
+                }
+                var combinedMapper = void 0;
+                if (root.inferTypeParameters) {
+                    var context = createInferenceContext(root.inferTypeParameters, /*signature*/ undefined, 0 /* None */);
+                    // We skip inference of the possible `infer` types unles the `extendsType` _is_ an infer type
+                    // if it was, it's trivial to say that extendsType = checkType, however such a pattern is used to
+                    // "reset" the type being build up during constraint calculation and avoid making an apparently "infinite" constraint
+                    // so in those cases we refain from performing inference and retain the uninfered type parameter
+                    if (!checkTypeInstantiable || !ts.some(root.inferTypeParameters, function (t) { return t === extendsType; })) {
+                        // We don't want inferences from constraints as they may cause us to eagerly resolve the
+                        // conditional type instead of deferring resolution. Also, we always want strict function
+                        // types rules (i.e. proper contravariance) for inferences.
+                        inferTypes(context.inferences, checkType, extendsType, 128 /* NoConstraints */ | 256 /* AlwaysStrict */);
+                    }
+                    combinedMapper = mergeTypeMappers(mapper, context.mapper);
+                }
+                // Instantiate the extends type including inferences for 'infer T' type parameters
+                var inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
+                // We attempt to resolve the conditional type only when the check and extends types are non-generic
+                if (!checkTypeInstantiable && !isGenericObjectType(inferredExtendsType) && !isGenericIndexType(inferredExtendsType)) {
+                    // Return falseType for a definitely false extends check. We check an instantiations of the two
+                    // types with type parameters mapped to the wildcard type, the most permissive instantiations
+                    // possible (the wildcard type is assignable to and from all types). If those are not related,
+                    // then no instantiations will be and we can just return the false branch type.
+                    if (!(inferredExtendsType.flags & 3 /* AnyOrUnknown */) && (checkType.flags & 1 /* Any */ || !isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType)))) {
+                        // Return union of trueType and falseType for 'any' since it matches anything
+                        if (checkType.flags & 1 /* Any */) {
+                            (extraTypes || (extraTypes = [])).push(instantiateTypeWithoutDepthIncrease(root.trueType, combinedMapper || mapper));
+                        }
+                        // If falseType is an immediately nested conditional type that isn't distributive or has an
+                        // identical checkType, switch to that type and loop.
+                        var falseType_1 = root.falseType;
+                        if (falseType_1.flags & 16777216 /* Conditional */) {
+                            var newRoot = falseType_1.root;
+                            if (newRoot.node.parent === root.node && (!newRoot.isDistributive || newRoot.checkType === root.checkType)) {
+                                root = newRoot;
+                                return "continue";
+                            }
+                        }
+                        result = instantiateTypeWithoutDepthIncrease(falseType_1, mapper);
+                        return "break";
+                    }
+                    // Return trueType for a definitely true extends check. We check instantiations of the two
+                    // types with type parameters mapped to their restrictive form, i.e. a form of the type parameter
+                    // that has no constraint. This ensures that, for example, the type
+                    //   type Foo<T extends { x: any }> = T extends { x: string } ? string : number
+                    // doesn't immediately resolve to 'string' instead of being deferred.
+                    if (inferredExtendsType.flags & 3 /* AnyOrUnknown */ || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(inferredExtendsType))) {
+                        result = instantiateTypeWithoutDepthIncrease(root.trueType, combinedMapper || mapper);
+                        return "break";
+                    }
+                }
+                // Return a deferred type for a check that is neither definitely true nor definitely false
+                var erasedCheckType = getActualTypeVariable(checkType);
+                result = createType(16777216 /* Conditional */);
+                result.root = root;
+                result.checkType = erasedCheckType;
+                result.extendsType = extendsType;
+                result.mapper = mapper;
+                result.combinedMapper = combinedMapper;
+                result.aliasSymbol = root.aliasSymbol;
+                result.aliasTypeArguments = instantiateTypes(root.aliasTypeArguments, mapper); // TODO: GH#18217
+                return "break";
+            };
+            // We loop here for an immediately nested conditional type in the false position, effectively treating
+            // types of the form 'A extends B ? X : C extends D ? Y : E extends F ? Z : ...' as a single construct for
+            // purposes of resolution. This means such types aren't subject to the instatiation depth limiter.
+            while (true) {
+                var state_4 = _loop_11();
+                if (typeof state_4 === "object")
+                    return state_4.value;
+                if (state_4 === "break")
+                    break;
             }
-            var checkTypeInstantiable = isGenericObjectType(checkType) || isGenericIndexType(checkType);
-            var combinedMapper;
-            if (root.inferTypeParameters) {
-                var context = createInferenceContext(root.inferTypeParameters, /*signature*/ undefined, 0 /* None */);
-                // We skip inference of the possible `infer` types unles the `extendsType` _is_ an infer type
-                // if it was, it's trivial to say that extendsType = checkType, however such a pattern is used to
-                // "reset" the type being build up during constraint calculation and avoid making an apparently "infinite" constraint
-                // so in those cases we refain from performing inference and retain the uninfered type parameter
-                if (!checkTypeInstantiable || !ts.some(root.inferTypeParameters, function (t) { return t === extendsType; })) {
-                    // We don't want inferences from constraints as they may cause us to eagerly resolve the
-                    // conditional type instead of deferring resolution. Also, we always want strict function
-                    // types rules (i.e. proper contravariance) for inferences.
-                    inferTypes(context.inferences, checkType, extendsType, 128 /* NoConstraints */ | 256 /* AlwaysStrict */);
-                }
-                combinedMapper = mergeTypeMappers(mapper, context.mapper);
-            }
-            // Instantiate the extends type including inferences for 'infer T' type parameters
-            var inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
-            // We attempt to resolve the conditional type only when the check and extends types are non-generic
-            if (!checkTypeInstantiable && !isGenericObjectType(inferredExtendsType) && !isGenericIndexType(inferredExtendsType)) {
-                if (inferredExtendsType.flags & 3 /* AnyOrUnknown */) {
-                    return instantiateType(root.trueType, combinedMapper || mapper);
-                }
-                // Return union of trueType and falseType for 'any' since it matches anything
-                if (checkType.flags & 1 /* Any */) {
-                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), instantiateType(root.falseType, mapper)]);
-                }
-                // Return falseType for a definitely false extends check. We check an instantiations of the two
-                // types with type parameters mapped to the wildcard type, the most permissive instantiations
-                // possible (the wildcard type is assignable to and from all types). If those are not related,
-                // then no instantiations will be and we can just return the false branch type.
-                if (!isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType))) {
-                    return instantiateType(root.falseType, mapper);
-                }
-                // Return trueType for a definitely true extends check. We check instantiations of the two
-                // types with type parameters mapped to their restrictive form, i.e. a form of the type parameter
-                // that has no constraint. This ensures that, for example, the type
-                //   type Foo<T extends { x: any }> = T extends { x: string } ? string : number
-                // doesn't immediately resolve to 'string' instead of being deferred.
-                if (isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(inferredExtendsType))) {
-                    return instantiateType(root.trueType, combinedMapper || mapper);
-                }
-            }
-            // Return a deferred type for a check that is neither definitely true nor definitely false
-            var erasedCheckType = getActualTypeVariable(checkType);
-            var result = createType(16777216 /* Conditional */);
-            result.root = root;
-            result.checkType = erasedCheckType;
-            result.extendsType = extendsType;
-            result.mapper = mapper;
-            result.combinedMapper = combinedMapper;
-            result.aliasSymbol = root.aliasSymbol;
-            result.aliasTypeArguments = instantiateTypes(root.aliasTypeArguments, mapper); // TODO: GH#18217
-            return result;
+            return extraTypes ? getUnionType(ts.append(extraTypes, result)) : result;
         }
         function getTrueTypeFromConditionalType(type) {
             return type.resolvedTrueType || (type.resolvedTrueType = instantiateType(type.root.trueType, type.mapper));
@@ -47103,6 +47205,16 @@ var ts;
             instantiationDepth--;
             return result;
         }
+        /**
+         * This can be used to avoid the penalty on instantiation depth for types which result from immediate
+         * simplification. It essentially removes the depth increase done in `instantiateType`.
+         */
+        function instantiateTypeWithoutDepthIncrease(type, mapper) {
+            instantiationDepth--;
+            var result = instantiateType(type, mapper);
+            instantiationDepth++;
+            return result;
+        }
         function instantiateTypeWorker(type, mapper) {
             var _a;
             var flags = type.flags;
@@ -48588,7 +48700,7 @@ var ts;
                     reducedTarget = findMatchingDiscriminantType(source, target, isRelatedTo) || filterPrimitivesIfContainsNonPrimitive(target);
                     checkTypes = reducedTarget.flags & 1048576 /* Union */ ? reducedTarget.types : [reducedTarget];
                 }
-                var _loop_11 = function (prop) {
+                var _loop_12 = function (prop) {
                     if (shouldCheckAsExcessProperty(prop, source.symbol) && !isIgnoredJsxProperty(source, prop)) {
                         if (!isKnownProperty(reducedTarget, prop.escapedName, isComparingJsxAttributes)) {
                             if (reportErrors) {
@@ -48644,9 +48756,9 @@ var ts;
                 };
                 for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    var state_4 = _loop_11(prop);
-                    if (typeof state_4 === "object")
-                        return state_4.value;
+                    var state_5 = _loop_12(prop);
+                    if (typeof state_5 === "object")
+                        return state_5.value;
                 }
                 return false;
             }
@@ -49082,6 +49194,8 @@ var ts;
                         }
                     }
                     else {
+                        // conditionals aren't related to one another via distributive constraint as it is much too inaccurate and allows way
+                        // more assignments than are desirable (since it maps the source check type to its constraint, it loses information)
                         var distributiveConstraint = getConstraintOfDistributiveConditionalType(source);
                         if (distributiveConstraint) {
                             if (result = isRelatedTo(distributiveConstraint, target, reportErrors)) {
@@ -49089,12 +49203,14 @@ var ts;
                                 return result;
                             }
                         }
-                        var defaultConstraint = getDefaultConstraintOfConditionalType(source);
-                        if (defaultConstraint) {
-                            if (result = isRelatedTo(defaultConstraint, target, reportErrors)) {
-                                resetErrorInfo(saveErrorInfo);
-                                return result;
-                            }
+                    }
+                    // conditionals _can_ be related to one another via normal constraint, as, eg, `A extends B ? O : never` should be assignable to `O`
+                    // when `O` is a conditional (`never` is trivially aissgnable to `O`, as is `O`!).
+                    var defaultConstraint = getDefaultConstraintOfConditionalType(source);
+                    if (defaultConstraint) {
+                        if (result = isRelatedTo(defaultConstraint, target, reportErrors)) {
+                            resetErrorInfo(saveErrorInfo);
+                            return result;
                         }
                     }
                 }
@@ -49323,11 +49439,11 @@ var ts;
                 // constituents of 'target'. If any combination does not have a match then 'source' is not relatable.
                 var discriminantCombinations = ts.cartesianProduct(sourceDiscriminantTypes);
                 var matchingTypes = [];
-                var _loop_12 = function (combination) {
+                var _loop_13 = function (combination) {
                     var hasMatch = false;
                     outer: for (var _i = 0, _a = target.types; _i < _a.length; _i++) {
                         var type = _a[_i];
-                        var _loop_13 = function (i) {
+                        var _loop_14 = function (i) {
                             var sourceProperty = sourcePropertiesFiltered[i];
                             var targetProperty = getPropertyOfType(type, sourceProperty.escapedName);
                             if (!targetProperty)
@@ -49343,8 +49459,8 @@ var ts;
                             }
                         };
                         for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
-                            var state_6 = _loop_13(i);
-                            switch (state_6) {
+                            var state_7 = _loop_14(i);
+                            switch (state_7) {
                                 case "continue-outer": continue outer;
                             }
                         }
@@ -49357,9 +49473,9 @@ var ts;
                 };
                 for (var _a = 0, discriminantCombinations_1 = discriminantCombinations; _a < discriminantCombinations_1.length; _a++) {
                     var combination = discriminantCombinations_1[_a];
-                    var state_5 = _loop_12(combination);
-                    if (typeof state_5 === "object")
-                        return state_5.value;
+                    var state_6 = _loop_13(combination);
+                    if (typeof state_6 === "object")
+                        return state_6.value;
                 }
                 // Compare the remaining non-discriminant properties of each match.
                 var result = -1 /* True */;
@@ -49944,7 +50060,7 @@ var ts;
                 // The emptyArray singleton is used to signal a recursive invocation.
                 cache.variances = ts.emptyArray;
                 variances = [];
-                var _loop_14 = function (tp) {
+                var _loop_15 = function (tp) {
                     var unmeasurable = false;
                     var unreliable = false;
                     var oldHandler = outofbandVarianceMarkerHandler;
@@ -49974,7 +50090,7 @@ var ts;
                 };
                 for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
                     var tp = typeParameters_1[_i];
-                    _loop_14(tp);
+                    _loop_15(tp);
                 }
                 cache.variances = variances;
             }
@@ -51082,7 +51198,7 @@ var ts;
         function inferTypes(inferences, originalSource, originalTarget, priority, contravariant) {
             if (priority === void 0) { priority = 0; }
             if (contravariant === void 0) { contravariant = false; }
-            var symbolStack;
+            var symbolOrTypeStack;
             var visited;
             var bivariant = false;
             var propagationType;
@@ -51261,8 +51377,8 @@ var ts;
                     priority = savePriority;
                 }
                 else if (target.flags & 134217728 /* Awaited */) {
-                    var targetTypes = [target.awaitedType, createPromiseLikeType(target.awaitedType)];
-                    inferToMultipleTypes(source, targetTypes, target.flags);
+                    inferFromTypes(source, target.awaitedType);
+                    inferFromTypes(source, createPromiseLikeType(target.awaitedType));
                 }
                 else if (target.flags & 3145728 /* UnionOrIntersection */) {
                     inferToMultipleTypes(source, target.types, target.flags);
@@ -51389,10 +51505,34 @@ var ts;
                 }
                 return typeVariable;
             }
+            function isPromiseForType(promiseType, promisedType) {
+                var _a;
+                return isThenableType(promiseType) && unwrapAwaitedType((_a = getPromisedTypeOfPromise(promiseType)) !== null && _a !== void 0 ? _a : errorType) === promisedType;
+            }
             function inferToMultipleTypes(source, targets, targetFlags) {
                 var typeVariableCount = 0;
                 if (targetFlags & 1048576 /* Union */) {
                     var nakedTypeVariable = void 0;
+                    for (var _i = 0, targets_2 = targets; _i < targets_2.length; _i++) {
+                        var t = targets_2[_i];
+                        if (getInferenceInfoForType(t)) {
+                            nakedTypeVariable = t;
+                            typeVariableCount++;
+                        }
+                    }
+                    // To better support backwards compatibility with the new `awaited` type, we detect a target
+                    // union of exactly `T | PromiseLike<T>` (for any compatible `PromiseLike`). When encountered,
+                    // we infer from source to the type parameter `T`, where each type of source is mapped to extract
+                    // the promised type of any promise (e.g., `string | Promise<number>` becomes `string | number`).
+                    if (typeVariableCount === 1 && targets.length === 2) {
+                        for (var _a = 0, targets_3 = targets; _a < targets_3.length; _a++) {
+                            var t = targets_3[_a];
+                            if (!getInferenceInfoForType(t) && isPromiseForType(t, nakedTypeVariable)) {
+                                inferFromTypes(mapType(source, function (s) { var _a; return (_a = getPromisedTypeOfPromise(s)) !== null && _a !== void 0 ? _a : s; }), nakedTypeVariable);
+                                return;
+                            }
+                        }
+                    }
                     var sources = source.flags & 1048576 /* Union */ ? source.types : [source];
                     var matched_1 = new Array(sources.length);
                     var inferenceCircularity = false;
@@ -51400,13 +51540,9 @@ var ts;
                     // track whether inferences were made from that particular type to some target with
                     // equal priority (i.e. of equal quality) to what we would infer for a naked type
                     // parameter.
-                    for (var _i = 0, targets_2 = targets; _i < targets_2.length; _i++) {
-                        var t = targets_2[_i];
-                        if (getInferenceInfoForType(t)) {
-                            nakedTypeVariable = t;
-                            typeVariableCount++;
-                        }
-                        else {
+                    for (var _b = 0, targets_4 = targets; _b < targets_4.length; _b++) {
+                        var t = targets_4[_b];
+                        if (!getInferenceInfoForType(t)) {
                             for (var i = 0; i < sources.length; i++) {
                                 var saveInferencePriority = inferencePriority;
                                 inferencePriority = 512 /* MaxValue */;
@@ -51444,8 +51580,8 @@ var ts;
                     // We infer from types that are not naked type variables first so that inferences we
                     // make from nested naked type variables and given slightly higher priority by virtue
                     // of being first in the candidates array.
-                    for (var _a = 0, targets_3 = targets; _a < targets_3.length; _a++) {
-                        var t = targets_3[_a];
+                    for (var _c = 0, targets_5 = targets; _c < targets_5.length; _c++) {
+                        var t = targets_5[_c];
                         if (getInferenceInfoForType(t)) {
                             typeVariableCount++;
                         }
@@ -51459,8 +51595,8 @@ var ts;
                 // we want to infer string for T, not Promise<string> | string. For intersection types
                 // we only infer to single naked type variables.
                 if (targetFlags & 2097152 /* Intersection */ ? typeVariableCount === 1 : typeVariableCount > 0) {
-                    for (var _b = 0, targets_4 = targets; _b < targets_4.length; _b++) {
-                        var t = targets_4[_b];
+                    for (var _d = 0, targets_6 = targets; _d < targets_6.length; _d++) {
+                        var t = targets_6[_d];
                         if (getInferenceInfoForType(t)) {
                             inferWithPriority(source, t, 1 /* NakedTypeVariable */);
                         }
@@ -51525,15 +51661,15 @@ var ts;
                 // its symbol with the instance side which would lead to false positives.
                 var isNonConstructorObject = target.flags & 524288 /* Object */ &&
                     !(ts.getObjectFlags(target) & 16 /* Anonymous */ && target.symbol && target.symbol.flags & 32 /* Class */);
-                var symbol = isNonConstructorObject ? target.symbol : undefined;
-                if (symbol) {
-                    if (ts.contains(symbolStack, symbol)) {
+                var symbolOrType = isNonConstructorObject ? isTupleType(target) ? target.target : target.symbol : undefined;
+                if (symbolOrType) {
+                    if (ts.contains(symbolOrTypeStack, symbolOrType)) {
                         inferencePriority = -1 /* Circularity */;
                         return;
                     }
-                    (symbolStack || (symbolStack = [])).push(symbol);
+                    (symbolOrTypeStack || (symbolOrTypeStack = [])).push(symbolOrType);
                     inferFromObjectTypesWorker(source, target);
-                    symbolStack.pop();
+                    symbolOrTypeStack.pop();
                 }
                 else {
                     inferFromObjectTypesWorker(source, target);
@@ -51862,6 +51998,12 @@ var ts;
             }
             return false;
         }
+        // Given a source x, check if target matches x or is an && operation with an operand that matches x.
+        function containsTruthyCheck(source, target) {
+            return isMatchingReference(source, target) ||
+                (target.kind === 210 /* BinaryExpression */ && target.operatorToken.kind === 55 /* AmpersandAmpersandToken */ &&
+                    (containsTruthyCheck(source, target.left) || containsTruthyCheck(source, target.right)));
+        }
         function getAccessedPropertyName(access) {
             return access.kind === 195 /* PropertyAccessExpression */ ? access.name.escapedText :
                 ts.isStringOrNumericLiteralLike(access.argumentExpression) ? ts.escapeLeadingUnderscores(access.argumentExpression.text) :
@@ -52108,7 +52250,7 @@ var ts;
                 case 232 /* ForInStatement */:
                     return stringType;
                 case 233 /* ForOfStatement */:
-                    return checkRightHandSideOfForOf(parent.expression, parent.awaitModifier) || errorType;
+                    return checkRightHandSideOfForOf(parent) || errorType;
                 case 210 /* BinaryExpression */:
                     return getAssignedTypeOfBinaryExpression(parent);
                 case 204 /* DeleteExpression */:
@@ -52149,7 +52291,7 @@ var ts;
                 return stringType;
             }
             if (node.parent.parent.kind === 233 /* ForOfStatement */) {
-                return checkRightHandSideOfForOf(node.parent.parent.expression, node.parent.parent.awaitModifier) || errorType;
+                return checkRightHandSideOfForOf(node.parent.parent) || errorType;
             }
             return errorType;
         }
@@ -52381,20 +52523,29 @@ var ts;
             return isLengthPushOrUnshift || isElementAssignment;
         }
         function isDeclarationWithExplicitTypeAnnotation(declaration) {
-            return !!(declaration && (declaration.kind === 243 /* VariableDeclaration */ || declaration.kind === 157 /* Parameter */ ||
+            return (declaration.kind === 243 /* VariableDeclaration */ || declaration.kind === 157 /* Parameter */ ||
                 declaration.kind === 160 /* PropertyDeclaration */ || declaration.kind === 159 /* PropertySignature */) &&
-                ts.getEffectiveTypeAnnotationNode(declaration));
+                !!ts.getEffectiveTypeAnnotationNode(declaration);
         }
         function getExplicitTypeOfSymbol(symbol, diagnostic) {
             if (symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 512 /* ValueModule */)) {
                 return getTypeOfSymbol(symbol);
             }
             if (symbol.flags & (3 /* Variable */ | 4 /* Property */)) {
-                if (isDeclarationWithExplicitTypeAnnotation(symbol.valueDeclaration)) {
-                    return getTypeOfSymbol(symbol);
-                }
-                if (diagnostic && symbol.valueDeclaration) {
-                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(symbol.valueDeclaration, ts.Diagnostics._0_needs_an_explicit_type_annotation, symbolToString(symbol)));
+                var declaration = symbol.valueDeclaration;
+                if (declaration) {
+                    if (isDeclarationWithExplicitTypeAnnotation(declaration)) {
+                        return getTypeOfSymbol(symbol);
+                    }
+                    if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 233 /* ForOfStatement */) {
+                        var expressionType = getTypeOfDottedName(declaration.parent.parent.expression, /*diagnostic*/ undefined);
+                        if (expressionType) {
+                            return getForOfIterationType(declaration.parent.parent, expressionType);
+                        }
+                    }
+                    if (diagnostic) {
+                        ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(declaration, ts.Diagnostics._0_needs_an_explicit_type_annotation, symbolToString(symbol)));
+                    }
                 }
             }
         }
@@ -53159,14 +53310,22 @@ var ts;
                 if (type.flags & 1 /* Any */ && literal.text === "function") {
                     return type;
                 }
+                if (assumeTrue && type.flags & 2 /* Unknown */ && literal.text === "object") {
+                    // The pattern x && typeof x === 'object', where x is of type unknown, narrows x to type object. We don't
+                    // need to check for the reverse typeof x === 'object' && x since that already narrows correctly.
+                    if (typeOfExpr.parent.parent.kind === 210 /* BinaryExpression */) {
+                        var expr = typeOfExpr.parent.parent;
+                        if (expr.operatorToken.kind === 55 /* AmpersandAmpersandToken */ && expr.right === typeOfExpr.parent && containsTruthyCheck(reference, expr.left)) {
+                            return nonPrimitiveType;
+                        }
+                    }
+                    return getUnionType([nonPrimitiveType, nullType]);
+                }
                 var facts = assumeTrue ?
                     typeofEQFacts.get(literal.text) || 128 /* TypeofEQHostObject */ :
                     typeofNEFacts.get(literal.text) || 32768 /* TypeofNEHostObject */;
                 return getTypeWithFacts(assumeTrue ? mapType(type, narrowTypeForTypeof) : type, facts);
                 function narrowTypeForTypeof(type) {
-                    if (type.flags & 2 /* Unknown */ && literal.text === "object") {
-                        return getUnionType([nonPrimitiveType, nullType]);
-                    }
                     // 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.
@@ -53441,7 +53600,10 @@ var ts;
                         }
                         if (strictNullChecks && assumeTrue && optionalChainContainsReference(predicateArgument, reference) &&
                             !(getTypeFacts(predicate.type) & 65536 /* EQUndefined */)) {
-                            return getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
+                            type = getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
+                        }
+                        if (isMatchingReferenceDiscriminant(predicateArgument, declaredType)) {
+                            return narrowTypeByDiscriminant(type, predicateArgument, function (t) { return getNarrowedType(t, predicate.type, assumeTrue, isTypeSubtypeOf); });
                         }
                     }
                 }
@@ -55323,8 +55485,8 @@ var ts;
             var inDestructuringPattern = ts.isAssignmentTarget(node);
             // Grammar checking
             checkGrammarObjectLiteralExpression(node, inDestructuringPattern);
-            var propertiesTable;
-            var allPropertiesTable = ts.createSymbolTable();
+            var allPropertiesTable = strictNullChecks ? ts.createSymbolTable() : undefined;
+            var propertiesTable = ts.createSymbolTable();
             var propertiesArray = [];
             var spread = emptyObjectType;
             var contextualType = getApparentTypeOfContextualType(node);
@@ -55339,7 +55501,6 @@ var ts;
             var patternWithComputedProperties = false;
             var hasComputedStringProperty = false;
             var hasComputedNumberProperty = false;
-            propertiesTable = ts.createSymbolTable();
             var offset = 0;
             for (var i = 0; i < node.properties.length; i++) {
                 var memberDecl = node.properties[i];
@@ -55398,7 +55559,7 @@ var ts;
                     prop.type = type;
                     prop.target = member;
                     member = prop;
-                    allPropertiesTable.set(prop.escapedName, prop);
+                    allPropertiesTable === null || allPropertiesTable === void 0 ? void 0 : allPropertiesTable.set(prop.escapedName, prop);
                 }
                 else if (memberDecl.kind === 284 /* SpreadAssignment */) {
                     if (languageVersion < 2 /* ES2015 */) {
@@ -55416,15 +55577,8 @@ var ts;
                         error(memberDecl, ts.Diagnostics.Spread_types_may_only_be_created_from_object_types);
                         return errorType;
                     }
-                    for (var _i = 0, _a = getPropertiesOfType(type); _i < _a.length; _i++) {
-                        var right = _a[_i];
-                        var rightType = getTypeOfSymbol(right);
-                        var left = allPropertiesTable.get(right.escapedName);
-                        if (strictNullChecks &&
-                            left &&
-                            !maybeTypeOfKind(rightType, 98304 /* Nullable */)) {
-                            error(left.valueDeclaration, ts.Diagnostics._0_is_specified_more_than_once_so_this_usage_will_be_overwritten, ts.unescapeLeadingUnderscores(left.escapedName));
-                        }
+                    if (allPropertiesTable) {
+                        checkSpreadPropOverrides(type, allPropertiesTable, memberDecl);
                     }
                     spread = getSpreadType(spread, type, node.symbol, objectFlags, inConstContext);
                     offset = i + 1;
@@ -55462,8 +55616,8 @@ var ts;
             // If the object literal is spread into another object literal, skip this step and let the top-level object
             // literal handle it instead.
             if (contextualTypeHasPattern && node.parent.kind !== 284 /* SpreadAssignment */) {
-                for (var _b = 0, _c = getPropertiesOfType(contextualType); _b < _c.length; _b++) {
-                    var prop = _c[_b];
+                for (var _i = 0, _a = getPropertiesOfType(contextualType); _i < _a.length; _i++) {
+                    var prop = _a[_i];
                     if (!propertiesTable.get(prop.escapedName) && !getPropertyOfType(spread, prop.escapedName)) {
                         if (!(prop.flags & 16777216 /* Optional */)) {
                             error(prop.valueDeclaration || prop.bindingElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
@@ -55576,6 +55730,7 @@ var ts;
          */
         function createJsxAttributesTypeFromAttributesProperty(openingLikeElement, checkMode) {
             var attributes = openingLikeElement.attributes;
+            var allAttributesTable = strictNullChecks ? ts.createSymbolTable() : undefined;
             var attributesTable = ts.createSymbolTable();
             var spread = emptyJsxObjectType;
             var hasSpreadAnyType = false;
@@ -55598,6 +55753,7 @@ var ts;
                     attributeSymbol.type = exprType;
                     attributeSymbol.target = member;
                     attributesTable.set(attributeSymbol.escapedName, attributeSymbol);
+                    allAttributesTable === null || allAttributesTable === void 0 ? void 0 : allAttributesTable.set(attributeSymbol.escapedName, attributeSymbol);
                     if (attributeDecl.name.escapedText === jsxChildrenPropertyName) {
                         explicitlySpecifyChildrenAttribute = true;
                     }
@@ -55614,6 +55770,9 @@ var ts;
                     }
                     if (isValidSpreadType(exprType)) {
                         spread = getSpreadType(spread, exprType, attributes.symbol, objectFlags, /*readonly*/ false);
+                        if (allAttributesTable) {
+                            checkSpreadPropOverrides(exprType, allAttributesTable, attributeDecl);
+                        }
                     }
                     else {
                         typeToIntersect = typeToIntersect ? getIntersectionType([typeToIntersect, exprType]) : exprType;
@@ -55689,6 +55848,16 @@ var ts;
             }
             return childrenTypes;
         }
+        function checkSpreadPropOverrides(type, props, spread) {
+            for (var _i = 0, _a = getPropertiesOfType(type); _i < _a.length; _i++) {
+                var right = _a[_i];
+                var left = props.get(right.escapedName);
+                if (left && !maybeTypeOfKind(getTypeOfSymbol(right), 98304 /* Nullable */)) {
+                    var diagnostic = error(left.valueDeclaration, ts.Diagnostics._0_is_specified_more_than_once_so_this_usage_will_be_overwritten, ts.unescapeLeadingUnderscores(left.escapedName));
+                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(spread, ts.Diagnostics.This_spread_always_overwrites_this_property));
+                }
+            }
+        }
         /**
          * Check attributes property of opening-like element. This function is called during chooseOverload to get call signature of a JSX opening-like element.
          * (See "checkApplicableSignatureForJsxOpeningLikeElement" for how the function is used)
@@ -57600,7 +57769,7 @@ var ts;
                         var min_3 = Number.MAX_VALUE;
                         var minIndex = 0;
                         var i_1 = 0;
-                        var _loop_15 = function (c) {
+                        var _loop_16 = function (c) {
                             var chain_2 = function () { return ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Overload_0_of_1_2_gave_the_following_error, i_1 + 1, candidates.length, signatureToString(c)); };
                             var diags_2 = getSignatureApplicabilityError(node, args, c, assignableRelation, 0 /* Normal */, /*reportErrors*/ true, chain_2);
                             if (diags_2) {
@@ -57618,7 +57787,7 @@ var ts;
                         };
                         for (var _a = 0, candidatesForArgumentError_1 = candidatesForArgumentError; _a < candidatesForArgumentError_1.length; _a++) {
                             var c = candidatesForArgumentError_1[_a];
-                            _loop_15(c);
+                            _loop_16(c);
                         }
                         var diags_3 = max > 1 ? allDiagnostics[minIndex] : ts.flatten(allDiagnostics);
                         ts.Debug.assert(diags_3.length > 0, "No errors reported for 3 or fewer overload signatures");
@@ -57752,7 +57921,7 @@ var ts;
             }
             var _a = ts.minAndMax(candidates, getNumNonRestParameters), minArgumentCount = _a.min, maxNonRestParam = _a.max;
             var parameters = [];
-            var _loop_16 = function (i) {
+            var _loop_17 = function (i) {
                 var symbols = ts.mapDefined(candidates, function (s) { return signatureHasRestParameter(s) ?
                     i < s.parameters.length - 1 ? s.parameters[i] : ts.last(s.parameters) :
                     i < s.parameters.length ? s.parameters[i] : undefined; });
@@ -57760,7 +57929,7 @@ var ts;
                 parameters.push(createCombinedSymbolFromTypes(symbols, ts.mapDefined(candidates, function (candidate) { return tryGetTypeAtPosition(candidate, i); })));
             };
             for (var i = 0; i < maxNonRestParam; i++) {
-                _loop_16(i);
+                _loop_17(i);
             }
             var restParameterSymbols = ts.mapDefined(candidates, function (c) { return signatureHasRestParameter(c) ? ts.last(c.parameters) : undefined; });
             var flags = 0 /* None */;
@@ -58866,7 +59035,7 @@ var ts;
             var globalPromiseType = getGlobalPromiseType(/*reportErrors*/ true);
             if (globalPromiseType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || unknownType;
+                promisedType = unwrapAwaitedType(getAwaitedType(promisedType) || unknownType);
                 return createTypeReference(globalPromiseType, [promisedType]);
             }
             return unknownType;
@@ -58876,7 +59045,7 @@ var ts;
             var globalPromiseLikeType = getGlobalPromiseLikeType(/*reportErrors*/ true);
             if (globalPromiseLikeType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || unknownType;
+                promisedType = unwrapAwaitedType(getAwaitedType(promisedType) || unknownType);
                 return createTypeReference(globalPromiseLikeType, [promisedType]);
             }
             return unknownType;
@@ -60931,6 +61100,9 @@ var ts;
                 if (!(func.kind === 163 /* Constructor */ && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
+                if (func.kind === 163 /* Constructor */ && ts.isIdentifier(node.name) && node.name.escapedText === "constructor") {
+                    error(node.name, ts.Diagnostics.constructor_cannot_be_used_as_a_parameter_property_name);
+                }
             }
             if (node.questionToken && ts.isBindingPattern(node.name) && func.body) {
                 error(node, ts.Diagnostics.A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature);
@@ -62050,6 +62222,9 @@ var ts;
          *   - The type has no base constraint,
          *   - OR The base constraint of the type is `any`, `unknown`, `object`, or the empty object `{}`,
          *   - OR The base constraint has a callable `then` member.
+         * This behavior is not entirely sound, as a `T extends { x: any }` could be instantiated with a
+         * subtype that has a callable `then`, however this is unlikely in practice and this slightly more unsound
+         * behavior is much more developer friendly.
          */
         function isGenericAwaitableType(type) {
             if (isGenericObjectType(type)) {
@@ -63410,7 +63585,7 @@ var ts;
             }
             else {
                 var varExpr = node.initializer;
-                var iteratedType = checkRightHandSideOfForOf(node.expression, node.awaitModifier);
+                var iteratedType = checkRightHandSideOfForOf(node);
                 // There may be a destructuring assignment on the left side
                 if (varExpr.kind === 193 /* ArrayLiteralExpression */ || varExpr.kind === 194 /* ObjectLiteralExpression */) {
                     // iteratedType may be undefined. In this case, we still want to check the structure of
@@ -63487,10 +63662,12 @@ var ts;
                 checkVariableDeclaration(decl);
             }
         }
-        function checkRightHandSideOfForOf(rhsExpression, awaitModifier) {
-            var expressionType = checkNonNullExpression(rhsExpression);
-            var use = awaitModifier ? 15 /* ForAwaitOf */ : 13 /* ForOf */;
-            return checkIteratedTypeOrElementType(use, expressionType, undefinedType, rhsExpression);
+        function checkRightHandSideOfForOf(statement) {
+            return getForOfIterationType(statement, checkNonNullExpression(statement.expression));
+        }
+        function getForOfIterationType(statement, expressionType) {
+            var use = statement.awaitModifier ? 15 /* ForAwaitOf */ : 13 /* ForOf */;
+            return checkIteratedTypeOrElementType(use, expressionType, undefinedType, statement.expression);
         }
         function checkIteratedTypeOrElementType(use, inputType, sentType, errorNode) {
             if (isTypeAny(inputType)) {
@@ -64610,7 +64787,7 @@ var ts;
         function issueMemberSpecificError(node, typeWithThis, baseWithThis, broadDiag) {
             // iterate over all implemented properties and issue errors on each one which isn't compatible, rather than the class as a whole, if possible
             var issuedMemberError = false;
-            var _loop_17 = function (member) {
+            var _loop_18 = function (member) {
                 if (ts.hasStaticModifier(member)) {
                     return "continue";
                 }
@@ -64629,7 +64806,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_17(member);
+                _loop_18(member);
             }
             if (!issuedMemberError) {
                 // check again with diagnostics to generate a less-specific error
@@ -66526,7 +66703,7 @@ var ts;
             //     for ( { a } of elems) {
             //     }
             if (expr.parent.kind === 233 /* ForOfStatement */) {
-                var iteratedType = checkRightHandSideOfForOf(expr.parent.expression, expr.parent.awaitModifier);
+                var iteratedType = checkRightHandSideOfForOf(expr.parent);
                 return checkDestructuringAssignment(expr, iteratedType || errorType);
             }
             // If this is from "for" initializer
@@ -71144,6 +71321,11 @@ var ts;
     }
     ts.createJSDocParamTag = createJSDocParamTag;
     /* @internal */
+    function createJSDocClassTag() {
+        return createJSDocTag(311 /* JSDocClassTag */, "class");
+    }
+    ts.createJSDocClassTag = createJSDocClassTag;
+    /* @internal */
     function createJSDocComment(comment, tags) {
         var node = createSynthesizedNode(304 /* JSDocComment */);
         node.comment = comment;
@@ -72162,6 +72344,12 @@ var ts;
         return node;
     }
     ts.moveSyntheticComments = moveSyntheticComments;
+    /** @internal */
+    function ignoreSourceNewlines(node) {
+        getOrCreateEmitNode(node).flags |= 134217728 /* IgnoreSourceNewlines */;
+        return node;
+    }
+    ts.ignoreSourceNewlines = ignoreSourceNewlines;
     /**
      * Gets the constant value to emit for an expression.
      */
@@ -91772,8 +91960,8 @@ var ts;
                         declFileName = paths.declarationFilePath || paths.jsFilePath || file.fileName;
                     }
                     if (declFileName) {
-                        var specifier = ts.moduleSpecifiers.getModuleSpecifier(__assign(__assign({}, options), { baseUrl: options.baseUrl && ts.toPath(options.baseUrl, host.getCurrentDirectory(), host.getCanonicalFileName) }), currentSourceFile, ts.toPath(outputFilePath, host.getCurrentDirectory(), host.getCanonicalFileName), ts.toPath(declFileName, host.getCurrentDirectory(), host.getCanonicalFileName), host, host.getSourceFiles(), 
-                        /*preferences*/ undefined, host.redirectTargetsMap);
+                        var specifier = ts.moduleSpecifiers.getModuleSpecifier(__assign(__assign({}, options), { baseUrl: options.baseUrl && ts.toPath(options.baseUrl, host.getCurrentDirectory(), host.getCanonicalFileName) }), currentSourceFile, ts.toPath(outputFilePath, host.getCurrentDirectory(), host.getCanonicalFileName), ts.toPath(declFileName, host.getCurrentDirectory(), host.getCanonicalFileName), host, 
+                        /*preferences*/ undefined);
                         if (!ts.pathIsRelative(specifier)) {
                             // If some compiler option/symlink/whatever allows access to the file containing the ambient module declaration
                             // via a non-relative name, emit a type reference directive to that non-relative name, rather than
@@ -91788,7 +91976,7 @@ var ts;
                         }
                         // omit references to files from node_modules (npm may disambiguate module
                         // references when installing this package, making the path is unreliable).
-                        if (ts.startsWith(fileName, "node_modules/") || fileName.indexOf("/node_modules/") !== -1) {
+                        if (ts.startsWith(fileName, "node_modules/") || ts.pathContainsNodeModules(fileName)) {
                             return;
                         }
                         references.push({ pos: -1, end: -1, fileName: fileName });
@@ -93827,6 +94015,7 @@ var ts;
             getLibFileFromReference: ts.notImplemented,
             isSourceFileFromExternalLibrary: ts.returnFalse,
             getResolvedProjectReferenceToRedirect: ts.returnUndefined,
+            getProjectReferenceRedirect: ts.returnUndefined,
             isSourceOfProjectReferenceRedirect: ts.returnFalse,
             writeFile: function (name, text, writeByteOrderMark) {
                 switch (name) {
@@ -93866,7 +94055,6 @@ var ts;
             isEmitBlocked: ts.returnFalse,
             readFile: function (f) { return host.readFile(f); },
             fileExists: function (f) { return host.fileExists(f); },
-            directoryExists: host.directoryExists && (function (f) { return host.directoryExists(f); }),
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
             getProgramBuildInfo: ts.returnUndefined,
             getSourceFileFromReference: ts.returnUndefined,
@@ -93901,6 +94089,7 @@ var ts;
         var tempFlags; // TempFlags for the current name generation scope.
         var reservedNamesStack; // Stack of TempFlags reserved in enclosing name generation scopes.
         var reservedNames; // TempFlags to reserve in nested name generation scopes.
+        var preserveSourceNewlines = printerOptions.preserveSourceNewlines; // Can be overridden inside nodes with the `IgnoreSourceNewlines` emit flag.
         var writer;
         var ownWriter; // Reusable `EmitTextWriter` for basic printing.
         var write = writeBase;
@@ -94183,14 +94372,19 @@ var ts;
         function pipelineEmit(emitHint, node) {
             var savedLastNode = lastNode;
             var savedLastSubstitution = lastSubstitution;
+            var savedPreserveSourceNewlines = preserveSourceNewlines;
             lastNode = node;
             lastSubstitution = undefined;
+            if (preserveSourceNewlines && !!(ts.getEmitFlags(node) & 134217728 /* IgnoreSourceNewlines */)) {
+                preserveSourceNewlines = false;
+            }
             var pipelinePhase = getPipelinePhase(0 /* Notification */, emitHint, node);
             pipelinePhase(emitHint, node);
             ts.Debug.assert(lastNode === node);
             var substitute = lastSubstitution;
             lastNode = savedLastNode;
             lastSubstitution = savedLastSubstitution;
+            preserveSourceNewlines = savedPreserveSourceNewlines;
             return substitute || node;
         }
         function getPipelinePhase(phase, emitHint, node) {
@@ -95177,9 +95371,9 @@ var ts;
         function emitPropertyAccessExpression(node) {
             var expression = ts.cast(emitExpression(node.expression), ts.isExpression);
             var token = node.questionDotToken || ts.createNode(24 /* DotToken */, node.expression.end, node.name.pos);
-            var indentBeforeDot = needsIndentation(node, node.expression, token);
-            var indentAfterDot = needsIndentation(node, token, node.name);
-            increaseIndentIf(indentBeforeDot, /*writeSpaceIfNotIndenting*/ false);
+            var linesBeforeDot = getLinesBetweenNodes(node, node.expression, token);
+            var linesAfterDot = getLinesBetweenNodes(node, token, node.name);
+            writeLinesAndIndent(linesBeforeDot, /*writeSpaceIfNotIndenting*/ false);
             var shouldEmitDotDot = token.kind !== 28 /* QuestionDotToken */ &&
                 mayNeedDotDotForPropertyAccess(expression) &&
                 !writer.hasTrailingComment() &&
@@ -95193,9 +95387,9 @@ var ts;
             else {
                 emitTokenWithComment(token.kind, node.expression.end, writePunctuation, node);
             }
-            increaseIndentIf(indentAfterDot, /*writeSpaceIfNotIndenting*/ false);
+            writeLinesAndIndent(linesAfterDot, /*writeSpaceIfNotIndenting*/ false);
             emit(node.name);
-            decreaseIndentIf(indentBeforeDot, indentAfterDot);
+            decreaseIndentIf(linesBeforeDot, linesAfterDot);
         }
         // 1..toString is a valid property access, emit a dot after the literal
         // Also emit a dot if expression is a integer const enum value - it will appear in generated code as numeric literal
@@ -95250,7 +95444,16 @@ var ts;
         }
         function emitParenthesizedExpression(node) {
             var openParenPos = emitTokenWithComment(20 /* OpenParenToken */, node.pos, writePunctuation, node);
+            var leadingNewlines = preserveSourceNewlines && getLeadingLineTerminatorCount(node, [node.expression], 0 /* None */);
+            if (leadingNewlines) {
+                writeLinesAndIndent(leadingNewlines, /*writeLinesIfNotIndenting*/ false);
+            }
             emitExpression(node.expression);
+            var trailingNewlines = preserveSourceNewlines && getClosingLineTerminatorCount(node, [node.expression], 0 /* None */);
+            if (trailingNewlines) {
+                writeLine(trailingNewlines);
+            }
+            decreaseIndentIf(leadingNewlines);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression ? node.expression.end : openParenPos, writePunctuation, node);
         }
         function emitFunctionExpression(node) {
@@ -95342,20 +95545,20 @@ var ts;
                     }
                     case 1 /* EmitRight */: {
                         var isCommaOperator = node.operatorToken.kind !== 27 /* CommaToken */;
-                        var indentBeforeOperator = needsIndentation(node, node.left, node.operatorToken);
-                        var indentAfterOperator = needsIndentation(node, node.operatorToken, node.right);
-                        increaseIndentIf(indentBeforeOperator, isCommaOperator);
+                        var linesBeforeOperator = getLinesBetweenNodes(node, node.left, node.operatorToken);
+                        var linesAfterOperator = getLinesBetweenNodes(node, node.operatorToken, node.right);
+                        writeLinesAndIndent(linesBeforeOperator, isCommaOperator);
                         emitLeadingCommentsOfPosition(node.operatorToken.pos);
                         writeTokenNode(node.operatorToken, node.operatorToken.kind === 97 /* InKeyword */ ? writeKeyword : writeOperator);
                         emitTrailingCommentsOfPosition(node.operatorToken.end, /*prefixSpace*/ true); // Binary operators should have a space before the comment starts
-                        increaseIndentIf(indentAfterOperator, /*writeSpaceIfNotIndenting*/ true);
+                        writeLinesAndIndent(linesAfterOperator, /*writeSpaceIfNotIndenting*/ true);
                         maybePipelineEmitExpression(node.right);
                         break;
                     }
                     case 2 /* FinishEmit */: {
-                        var indentBeforeOperator = needsIndentation(node, node.left, node.operatorToken);
-                        var indentAfterOperator = needsIndentation(node, node.operatorToken, node.right);
-                        decreaseIndentIf(indentBeforeOperator, indentAfterOperator);
+                        var linesBeforeOperator = getLinesBetweenNodes(node, node.left, node.operatorToken);
+                        var linesAfterOperator = getLinesBetweenNodes(node, node.operatorToken, node.right);
+                        decreaseIndentIf(linesBeforeOperator, linesAfterOperator);
                         stackIndex--;
                         break;
                     }
@@ -95391,21 +95594,21 @@ var ts;
             }
         }
         function emitConditionalExpression(node) {
-            var indentBeforeQuestion = needsIndentation(node, node.condition, node.questionToken);
-            var indentAfterQuestion = needsIndentation(node, node.questionToken, node.whenTrue);
-            var indentBeforeColon = needsIndentation(node, node.whenTrue, node.colonToken);
-            var indentAfterColon = needsIndentation(node, node.colonToken, node.whenFalse);
+            var linesBeforeQuestion = getLinesBetweenNodes(node, node.condition, node.questionToken);
+            var linesAfterQuestion = getLinesBetweenNodes(node, node.questionToken, node.whenTrue);
+            var linesBeforeColon = getLinesBetweenNodes(node, node.whenTrue, node.colonToken);
+            var linesAfterColon = getLinesBetweenNodes(node, node.colonToken, node.whenFalse);
             emitExpression(node.condition);
-            increaseIndentIf(indentBeforeQuestion, /*writeSpaceIfNotIndenting*/ true);
+            writeLinesAndIndent(linesBeforeQuestion, /*writeSpaceIfNotIndenting*/ true);
             emit(node.questionToken);
-            increaseIndentIf(indentAfterQuestion, /*writeSpaceIfNotIndenting*/ true);
+            writeLinesAndIndent(linesAfterQuestion, /*writeSpaceIfNotIndenting*/ true);
             emitExpression(node.whenTrue);
-            decreaseIndentIf(indentBeforeQuestion, indentAfterQuestion);
-            increaseIndentIf(indentBeforeColon, /*writeSpaceIfNotIndenting*/ true);
+            decreaseIndentIf(linesBeforeQuestion, linesAfterQuestion);
+            writeLinesAndIndent(linesBeforeColon, /*writeSpaceIfNotIndenting*/ true);
             emit(node.colonToken);
-            increaseIndentIf(indentAfterColon, /*writeSpaceIfNotIndenting*/ true);
+            writeLinesAndIndent(linesAfterColon, /*writeSpaceIfNotIndenting*/ true);
             emitExpression(node.whenFalse);
-            decreaseIndentIf(indentBeforeColon, indentAfterColon);
+            decreaseIndentIf(linesBeforeColon, linesAfterColon);
         }
         function emitTemplateExpression(node) {
             emit(node.head);
@@ -95746,14 +95949,14 @@ var ts;
             if (!ts.nodeIsSynthesized(body) && !ts.rangeIsOnSingleLine(body, currentSourceFile)) {
                 return false;
             }
-            if (shouldWriteLeadingLineTerminator(body, body.statements, 2 /* PreserveLines */)
-                || shouldWriteClosingLineTerminator(body, body.statements, 2 /* PreserveLines */)) {
+            if (getLeadingLineTerminatorCount(body, body.statements, 2 /* PreserveLines */)
+                || getClosingLineTerminatorCount(body, body.statements, 2 /* PreserveLines */)) {
                 return false;
             }
             var previousStatement;
             for (var _a = 0, _b = body.statements; _a < _b.length; _a++) {
                 var statement = _b[_a];
-                if (shouldWriteSeparatingLineTerminator(previousStatement, statement, 2 /* PreserveLines */)) {
+                if (getSeparatingLineTerminatorCount(previousStatement, statement, 2 /* PreserveLines */) > 0) {
                     return false;
                 }
                 previousStatement = statement;
@@ -96715,7 +96918,7 @@ var ts;
             }
             if (isEmpty) {
                 // Write a line terminator if the parent node was multi-line
-                if (format & 1 /* MultiLine */) {
+                if (format & 1 /* MultiLine */ && !(preserveSourceNewlines && ts.rangeIsOnSingleLine(parentNode, currentSourceFile))) {
                     writeLine();
                 }
                 else if (format & 256 /* SpaceBetweenBraces */ && !(format & 524288 /* NoSpaceIfEmpty */)) {
@@ -96726,8 +96929,9 @@ var ts;
                 // Write the opening line terminator or leading whitespace.
                 var mayEmitInterveningComments = (format & 262144 /* NoInterveningComments */) === 0;
                 var shouldEmitInterveningComments = mayEmitInterveningComments;
-                if (shouldWriteLeadingLineTerminator(parentNode, children, format)) { // TODO: GH#18217
-                    writeLine();
+                var leadingLineTerminatorCount = getLeadingLineTerminatorCount(parentNode, children, format); // TODO: GH#18217
+                if (leadingLineTerminatorCount) {
+                    writeLine(leadingLineTerminatorCount);
                     shouldEmitInterveningComments = false;
                 }
                 else if (format & 256 /* SpaceBetweenBraces */) {
@@ -96762,14 +96966,15 @@ var ts;
                         writeDelimiter(format);
                         recordBundleFileInternalSectionEnd(previousSourceFileTextKind);
                         // Write either a line terminator or whitespace to separate the elements.
-                        if (shouldWriteSeparatingLineTerminator(previousSibling, child, format)) {
+                        var separatingLineTerminatorCount = getSeparatingLineTerminatorCount(previousSibling, child, format);
+                        if (separatingLineTerminatorCount > 0) {
                             // If a synthesized node in a single-line list starts on a new
                             // line, we should increase the indent.
                             if ((format & (3 /* LinesMask */ | 128 /* Indented */)) === 0 /* SingleLine */) {
                                 increaseIndent();
                                 shouldDecreaseIndentAfterEmit = true;
                             }
-                            writeLine();
+                            writeLine(separatingLineTerminatorCount);
                             shouldEmitInterveningComments = false;
                         }
                         else if (previousSibling && format & 512 /* SpaceBetweenSiblings */) {
@@ -96814,8 +97019,9 @@ var ts;
                 }
                 recordBundleFileInternalSectionEnd(previousSourceFileTextKind);
                 // Write the closing line terminator or closing whitespace.
-                if (shouldWriteClosingLineTerminator(parentNode, children, format)) {
-                    writeLine();
+                var closingLineTerminatorCount = getClosingLineTerminatorCount(parentNode, children, format);
+                if (closingLineTerminatorCount) {
+                    writeLine(closingLineTerminatorCount);
                 }
                 else if (format & 256 /* SpaceBetweenBraces */) {
                     writeSpace();
@@ -96869,8 +97075,11 @@ var ts;
         function writeProperty(s) {
             writer.writeProperty(s);
         }
-        function writeLine() {
-            writer.writeLine();
+        function writeLine(count) {
+            if (count === void 0) { count = 1; }
+            for (var i = 0; i < count; i++) {
+                writer.writeLine(i > 0);
+            }
         }
         function increaseIndent() {
             writer.increaseIndent();
@@ -96917,10 +97126,10 @@ var ts;
                 }
             }
         }
-        function increaseIndentIf(value, writeSpaceIfNotIndenting) {
-            if (value) {
+        function writeLinesAndIndent(lineCount, writeSpaceIfNotIndenting) {
+            if (lineCount) {
                 increaseIndent();
-                writeLine();
+                writeLine(lineCount);
             }
             else if (writeSpaceIfNotIndenting) {
                 writeSpace();
@@ -96938,70 +97147,101 @@ var ts;
                 decreaseIndent();
             }
         }
-        function shouldWriteLeadingLineTerminator(parentNode, children, format) {
-            if (format & 1 /* MultiLine */) {
-                return true;
-            }
-            if (format & 2 /* PreserveLines */) {
+        function getLeadingLineTerminatorCount(parentNode, children, format) {
+            if (format & 2 /* PreserveLines */ || preserveSourceNewlines) {
                 if (format & 65536 /* PreferNewLine */) {
-                    return true;
+                    return 1;
                 }
-                var firstChild = children[0];
-                if (firstChild === undefined) {
-                    return !ts.rangeIsOnSingleLine(parentNode, currentSourceFile);
+                var firstChild_1 = children[0];
+                if (firstChild_1 === undefined) {
+                    return ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
                 }
-                else if (ts.positionIsSynthesized(parentNode.pos) || ts.nodeIsSynthesized(firstChild)) {
-                    return synthesizedNodeStartsOnNewLine(firstChild, format);
+                if (firstChild_1.kind === 11 /* JsxText */) {
+                    // JsxText will be written with its leading whitespace, so don't add more manually.
+                    return 0;
                 }
-                else {
-                    return !ts.rangeStartPositionsAreOnSameLine(parentNode, firstChild, currentSourceFile);
+                if (!ts.positionIsSynthesized(parentNode.pos) && !ts.nodeIsSynthesized(firstChild_1) && firstChild_1.parent === parentNode) {
+                    if (preserveSourceNewlines) {
+                        return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter(firstChild_1.pos, currentSourceFile, includeComments); });
+                    }
+                    return ts.rangeStartPositionsAreOnSameLine(parentNode, firstChild_1, currentSourceFile) ? 0 : 1;
+                }
+                if (synthesizedNodeStartsOnNewLine(firstChild_1, format)) {
+                    return 1;
                 }
             }
-            else {
-                return false;
-            }
+            return format & 1 /* MultiLine */ ? 1 : 0;
         }
-        function shouldWriteSeparatingLineTerminator(previousNode, nextNode, format) {
-            if (format & 1 /* MultiLine */) {
-                return true;
-            }
-            else if (format & 2 /* PreserveLines */) {
+        function getSeparatingLineTerminatorCount(previousNode, nextNode, format) {
+            if (format & 2 /* PreserveLines */ || preserveSourceNewlines) {
                 if (previousNode === undefined || nextNode === undefined) {
-                    return false;
+                    return 0;
                 }
-                else if (ts.nodeIsSynthesized(previousNode) || ts.nodeIsSynthesized(nextNode)) {
-                    return synthesizedNodeStartsOnNewLine(previousNode, format) || synthesizedNodeStartsOnNewLine(nextNode, format);
+                if (nextNode.kind === 11 /* JsxText */) {
+                    // JsxText will be written with its leading whitespace, so don't add more manually.
+                    return 0;
                 }
-                else {
-                    return !ts.rangeEndIsOnSameLineAsRangeStart(previousNode, nextNode, currentSourceFile);
+                else if (!ts.nodeIsSynthesized(previousNode) && !ts.nodeIsSynthesized(nextNode) && previousNode.parent === nextNode.parent) {
+                    if (preserveSourceNewlines) {
+                        return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenRangeEndAndRangeStart(previousNode, nextNode, currentSourceFile, includeComments); });
+                    }
+                    return ts.rangeEndIsOnSameLineAsRangeStart(previousNode, nextNode, currentSourceFile) ? 0 : 1;
+                }
+                else if (synthesizedNodeStartsOnNewLine(previousNode, format) || synthesizedNodeStartsOnNewLine(nextNode, format)) {
+                    return 1;
                 }
             }
-            else {
-                return ts.getStartsOnNewLine(nextNode);
+            else if (ts.getStartsOnNewLine(nextNode)) {
+                return 1;
             }
+            return format & 1 /* MultiLine */ ? 1 : 0;
         }
-        function shouldWriteClosingLineTerminator(parentNode, children, format) {
-            if (format & 1 /* MultiLine */) {
-                return (format & 131072 /* NoTrailingNewLine */) === 0;
-            }
-            else if (format & 2 /* PreserveLines */) {
+        function getClosingLineTerminatorCount(parentNode, children, format) {
+            if (format & 2 /* PreserveLines */ || preserveSourceNewlines) {
                 if (format & 65536 /* PreferNewLine */) {
-                    return true;
+                    return 1;
                 }
-                var lastChild = ts.lastOrUndefined(children);
-                if (lastChild === undefined) {
-                    return !ts.rangeIsOnSingleLine(parentNode, currentSourceFile);
+                var lastChild_1 = ts.lastOrUndefined(children);
+                if (lastChild_1 === undefined) {
+                    return ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
                 }
-                else if (ts.positionIsSynthesized(parentNode.pos) || ts.nodeIsSynthesized(lastChild)) {
-                    return synthesizedNodeStartsOnNewLine(lastChild, format);
+                if (!ts.positionIsSynthesized(parentNode.pos) && !ts.nodeIsSynthesized(lastChild_1) && lastChild_1.parent === parentNode) {
+                    if (preserveSourceNewlines) {
+                        return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenPositionAndNextNonWhitespaceCharacter(lastChild_1.end, currentSourceFile, includeComments); });
+                    }
+                    return ts.rangeEndPositionsAreOnSameLine(parentNode, lastChild_1, currentSourceFile) ? 0 : 1;
                 }
-                else {
-                    return !ts.rangeEndPositionsAreOnSameLine(parentNode, lastChild, currentSourceFile);
+                if (synthesizedNodeStartsOnNewLine(lastChild_1, format)) {
+                    return 1;
                 }
             }
-            else {
-                return false;
+            if (format & 1 /* MultiLine */ && !(format & 131072 /* NoTrailingNewLine */)) {
+                return 1;
             }
+            return 0;
+        }
+        function getEffectiveLines(getLineDifference) {
+            // If 'preserveSourceNewlines' is disabled, we should never call this function
+            // because it could be more expensive than alternative approximations.
+            ts.Debug.assert(!!preserveSourceNewlines);
+            // We start by measuring the line difference from a position to its adjacent comments,
+            // so that this is counted as a one-line difference, not two:
+            //
+            //   node1;
+            //   // NODE2 COMMENT
+            //   node2;
+            var lines = getLineDifference(/*includeComments*/ true);
+            if (lines === 0) {
+                // However, if the line difference considering comments was 0, we might have this:
+                //
+                //   node1; // NODE2 COMMENT
+                //   node2;
+                //
+                // in which case we should be ignoring node2's comment, so this too is counted as
+                // a one-line difference, not zero.
+                return getLineDifference(/*includeComments*/ false);
+            }
+            return lines;
         }
         function synthesizedNodeStartsOnNewLine(node, format) {
             if (ts.nodeIsSynthesized(node)) {
@@ -97013,21 +97253,24 @@ var ts;
             }
             return (format & 65536 /* PreferNewLine */) !== 0;
         }
-        function needsIndentation(parent, node1, node2) {
+        function getLinesBetweenNodes(parent, node1, node2) {
             if (ts.getEmitFlags(parent) & 131072 /* NoIndentation */) {
-                return false;
+                return 0;
             }
             parent = skipSynthesizedParentheses(parent);
             node1 = skipSynthesizedParentheses(node1);
             node2 = skipSynthesizedParentheses(node2);
             // Always use a newline for synthesized code if the synthesizer desires it.
             if (ts.getStartsOnNewLine(node2)) {
-                return true;
+                return 1;
             }
-            return !ts.nodeIsSynthesized(parent)
-                && !ts.nodeIsSynthesized(node1)
-                && !ts.nodeIsSynthesized(node2)
-                && !ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile);
+            if (!ts.nodeIsSynthesized(parent) && !ts.nodeIsSynthesized(node1) && !ts.nodeIsSynthesized(node2)) {
+                if (preserveSourceNewlines) {
+                    return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenRangeEndAndRangeStart(node1, node2, currentSourceFile, includeComments); });
+                }
+                return ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile) ? 0 : 1;
+            }
+            return 0;
         }
         function isEmptyBlock(block) {
             return block.statements.length === 0
@@ -98860,14 +99103,14 @@ var ts;
         var mapFromToProjectReferenceRedirectSource;
         var useSourceOfProjectReferenceRedirect = !!((_a = host.useSourceOfProjectReferenceRedirect) === null || _a === void 0 ? void 0 : _a.call(host)) &&
             !options.disableSourceOfProjectReferenceRedirect;
-        var onProgramCreateComplete = updateHostForUseSourceOfProjectReferenceRedirect({
+        var _b = updateHostForUseSourceOfProjectReferenceRedirect({
             compilerHost: host,
             useSourceOfProjectReferenceRedirect: useSourceOfProjectReferenceRedirect,
             toPath: toPath,
             getResolvedProjectReferences: getResolvedProjectReferences,
             getSourceOfProjectReferenceRedirect: getSourceOfProjectReferenceRedirect,
             forEachResolvedProjectReference: forEachResolvedProjectReference
-        });
+        }), onProgramCreateComplete = _b.onProgramCreateComplete, fileExists = _b.fileExists;
         var shouldCreateNewSourceFile = shouldProgramCreateNewSourceFiles(oldProgram, options);
         // We set `structuralIsReused` to `undefined` because `tryReuseStructureFromOldProgram` calls `tryReuseStructureFromOldProgram` which checks
         // `structuralIsReused`, which would be a TDZ violation if it was not set in advance to `undefined`.
@@ -98888,8 +99131,8 @@ var ts;
                         var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out;
                         if (useSourceOfProjectReferenceRedirect) {
                             if (out || ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) {
-                                for (var _b = 0, _c = parsedRef.commandLine.fileNames; _b < _c.length; _b++) {
-                                    var fileName = _c[_b];
+                                for (var _c = 0, _d = parsedRef.commandLine.fileNames; _c < _d.length; _c++) {
+                                    var fileName = _d[_c];
                                     processSourceFile(fileName, /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
                                 }
                             }
@@ -98899,8 +99142,8 @@ var ts;
                                 processSourceFile(ts.changeExtension(out, ".d.ts"), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
                             }
                             else if (ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) {
-                                for (var _d = 0, _e = parsedRef.commandLine.fileNames; _d < _e.length; _d++) {
-                                    var fileName = _e[_d];
+                                for (var _e = 0, _f = parsedRef.commandLine.fileNames; _e < _f.length; _e++) {
+                                    var fileName = _f[_e];
                                     if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) && !ts.fileExtensionIs(fileName, ".json" /* Json */)) {
                                         processSourceFile(ts.getOutputDeclarationFileName(fileName, parsedRef.commandLine, !host.useCaseSensitiveFileNames()), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
                                     }
@@ -98952,8 +99195,8 @@ var ts;
         // not part of the new program.
         if (oldProgram && host.onReleaseOldSourceFile) {
             var oldSourceFiles = oldProgram.getSourceFiles();
-            for (var _f = 0, oldSourceFiles_1 = oldSourceFiles; _f < oldSourceFiles_1.length; _f++) {
-                var oldSourceFile = oldSourceFiles_1[_f];
+            for (var _g = 0, oldSourceFiles_1 = oldSourceFiles; _g < oldSourceFiles_1.length; _g++) {
+                var oldSourceFile = oldSourceFiles_1[_g];
                 var newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
                 if (shouldCreateNewSourceFile || !newFile ||
                     // old file wasnt redirect but new file is
@@ -99018,6 +99261,7 @@ var ts;
             forEachResolvedProjectReference: forEachResolvedProjectReference,
             isSourceOfProjectReferenceRedirect: isSourceOfProjectReferenceRedirect,
             emitBuildInfo: emitBuildInfo,
+            fileExists: fileExists,
             getProbableSymlinks: getProbableSymlinks,
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
         };
@@ -99461,11 +99705,26 @@ var ts;
             return oldProgram.structureIsReused = 2 /* Completely */;
         }
         function getEmitHost(writeFileCallback) {
-            return __assign(__assign({ getPrependNodes: getPrependNodes,
-                getCanonicalFileName: getCanonicalFileName, getCommonSourceDirectory: program.getCommonSourceDirectory, getCompilerOptions: program.getCompilerOptions, getCurrentDirectory: function () { return currentDirectory; }, getNewLine: function () { return host.getNewLine(); }, getSourceFile: program.getSourceFile, getSourceFileByPath: program.getSourceFileByPath, getSourceFiles: program.getSourceFiles, getLibFileFromReference: program.getLibFileFromReference, isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
+            return {
+                getPrependNodes: getPrependNodes,
+                getCanonicalFileName: getCanonicalFileName,
+                getCommonSourceDirectory: program.getCommonSourceDirectory,
+                getCompilerOptions: program.getCompilerOptions,
+                getCurrentDirectory: function () { return currentDirectory; },
+                getNewLine: function () { return host.getNewLine(); },
+                getSourceFile: program.getSourceFile,
+                getSourceFileByPath: program.getSourceFileByPath,
+                getSourceFiles: program.getSourceFiles,
+                getLibFileFromReference: program.getLibFileFromReference,
+                isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
                 getResolvedProjectReferenceToRedirect: getResolvedProjectReferenceToRedirect,
+                getProjectReferenceRedirect: getProjectReferenceRedirect,
                 isSourceOfProjectReferenceRedirect: isSourceOfProjectReferenceRedirect,
-                getProbableSymlinks: getProbableSymlinks, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, fileExists: function (f) {
+                getProbableSymlinks: getProbableSymlinks,
+                writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }),
+                isEmitBlocked: isEmitBlocked,
+                readFile: function (f) { return host.readFile(f); },
+                fileExists: function (f) {
                     // Use local caches
                     var path = toPath(f);
                     if (getSourceFileByPath(path))
@@ -99474,7 +99733,12 @@ var ts;
                         return false;
                     // Before falling back to the host
                     return host.fileExists(f);
-                } }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {})), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); }, redirectTargetsMap: redirectTargetsMap });
+                },
+                useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
+                getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); },
+                getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); },
+                redirectTargetsMap: redirectTargetsMap,
+            };
         }
         function emitBuildInfo(writeFileCallback) {
             ts.Debug.assert(!options.out && !options.outFile);
@@ -100136,7 +100400,7 @@ var ts;
                 }
                 var sourceFileWithAddedExtension = ts.forEach(supportedExtensions, function (extension) { return getSourceFile(fileName + extension); });
                 if (fail && !sourceFileWithAddedExtension)
-                    fail(ts.Diagnostics.File_0_not_found, fileName + ".ts" /* Ts */);
+                    fail(ts.Diagnostics.Could_not_resolve_the_path_0_with_the_extensions_Colon_1, fileName, "'" + supportedExtensions.join("', '") + "'");
                 return sourceFileWithAddedExtension;
             }
         }
@@ -101140,20 +101404,8 @@ var ts;
         var originalGetDirectories = host.compilerHost.getDirectories;
         var originalRealpath = host.compilerHost.realpath;
         if (!host.useSourceOfProjectReferenceRedirect)
-            return ts.noop;
-        // This implementation of fileExists checks if the file being requested is
-        // .d.ts file for the referenced Project.
-        // If it is it returns true irrespective of whether that file exists on host
-        host.compilerHost.fileExists = function (file) {
-            if (originalFileExists.call(host.compilerHost, file))
-                return true;
-            if (!host.getResolvedProjectReferences())
-                return false;
-            if (!ts.isDeclarationFileName(file))
-                return false;
-            // Project references go to source file instead of .d.ts file
-            return fileOrDirectoryExistsUsingSource(file, /*isFile*/ true);
-        };
+            return { onProgramCreateComplete: ts.noop, fileExists: fileExists };
+        host.compilerHost.fileExists = fileExists;
         if (originalDirectoryExists) {
             // This implementation of directoryExists checks if the directory being requested is
             // directory of .d.ts file for the referenced Project.
@@ -101202,13 +101454,26 @@ var ts;
                     originalRealpath.call(host.compilerHost, s);
             };
         }
-        return onProgramCreateComplete;
+        return { onProgramCreateComplete: onProgramCreateComplete, fileExists: fileExists };
         function onProgramCreateComplete() {
             host.compilerHost.fileExists = originalFileExists;
             host.compilerHost.directoryExists = originalDirectoryExists;
             host.compilerHost.getDirectories = originalGetDirectories;
             // DO not revert realpath as it could be used later
         }
+        // This implementation of fileExists checks if the file being requested is
+        // .d.ts file for the referenced Project.
+        // If it is it returns true irrespective of whether that file exists on host
+        function fileExists(file) {
+            if (originalFileExists.call(host.compilerHost, file))
+                return true;
+            if (!host.getResolvedProjectReferences())
+                return false;
+            if (!ts.isDeclarationFileName(file))
+                return false;
+            // Project references go to source file instead of .d.ts file
+            return fileOrDirectoryExistsUsingSource(file, /*isFile*/ true);
+        }
         function fileExistsIfProjectReferenceDts(file) {
             var source = host.getSourceOfProjectReferenceRedirect(file);
             return source !== undefined ?
@@ -101394,8 +101659,8 @@ var ts;
 (function (ts) {
     function getFileEmitOutput(program, sourceFile, emitOnlyDtsFiles, cancellationToken, customTransformers, forceDtsEmit) {
         var outputFiles = [];
-        var emitResult = program.emit(sourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers, forceDtsEmit);
-        return { outputFiles: outputFiles, emitSkipped: emitResult.emitSkipped, exportedModulesFromDeclarationEmit: emitResult.exportedModulesFromDeclarationEmit };
+        var _a = program.emit(sourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers, forceDtsEmit), emitSkipped = _a.emitSkipped, diagnostics = _a.diagnostics, exportedModulesFromDeclarationEmit = _a.exportedModulesFromDeclarationEmit;
+        return { outputFiles: outputFiles, emitSkipped: emitSkipped, diagnostics: diagnostics, exportedModulesFromDeclarationEmit: exportedModulesFromDeclarationEmit };
         function writeFile(fileName, text, writeByteOrderMark) {
             outputFiles.push({ name: fileName, writeByteOrderMark: writeByteOrderMark, text: text });
         }
@@ -101603,12 +101868,14 @@ var ts;
          * This should be called whenever it is safe to commit the state of the builder
          */
         function updateSignaturesFromCache(state, signatureCache) {
-            signatureCache.forEach(function (signature, path) {
-                state.fileInfos.get(path).signature = signature;
-                state.hasCalledUpdateShapeSignature.set(path, true);
-            });
+            signatureCache.forEach(function (signature, path) { return updateSignatureOfFile(state, signature, path); });
         }
         BuilderState.updateSignaturesFromCache = updateSignaturesFromCache;
+        function updateSignatureOfFile(state, signature, path) {
+            state.fileInfos.get(path).signature = signature;
+            state.hasCalledUpdateShapeSignature.set(path, true);
+        }
+        BuilderState.updateSignatureOfFile = updateSignatureOfFile;
         /**
          * Returns if the shape of the signature has changed since last emit
          */
@@ -103482,39 +103749,39 @@ var ts;
                     ts.getEmitModuleResolutionKind(compilerOptions) !== ts.ModuleResolutionKind.NodeJs || ts.endsWith(oldImportSpecifier, "index") ? 1 /* Index */ : 0 /* Minimal */,
             };
         }
-        function updateModuleSpecifier(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, oldImportSpecifier) {
-            var res = getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, getPreferencesForUpdate(compilerOptions, oldImportSpecifier));
+        function updateModuleSpecifier(compilerOptions, importingSourceFileName, toFileName, host, oldImportSpecifier) {
+            var res = getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, getPreferencesForUpdate(compilerOptions, oldImportSpecifier));
             if (res === oldImportSpecifier)
                 return undefined;
             return res;
         }
         moduleSpecifiers.updateModuleSpecifier = updateModuleSpecifier;
         // Note: importingSourceFile is just for usesJsExtensionOnImports
-        function getModuleSpecifier(compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, files, preferences, redirectTargetsMap) {
+        function getModuleSpecifier(compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, preferences) {
             if (preferences === void 0) { preferences = {}; }
-            return getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, getPreferences(preferences, compilerOptions, importingSourceFile));
+            return getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, getPreferences(preferences, compilerOptions, importingSourceFile));
         }
         moduleSpecifiers.getModuleSpecifier = getModuleSpecifier;
-        function getNodeModulesPackageName(compilerOptions, importingSourceFileName, nodeModulesFileName, host, files, redirectTargetsMap) {
+        function getNodeModulesPackageName(compilerOptions, importingSourceFileName, nodeModulesFileName, host) {
             var info = getInfo(importingSourceFileName, host);
-            var modulePaths = getAllModulePaths(files, importingSourceFileName, nodeModulesFileName, info.getCanonicalFileName, host, redirectTargetsMap);
+            var modulePaths = getAllModulePaths(importingSourceFileName, nodeModulesFileName, host);
             return ts.firstDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions, /*packageNameOnly*/ true); });
         }
         moduleSpecifiers.getNodeModulesPackageName = getNodeModulesPackageName;
-        function getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, preferences) {
+        function getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, preferences) {
             var info = getInfo(importingSourceFileName, host);
-            var modulePaths = getAllModulePaths(files, importingSourceFileName, toFileName, info.getCanonicalFileName, host, redirectTargetsMap);
+            var modulePaths = getAllModulePaths(importingSourceFileName, toFileName, host);
             return ts.firstDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions); }) ||
                 getLocalModuleSpecifier(toFileName, info, compilerOptions, preferences);
         }
         /** Returns an import for each symlink and for the realpath. */
-        function getModuleSpecifiers(moduleSymbol, compilerOptions, importingSourceFile, host, files, userPreferences, redirectTargetsMap) {
+        function getModuleSpecifiers(moduleSymbol, compilerOptions, importingSourceFile, host, userPreferences) {
             var ambient = tryGetModuleNameFromAmbientModule(moduleSymbol);
             if (ambient)
                 return [ambient];
             var info = getInfo(importingSourceFile.path, host);
             var moduleSourceFile = ts.getSourceFileOfNode(moduleSymbol.valueDeclaration || ts.getNonAugmentationDeclaration(moduleSymbol));
-            var modulePaths = getAllModulePaths(files, importingSourceFile.path, moduleSourceFile.originalFileName, info.getCanonicalFileName, host, redirectTargetsMap);
+            var modulePaths = getAllModulePaths(importingSourceFile.path, moduleSourceFile.originalFileName, host);
             var preferences = getPreferences(userPreferences, compilerOptions, importingSourceFile);
             var global = ts.mapDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions); });
             return global.length ? global : modulePaths.map(function (moduleFileName) { return getLocalModuleSpecifier(moduleFileName, info, compilerOptions, preferences); });
@@ -103573,10 +103840,12 @@ var ts;
         function comparePathsByNumberOfDirectorySeparators(a, b) {
             return ts.compareValues(numberOfDirectorySeparators(a), numberOfDirectorySeparators(b));
         }
-        function forEachFileNameOfModule(files, importingFileName, importedFileName, getCanonicalFileName, host, redirectTargetsMap, preferSymlinks, cb) {
-            var redirects = redirectTargetsMap.get(importedFileName);
-            var importedFileNames = redirects ? __spreadArrays(redirects, [importedFileName]) : [importedFileName];
-            var cwd = host.getCurrentDirectory ? host.getCurrentDirectory() : "";
+        function forEachFileNameOfModule(importingFileName, importedFileName, host, preferSymlinks, cb) {
+            var getCanonicalFileName = ts.hostGetCanonicalFileName(host);
+            var cwd = host.getCurrentDirectory();
+            var referenceRedirect = host.isSourceOfProjectReferenceRedirect(importedFileName) ? host.getProjectReferenceRedirect(importedFileName) : undefined;
+            var redirects = host.redirectTargetsMap.get(ts.toPath(importedFileName, cwd, getCanonicalFileName)) || ts.emptyArray;
+            var importedFileNames = __spreadArrays((referenceRedirect ? [referenceRedirect] : ts.emptyArray), [importedFileName], redirects);
             var targets = importedFileNames.map(function (f) { return ts.getNormalizedAbsolutePath(f, cwd); });
             if (!preferSymlinks) {
                 var result_10 = ts.forEach(targets, cb);
@@ -103584,8 +103853,8 @@ var ts;
                     return result_10;
             }
             var links = host.getProbableSymlinks
-                ? host.getProbableSymlinks(files)
-                : ts.discoverProbableSymlinks(files, getCanonicalFileName, cwd);
+                ? host.getProbableSymlinks(host.getSourceFiles())
+                : ts.discoverProbableSymlinks(host.getSourceFiles(), getCanonicalFileName, cwd);
             var compareStrings = (!host.useCaseSensitiveFileNames || host.useCaseSensitiveFileNames()) ? ts.compareStringsCaseSensitive : ts.compareStringsCaseInsensitive;
             var result = ts.forEachEntry(links, function (resolved, path) {
                 if (ts.startsWithDirectory(importingFileName, resolved, getCanonicalFileName)) {
@@ -103610,22 +103879,28 @@ var ts;
          * Looks for existing imports that use symlinks to this module.
          * Symlinks will be returned first so they are preferred over the real path.
          */
-        function getAllModulePaths(files, importingFileName, importedFileName, getCanonicalFileName, host, redirectTargetsMap) {
-            var cwd = host.getCurrentDirectory ? host.getCurrentDirectory() : "";
+        function getAllModulePaths(importingFileName, importedFileName, host) {
+            var cwd = host.getCurrentDirectory();
+            var getCanonicalFileName = ts.hostGetCanonicalFileName(host);
             var allFileNames = ts.createMap();
-            forEachFileNameOfModule(files, importingFileName, importedFileName, getCanonicalFileName, host, redirectTargetsMap, 
+            var importedFileFromNodeModules = false;
+            forEachFileNameOfModule(importingFileName, importedFileName, host, 
             /*preferSymlinks*/ true, function (path) {
                 // dont return value, so we collect everything
                 allFileNames.set(path, getCanonicalFileName(path));
+                importedFileFromNodeModules = importedFileFromNodeModules || ts.pathContainsNodeModules(path);
             });
             // Sort by paths closest to importing file Name directory
             var sortedPaths = [];
-            var _loop_18 = function (directory) {
+            var _loop_19 = function (directory) {
                 var directoryStart = ts.ensureTrailingDirectorySeparator(directory);
                 var pathsInDirectory;
                 allFileNames.forEach(function (canonicalFileName, fileName) {
                     if (ts.startsWith(canonicalFileName, directoryStart)) {
-                        (pathsInDirectory || (pathsInDirectory = [])).push(fileName);
+                        // If the importedFile is from node modules, use only paths in node_modules folder as option
+                        if (!importedFileFromNodeModules || ts.pathContainsNodeModules(fileName)) {
+                            (pathsInDirectory || (pathsInDirectory = [])).push(fileName);
+                        }
                         allFileNames.delete(fileName);
                     }
                 });
@@ -103643,9 +103918,9 @@ var ts;
             };
             var out_directory_1;
             for (var directory = ts.getDirectoryPath(ts.toPath(importingFileName, cwd, getCanonicalFileName)); allFileNames.size !== 0;) {
-                var state_7 = _loop_18(directory);
+                var state_8 = _loop_19(directory);
                 directory = out_directory_1;
-                if (state_7 === "break")
+                if (state_8 === "break")
                     break;
             }
             if (allFileNames.size) {
@@ -108125,14 +108400,27 @@ var ts;
         return !!compilerOptions.module || compilerOptions.target >= 2 /* ES2015 */ || !!compilerOptions.noEmit;
     }
     ts.compilerOptionsIndicateEs6Modules = compilerOptionsIndicateEs6Modules;
-    function hostUsesCaseSensitiveFileNames(host) {
-        return host.useCaseSensitiveFileNames ? host.useCaseSensitiveFileNames() : false;
+    function createModuleSpecifierResolutionHost(program, host) {
+        // Mix in `getProbableSymlinks` from Program when host doesn't have it
+        // in order for non-Project hosts to have a symlinks cache.
+        return {
+            fileExists: function (fileName) { return program.fileExists(fileName); },
+            getCurrentDirectory: function () { return host.getCurrentDirectory(); },
+            readFile: ts.maybeBind(host, host.readFile),
+            useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames),
+            getProbableSymlinks: ts.maybeBind(host, host.getProbableSymlinks) || (function () { return program.getProbableSymlinks(); }),
+            getGlobalTypingsCacheLocation: ts.maybeBind(host, host.getGlobalTypingsCacheLocation),
+            getSourceFiles: function () { return program.getSourceFiles(); },
+            redirectTargetsMap: program.redirectTargetsMap,
+            getProjectReferenceRedirect: function (fileName) { return program.getProjectReferenceRedirect(fileName); },
+            isSourceOfProjectReferenceRedirect: function (fileName) { return program.isSourceOfProjectReferenceRedirect(fileName); },
+        };
     }
-    ts.hostUsesCaseSensitiveFileNames = hostUsesCaseSensitiveFileNames;
-    function hostGetCanonicalFileName(host) {
-        return ts.createGetCanonicalFileName(hostUsesCaseSensitiveFileNames(host));
+    ts.createModuleSpecifierResolutionHost = createModuleSpecifierResolutionHost;
+    function getModuleSpecifierResolverHost(program, host) {
+        return __assign(__assign({}, createModuleSpecifierResolutionHost(program, host)), { getCommonSourceDirectory: function () { return program.getCommonSourceDirectory(); } });
     }
-    ts.hostGetCanonicalFileName = hostGetCanonicalFileName;
+    ts.getModuleSpecifierResolverHost = getModuleSpecifierResolverHost;
     function makeImportIfNecessary(defaultImport, namedImports, moduleSpecifier, quotePreference) {
         return defaultImport || namedImports && namedImports.length ? makeImport(defaultImport, namedImports, moduleSpecifier, quotePreference) : undefined;
     }
@@ -108827,6 +109115,7 @@ var ts;
         return checker.getTypeAtLocation(caseClause.parent.parent.expression);
     }
     ts.getSwitchedType = getSwitchedType;
+    ts.ANONYMOUS = "anonymous function";
     function getTypeNodeIfAccessible(type, enclosingScope, program, host) {
         var checker = program.getTypeChecker();
         var typeIsAccessible = true;
@@ -108838,14 +109127,7 @@ var ts;
             reportInaccessibleThisError: notAccessible,
             reportPrivateInBaseOfClassExpression: notAccessible,
             reportInaccessibleUniqueSymbolError: notAccessible,
-            moduleResolverHost: {
-                readFile: host.readFile,
-                fileExists: host.fileExists,
-                directoryExists: host.directoryExists,
-                getSourceFiles: program.getSourceFiles,
-                getCurrentDirectory: program.getCurrentDirectory,
-                getCommonSourceDirectory: program.getCommonSourceDirectory,
-            }
+            moduleResolverHost: getModuleSpecifierResolverHost(program, host)
         });
         return typeIsAccessible ? res : undefined;
     }
@@ -115173,17 +115455,19 @@ var ts;
                 return exposedByParent ? scope.getSourceFile() : scope; // TODO: GH#18217
             }
             /** Used as a quick check for whether a symbol is used at all in a file (besides its definition). */
-            function isSymbolReferencedInFile(definition, checker, sourceFile) {
-                return eachSymbolReferenceInFile(definition, checker, sourceFile, function () { return true; }) || false;
+            function isSymbolReferencedInFile(definition, checker, sourceFile, searchContainer) {
+                if (searchContainer === void 0) { searchContainer = sourceFile; }
+                return eachSymbolReferenceInFile(definition, checker, sourceFile, function () { return true; }, searchContainer) || false;
             }
             Core.isSymbolReferencedInFile = isSymbolReferencedInFile;
-            function eachSymbolReferenceInFile(definition, checker, sourceFile, cb) {
+            function eachSymbolReferenceInFile(definition, checker, sourceFile, cb, searchContainer) {
+                if (searchContainer === void 0) { searchContainer = sourceFile; }
                 var symbol = ts.isParameterPropertyDeclaration(definition.parent, definition.parent.parent)
                     ? ts.first(checker.getSymbolsOfParameterPropertyDeclaration(definition.parent, definition.text))
                     : checker.getSymbolAtLocation(definition);
                 if (!symbol)
                     return undefined;
-                for (var _i = 0, _a = getPossibleSymbolReferenceNodes(sourceFile, symbol.name); _i < _a.length; _i++) {
+                for (var _i = 0, _a = getPossibleSymbolReferenceNodes(sourceFile, symbol.name, searchContainer); _i < _a.length; _i++) {
                     var token = _a[_i];
                     if (!ts.isIdentifier(token) || token === definition || token.escapedText !== definition.escapedText)
                         continue;
@@ -116572,7 +116856,7 @@ var ts;
                     : getSourceFileToImport(importedModuleSymbol, importLiteral, sourceFile, program, host, oldToNew);
                 // Need an update if the imported file moved, or the importing file moved and was using a relative path.
                 return toImport !== undefined && (toImport.updated || (importingSourceFileMoved && ts.pathIsRelative(importLiteral.text)))
-                    ? ts.moduleSpecifiers.updateModuleSpecifier(program.getCompilerOptions(), newImportFromPath, toImport.newFileName, host, allFiles, program.redirectTargetsMap, importLiteral.text)
+                    ? ts.moduleSpecifiers.updateModuleSpecifier(program.getCompilerOptions(), newImportFromPath, toImport.newFileName, ts.createModuleSpecifierResolutionHost(program, host), importLiteral.text)
                     : undefined;
             });
         };
@@ -116897,7 +117181,7 @@ var ts;
             function getConstructSignatureDefinition() {
                 // Applicable only if we are in a new expression, or we are on a constructor declaration
                 // and in either case the symbol has a construct signature definition, i.e. class
-                if (symbol.flags & 32 /* Class */ && !(symbol.flags & 16 /* Function */) && (ts.isNewExpressionTarget(node) || node.kind === 130 /* ConstructorKeyword */)) {
+                if (symbol.flags & 32 /* Class */ && !(symbol.flags & (16 /* Function */ | 3 /* Variable */)) && (ts.isNewExpressionTarget(node) || node.kind === 130 /* ConstructorKeyword */)) {
                     var cls = ts.find(filteredDeclarations, ts.isClassLike) || ts.Debug.fail("Expected declaration to have at least one class-like declaration");
                     return getSignatureDefinition(cls.members, /*selectConstructors*/ true);
                 }
@@ -123380,8 +123664,8 @@ var ts;
                     },
                     getIndentation: function () { return indentation; },
                     getDelta: getDelta,
-                    recomputeIndentation: function (lineAdded) {
-                        if (node.parent && formatting.SmartIndenter.shouldIndentChildNode(options, node.parent, node, sourceFile)) {
+                    recomputeIndentation: function (lineAdded, parent) {
+                        if (formatting.SmartIndenter.shouldIndentChildNode(options, parent, node, sourceFile)) {
                             indentation += lineAdded ? options.indentSize : -options.indentSize;
                             delta = formatting.SmartIndenter.shouldIndentChildNode(options, node) ? options.indentSize : 0;
                         }
@@ -123715,7 +123999,7 @@ var ts;
                                 // Handle the case where the next line is moved to be the end of this line.
                                 // In this case we don't indent the next line in the next pass.
                                 if (currentParent.getStart(sourceFile) === currentItem.pos) {
-                                    dynamicIndentation.recomputeIndentation(/*lineAddedByFormatting*/ false);
+                                    dynamicIndentation.recomputeIndentation(/*lineAddedByFormatting*/ false, contextNode);
                                 }
                                 break;
                             case 1 /* LineAdded */:
@@ -123723,7 +124007,7 @@ var ts;
                                 // In this case we indent token2 in the next pass but we set
                                 // sameLineIndent flag to notify the indenter that the indentation is within the line.
                                 if (currentParent.getStart(sourceFile) === currentItem.pos) {
-                                    dynamicIndentation.recomputeIndentation(/*lineAddedByFormatting*/ true);
+                                    dynamicIndentation.recomputeIndentation(/*lineAddedByFormatting*/ true, contextNode);
                                 }
                                 break;
                             default:
@@ -124839,9 +125123,18 @@ var ts;
                     suffix: (ts.isLineBreak(sourceFile.text.charCodeAt(pos)) ? "" : this.newLineCharacter) + (blankLineBetween ? this.newLineCharacter : ""),
                 });
             };
+            ChangeTracker.prototype.insertFirstParameter = function (sourceFile, parameters, newParam) {
+                var p0 = ts.firstOrUndefined(parameters);
+                if (p0) {
+                    this.insertNodeBefore(sourceFile, p0, newParam);
+                }
+                else {
+                    this.insertNodeAt(sourceFile, parameters.pos, newParam);
+                }
+            };
             ChangeTracker.prototype.insertNodeBefore = function (sourceFile, before, newNode, blankLineBetween) {
                 if (blankLineBetween === void 0) { blankLineBetween = false; }
-                this.insertNodeAt(sourceFile, getAdjustedStartPosition(sourceFile, before, {}), newNode, this.getOptionsForInsertNodeBefore(before, blankLineBetween));
+                this.insertNodeAt(sourceFile, getAdjustedStartPosition(sourceFile, before, {}), newNode, this.getOptionsForInsertNodeBefore(before, newNode, blankLineBetween));
             };
             ChangeTracker.prototype.insertModifierBefore = function (sourceFile, modifier, before) {
                 var pos = before.getStart(sourceFile);
@@ -124917,7 +125210,7 @@ var ts;
                 var start = (ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile) || ts.first(node.parameters)).getStart(sourceFile);
                 this.insertNodesAt(sourceFile, start, typeParameters, { prefix: "<", suffix: ">" });
             };
-            ChangeTracker.prototype.getOptionsForInsertNodeBefore = function (before, doubleNewlines) {
+            ChangeTracker.prototype.getOptionsForInsertNodeBefore = function (before, inserted, doubleNewlines) {
                 if (ts.isStatement(before) || ts.isClassElement(before)) {
                     return { suffix: doubleNewlines ? this.newLineCharacter + this.newLineCharacter : this.newLineCharacter };
                 }
@@ -124925,7 +125218,7 @@ var ts;
                     return { suffix: ", " };
                 }
                 else if (ts.isParameter(before)) {
-                    return {};
+                    return ts.isParameter(inserted) ? { suffix: ", " } : {};
                 }
                 else if (ts.isStringLiteral(before) && ts.isImportDeclaration(before.parent) || ts.isNamedImports(before)) {
                     return { suffix: ", " };
@@ -125386,7 +125679,7 @@ var ts;
             function getNonformattedText(node, sourceFile, newLineCharacter) {
                 var writer = createWriter(newLineCharacter);
                 var newLine = newLineCharacter === "\n" ? 1 /* LineFeed */ : 0 /* CarriageReturnLineFeed */;
-                ts.createPrinter({ newLine: newLine, neverAsciiEscape: true }, writer).writeNode(4 /* Unspecified */, node, sourceFile, writer);
+                ts.createPrinter({ newLine: newLine, neverAsciiEscape: true, preserveSourceNewlines: true }, writer).writeNode(4 /* Unspecified */, node, sourceFile, writer);
                 return { text: writer.getText(), node: assignPositionsToNode(node) };
             }
             changesToText.getNonformattedText = getNonformattedText;
@@ -125507,8 +125800,8 @@ var ts;
                 writer.writeSymbol(s, sym);
                 setLastNonTriviaPosition(s, /*force*/ false);
             }
-            function writeLine() {
-                writer.writeLine();
+            function writeLine(force) {
+                writer.writeLine(force);
             }
             function increaseIndent() {
                 writer.increaseIndent();
@@ -125718,15 +126011,21 @@ var ts;
                     case 257 /* NamespaceImport */:
                         deleteImportBinding(changes, sourceFile, node);
                         break;
+                    case 26 /* SemicolonToken */:
+                        deleteNode(changes, sourceFile, node, { trailingTriviaOption: TrailingTriviaOption.Exclude });
+                        break;
+                    case 94 /* FunctionKeyword */:
+                        deleteNode(changes, sourceFile, node, { leadingTriviaOption: LeadingTriviaOption.Exclude });
+                        break;
                     default:
                         if (ts.isImportClause(node.parent) && node.parent.name === node) {
                             deleteDefaultImport(changes, sourceFile, node.parent);
                         }
-                        else if (ts.isCallLikeExpression(node.parent)) {
+                        else if (ts.isCallExpression(node.parent) && ts.contains(node.parent.arguments, node)) {
                             deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         }
                         else {
-                            deleteNode(changes, sourceFile, node, node.kind === 26 /* SemicolonToken */ ? { trailingTriviaOption: TrailingTriviaOption.Exclude } : undefined);
+                            deleteNode(changes, sourceFile, node);
                         }
                 }
             }
@@ -125915,7 +126214,7 @@ var ts;
         codefix.eachDiagnostic = eachDiagnostic;
         function getDiagnostics(_a) {
             var program = _a.program, sourceFile = _a.sourceFile, cancellationToken = _a.cancellationToken;
-            return program.getSemanticDiagnostics(sourceFile, cancellationToken).concat(ts.computeSuggestionDiagnostics(sourceFile, program, cancellationToken));
+            return __spreadArrays(program.getSemanticDiagnostics(sourceFile, cancellationToken), program.getSyntacticDiagnostics(sourceFile, cancellationToken), ts.computeSuggestionDiagnostics(sourceFile, program, cancellationToken));
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
@@ -126693,987 +126992,6 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
-(function (ts) {
-    var codefix;
-    (function (codefix) {
-        var fixId = "inferFromUsage";
-        var errorCodes = [
-            // Variable declarations
-            ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code,
-            // Variable uses
-            ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code,
-            // Parameter declarations
-            ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code,
-            ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code,
-            // Get Accessor declarations
-            ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code,
-            ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code,
-            // Set Accessor declarations
-            ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code,
-            // Property declarations
-            ts.Diagnostics.Member_0_implicitly_has_an_1_type.code,
-            //// Suggestions
-            // Variable declarations
-            ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage.code,
-            // Variable uses
-            ts.Diagnostics.Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
-            // Parameter declarations
-            ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
-            ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code,
-            // Get Accessor declarations
-            ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_get_accessor_may_be_inferred_from_usage.code,
-            ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage.code,
-            // Set Accessor declarations
-            ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code,
-            // Property declarations
-            ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
-            // Function expressions and declarations
-            ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code,
-        ];
-        codefix.registerCodeFix({
-            errorCodes: errorCodes,
-            getCodeActions: function (context) {
-                var sourceFile = context.sourceFile, program = context.program, start = context.span.start, errorCode = context.errorCode, cancellationToken = context.cancellationToken, host = context.host, preferences = context.preferences;
-                var token = ts.getTokenAtPosition(sourceFile, start);
-                var declaration;
-                var changes = ts.textChanges.ChangeTracker.with(context, function (changes) { declaration = doChange(changes, sourceFile, token, errorCode, program, cancellationToken, /*markSeen*/ ts.returnTrue, host, preferences); });
-                var name = declaration && ts.getNameOfDeclaration(declaration);
-                return !name || changes.length === 0 ? undefined
-                    : [codefix.createCodeFixAction(fixId, changes, [getDiagnostic(errorCode, token), name.getText(sourceFile)], fixId, ts.Diagnostics.Infer_all_types_from_usage)];
-            },
-            fixIds: [fixId],
-            getAllCodeActions: function (context) {
-                var sourceFile = context.sourceFile, program = context.program, cancellationToken = context.cancellationToken, host = context.host, preferences = context.preferences;
-                var markSeen = ts.nodeSeenTracker();
-                return codefix.codeFixAll(context, errorCodes, function (changes, err) {
-                    doChange(changes, sourceFile, ts.getTokenAtPosition(err.file, err.start), err.code, program, cancellationToken, markSeen, host, preferences);
-                });
-            },
-        });
-        function getDiagnostic(errorCode, token) {
-            switch (errorCode) {
-                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code:
-                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.isSetAccessorDeclaration(ts.getContainingFunction(token)) ? ts.Diagnostics.Infer_type_of_0_from_usage : ts.Diagnostics.Infer_parameter_types_from_usage; // TODO: GH#18217
-                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
-                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Infer_parameter_types_from_usage;
-                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
-                    return ts.Diagnostics.Infer_this_type_of_0_from_usage;
-                default:
-                    return ts.Diagnostics.Infer_type_of_0_from_usage;
-            }
-        }
-        /** Map suggestion code to error code */
-        function mapSuggestionDiagnostic(errorCode) {
-            switch (errorCode) {
-                case ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code;
-                case ts.Diagnostics.Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code;
-                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code;
-                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code;
-                case ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_get_accessor_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code;
-                case ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code;
-                case ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code;
-                case ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Member_0_implicitly_has_an_1_type.code;
-            }
-            return errorCode;
-        }
-        function doChange(changes, sourceFile, token, errorCode, program, cancellationToken, markSeen, host, preferences) {
-            if (!ts.isParameterPropertyModifier(token.kind) && token.kind !== 75 /* Identifier */ && token.kind !== 25 /* DotDotDotToken */ && token.kind !== 104 /* ThisKeyword */) {
-                return undefined;
-            }
-            var parent = token.parent;
-            var importAdder = codefix.createImportAdder(sourceFile, program, preferences, host);
-            errorCode = mapSuggestionDiagnostic(errorCode);
-            switch (errorCode) {
-                // Variable and Property declarations
-                case ts.Diagnostics.Member_0_implicitly_has_an_1_type.code:
-                case ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code:
-                    if ((ts.isVariableDeclaration(parent) && markSeen(parent)) || ts.isPropertyDeclaration(parent) || ts.isPropertySignature(parent)) { // handle bad location
-                        annotateVariableDeclaration(changes, importAdder, sourceFile, parent, program, host, cancellationToken);
-                        importAdder.writeFixes(changes);
-                        return parent;
-                    }
-                    if (ts.isPropertyAccessExpression(parent)) {
-                        var type = inferTypeForVariableFromUsage(parent.name, program, cancellationToken);
-                        var typeNode = ts.getTypeNodeIfAccessible(type, parent, program, host);
-                        if (typeNode) {
-                            // Note that the codefix will never fire with an existing `@type` tag, so there is no need to merge tags
-                            var typeTag = ts.createJSDocTypeTag(ts.createJSDocTypeExpression(typeNode), /*comment*/ "");
-                            addJSDocTags(changes, sourceFile, ts.cast(parent.parent.parent, ts.isExpressionStatement), [typeTag]);
-                        }
-                        importAdder.writeFixes(changes);
-                        return parent;
-                    }
-                    return undefined;
-                case ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code: {
-                    var symbol = program.getTypeChecker().getSymbolAtLocation(token);
-                    if (symbol && symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) && markSeen(symbol.valueDeclaration)) {
-                        annotateVariableDeclaration(changes, importAdder, sourceFile, symbol.valueDeclaration, program, host, cancellationToken);
-                        importAdder.writeFixes(changes);
-                        return symbol.valueDeclaration;
-                    }
-                    return undefined;
-                }
-            }
-            var containingFunction = ts.getContainingFunction(token);
-            if (containingFunction === undefined) {
-                return undefined;
-            }
-            var declaration;
-            switch (errorCode) {
-                // Parameter declarations
-                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code:
-                    if (ts.isSetAccessorDeclaration(containingFunction)) {
-                        annotateSetAccessor(changes, importAdder, sourceFile, containingFunction, program, host, cancellationToken);
-                        declaration = containingFunction;
-                        break;
-                    }
-                // falls through
-                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
-                    if (markSeen(containingFunction)) {
-                        var param = ts.cast(parent, ts.isParameter);
-                        annotateParameters(changes, importAdder, sourceFile, param, containingFunction, program, host, cancellationToken);
-                        declaration = param;
-                    }
-                    break;
-                // Get Accessor declarations
-                case ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code:
-                case ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code:
-                    if (ts.isGetAccessorDeclaration(containingFunction) && ts.isIdentifier(containingFunction.name)) {
-                        annotate(changes, importAdder, sourceFile, containingFunction, inferTypeForVariableFromUsage(containingFunction.name, program, cancellationToken), program, host);
-                        declaration = containingFunction;
-                    }
-                    break;
-                // Set Accessor declarations
-                case ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code:
-                    if (ts.isSetAccessorDeclaration(containingFunction)) {
-                        annotateSetAccessor(changes, importAdder, sourceFile, containingFunction, program, host, cancellationToken);
-                        declaration = containingFunction;
-                    }
-                    break;
-                // Function 'this'
-                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
-                    if (ts.textChanges.isThisTypeAnnotatable(containingFunction) && markSeen(containingFunction)) {
-                        annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken);
-                        declaration = containingFunction;
-                    }
-                    break;
-                default:
-                    return ts.Debug.fail(String(errorCode));
-            }
-            importAdder.writeFixes(changes);
-            return declaration;
-        }
-        function annotateVariableDeclaration(changes, importAdder, sourceFile, declaration, program, host, cancellationToken) {
-            if (ts.isIdentifier(declaration.name)) {
-                annotate(changes, importAdder, sourceFile, declaration, inferTypeForVariableFromUsage(declaration.name, program, cancellationToken), program, host);
-            }
-        }
-        function annotateParameters(changes, importAdder, sourceFile, parameterDeclaration, containingFunction, program, host, cancellationToken) {
-            if (!ts.isIdentifier(parameterDeclaration.name)) {
-                return;
-            }
-            var parameterInferences = inferTypeForParametersFromUsage(containingFunction, sourceFile, program, cancellationToken);
-            ts.Debug.assert(containingFunction.parameters.length === parameterInferences.length, "Parameter count and inference count should match");
-            if (ts.isInJSFile(containingFunction)) {
-                annotateJSDocParameters(changes, sourceFile, parameterInferences, program, host);
-            }
-            else {
-                var needParens = ts.isArrowFunction(containingFunction) && !ts.findChildOfKind(containingFunction, 20 /* OpenParenToken */, sourceFile);
-                if (needParens)
-                    changes.insertNodeBefore(sourceFile, ts.first(containingFunction.parameters), ts.createToken(20 /* OpenParenToken */));
-                for (var _i = 0, parameterInferences_1 = parameterInferences; _i < parameterInferences_1.length; _i++) {
-                    var _a = parameterInferences_1[_i], declaration = _a.declaration, type = _a.type;
-                    if (declaration && !declaration.type && !declaration.initializer) {
-                        annotate(changes, importAdder, sourceFile, declaration, type, program, host);
-                    }
-                }
-                if (needParens)
-                    changes.insertNodeAfter(sourceFile, ts.last(containingFunction.parameters), ts.createToken(21 /* CloseParenToken */));
-            }
-        }
-        function annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken) {
-            var references = getFunctionReferences(containingFunction, sourceFile, program, cancellationToken);
-            if (!references || !references.length) {
-                return;
-            }
-            var thisInference = inferTypeFromReferences(program, references, cancellationToken).thisParameter();
-            var typeNode = ts.getTypeNodeIfAccessible(thisInference, containingFunction, program, host);
-            if (!typeNode) {
-                return;
-            }
-            if (ts.isInJSFile(containingFunction)) {
-                annotateJSDocThis(changes, sourceFile, containingFunction, typeNode);
-            }
-            else {
-                changes.tryInsertThisTypeAnnotation(sourceFile, containingFunction, typeNode);
-            }
-        }
-        function annotateJSDocThis(changes, sourceFile, containingFunction, typeNode) {
-            addJSDocTags(changes, sourceFile, containingFunction, [
-                ts.createJSDocThisTag(ts.createJSDocTypeExpression(typeNode)),
-            ]);
-        }
-        function annotateSetAccessor(changes, importAdder, sourceFile, setAccessorDeclaration, program, host, cancellationToken) {
-            var param = ts.firstOrUndefined(setAccessorDeclaration.parameters);
-            if (param && ts.isIdentifier(setAccessorDeclaration.name) && ts.isIdentifier(param.name)) {
-                var type = inferTypeForVariableFromUsage(setAccessorDeclaration.name, program, cancellationToken);
-                if (type === program.getTypeChecker().getAnyType()) {
-                    type = inferTypeForVariableFromUsage(param.name, program, cancellationToken);
-                }
-                if (ts.isInJSFile(setAccessorDeclaration)) {
-                    annotateJSDocParameters(changes, sourceFile, [{ declaration: param, type: type }], program, host);
-                }
-                else {
-                    annotate(changes, importAdder, sourceFile, param, type, program, host);
-                }
-            }
-        }
-        function annotate(changes, importAdder, sourceFile, declaration, type, program, host) {
-            var typeNode = ts.getTypeNodeIfAccessible(type, declaration, program, host);
-            if (typeNode) {
-                if (ts.isInJSFile(sourceFile) && declaration.kind !== 159 /* PropertySignature */) {
-                    var parent = ts.isVariableDeclaration(declaration) ? ts.tryCast(declaration.parent.parent, ts.isVariableStatement) : declaration;
-                    if (!parent) {
-                        return;
-                    }
-                    var typeExpression = ts.createJSDocTypeExpression(typeNode);
-                    var typeTag = ts.isGetAccessorDeclaration(declaration) ? ts.createJSDocReturnTag(typeExpression, "") : ts.createJSDocTypeTag(typeExpression, "");
-                    addJSDocTags(changes, sourceFile, parent, [typeTag]);
-                }
-                else if (!tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, type, sourceFile, changes, importAdder, ts.getEmitScriptTarget(program.getCompilerOptions()))) {
-                    changes.tryInsertTypeAnnotation(sourceFile, declaration, typeNode);
-                }
-            }
-        }
-        function tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, type, sourceFile, changes, importAdder, scriptTarget) {
-            var importableReference = codefix.tryGetAutoImportableReferenceFromImportTypeNode(typeNode, type, scriptTarget);
-            if (importableReference && changes.tryInsertTypeAnnotation(sourceFile, declaration, importableReference.typeReference)) {
-                ts.forEach(importableReference.symbols, function (s) { return importAdder.addImportFromExportedSymbol(s, /*usageIsTypeOnly*/ true); });
-                return true;
-            }
-            return false;
-        }
-        function annotateJSDocParameters(changes, sourceFile, parameterInferences, program, host) {
-            var signature = parameterInferences.length && parameterInferences[0].declaration.parent;
-            if (!signature) {
-                return;
-            }
-            var paramTags = ts.mapDefined(parameterInferences, function (inference) {
-                var param = inference.declaration;
-                // only infer parameters that have (1) no type and (2) an accessible inferred type
-                if (param.initializer || ts.getJSDocType(param) || !ts.isIdentifier(param.name))
-                    return;
-                var typeNode = inference.type && ts.getTypeNodeIfAccessible(inference.type, param, program, host);
-                var name = ts.getSynthesizedClone(param.name);
-                ts.setEmitFlags(name, 1536 /* NoComments */ | 2048 /* NoNestedComments */);
-                return typeNode && ts.createJSDocParamTag(name, !!inference.isOptional, ts.createJSDocTypeExpression(typeNode), "");
-            });
-            addJSDocTags(changes, sourceFile, signature, paramTags);
-        }
-        function addJSDocTags(changes, sourceFile, parent, newTags) {
-            var comments = ts.mapDefined(parent.jsDoc, function (j) { return j.comment; });
-            var oldTags = ts.flatMapToMutable(parent.jsDoc, function (j) { return j.tags; });
-            var unmergedNewTags = newTags.filter(function (newTag) { return !oldTags || !oldTags.some(function (tag, i) {
-                var merged = tryMergeJsdocTags(tag, newTag);
-                if (merged)
-                    oldTags[i] = merged;
-                return !!merged;
-            }); });
-            var tag = ts.createJSDocComment(comments.join("\n"), ts.createNodeArray(__spreadArrays((oldTags || ts.emptyArray), unmergedNewTags)));
-            var jsDocNode = parent.kind === 203 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
-            jsDocNode.jsDoc = parent.jsDoc;
-            jsDocNode.jsDocCache = parent.jsDocCache;
-            changes.insertJsdocCommentBefore(sourceFile, jsDocNode, tag);
-        }
-        function getJsDocNodeForArrowFunction(signature) {
-            if (signature.parent.kind === 160 /* PropertyDeclaration */) {
-                return signature.parent;
-            }
-            return signature.parent.parent;
-        }
-        function tryMergeJsdocTags(oldTag, newTag) {
-            if (oldTag.kind !== newTag.kind) {
-                return undefined;
-            }
-            switch (oldTag.kind) {
-                case 318 /* JSDocParameterTag */: {
-                    var oldParam = oldTag;
-                    var newParam = newTag;
-                    return ts.isIdentifier(oldParam.name) && ts.isIdentifier(newParam.name) && oldParam.name.escapedText === newParam.name.escapedText
-                        ? ts.createJSDocParamTag(newParam.name, newParam.isBracketed, newParam.typeExpression, oldParam.comment)
-                        : undefined;
-                }
-                case 319 /* JSDocReturnTag */:
-                    return ts.createJSDocReturnTag(newTag.typeExpression, oldTag.comment);
-            }
-        }
-        function getReferences(token, program, cancellationToken) {
-            // Position shouldn't matter since token is not a SourceFile.
-            return ts.mapDefined(ts.FindAllReferences.getReferenceEntriesForNode(-1, token, program, program.getSourceFiles(), cancellationToken), function (entry) {
-                return entry.kind !== 0 /* Span */ ? ts.tryCast(entry.node, ts.isIdentifier) : undefined;
-            });
-        }
-        function inferTypeForVariableFromUsage(token, program, cancellationToken) {
-            var references = getReferences(token, program, cancellationToken);
-            return inferTypeFromReferences(program, references, cancellationToken).single();
-        }
-        function inferTypeForParametersFromUsage(func, sourceFile, program, cancellationToken) {
-            var references = getFunctionReferences(func, sourceFile, program, cancellationToken);
-            return references && inferTypeFromReferences(program, references, cancellationToken).parameters(func) ||
-                func.parameters.map(function (p) { return ({
-                    declaration: p,
-                    type: ts.isIdentifier(p.name) ? inferTypeForVariableFromUsage(p.name, program, cancellationToken) : program.getTypeChecker().getAnyType()
-                }); });
-        }
-        function getFunctionReferences(containingFunction, sourceFile, program, cancellationToken) {
-            var searchToken;
-            switch (containingFunction.kind) {
-                case 163 /* Constructor */:
-                    searchToken = ts.findChildOfKind(containingFunction, 130 /* ConstructorKeyword */, sourceFile);
-                    break;
-                case 203 /* ArrowFunction */:
-                case 202 /* FunctionExpression */:
-                    var parent = containingFunction.parent;
-                    searchToken = ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name) ?
-                        parent.name :
-                        containingFunction.name;
-                    break;
-                case 245 /* FunctionDeclaration */:
-                case 162 /* MethodDeclaration */:
-                    searchToken = containingFunction.name;
-                    break;
-            }
-            if (!searchToken) {
-                return undefined;
-            }
-            return getReferences(searchToken, program, cancellationToken);
-        }
-        function inferTypeFromReferences(program, references, cancellationToken) {
-            var checker = program.getTypeChecker();
-            var builtinConstructors = {
-                string: function () { return checker.getStringType(); },
-                number: function () { return checker.getNumberType(); },
-                Array: function (t) { return checker.createArrayType(t); },
-                Promise: function (t) { return checker.createPromiseType(t); },
-            };
-            var builtins = [
-                checker.getStringType(),
-                checker.getNumberType(),
-                checker.createArrayType(checker.getAnyType()),
-                checker.createPromiseType(checker.getAnyType()),
-            ];
-            return {
-                single: single,
-                parameters: parameters,
-                thisParameter: thisParameter,
-            };
-            function createEmptyUsage() {
-                return {
-                    isNumber: undefined,
-                    isString: undefined,
-                    isNumberOrString: undefined,
-                    candidateTypes: undefined,
-                    properties: undefined,
-                    calls: undefined,
-                    constructs: undefined,
-                    numberIndex: undefined,
-                    stringIndex: undefined,
-                    candidateThisTypes: undefined,
-                    inferredTypes: undefined,
-                };
-            }
-            function combineUsages(usages) {
-                var combinedProperties = ts.createUnderscoreEscapedMap();
-                for (var _i = 0, usages_1 = usages; _i < usages_1.length; _i++) {
-                    var u = usages_1[_i];
-                    if (u.properties) {
-                        u.properties.forEach(function (p, name) {
-                            if (!combinedProperties.has(name)) {
-                                combinedProperties.set(name, []);
-                            }
-                            combinedProperties.get(name).push(p);
-                        });
-                    }
-                }
-                var properties = ts.createUnderscoreEscapedMap();
-                combinedProperties.forEach(function (ps, name) {
-                    properties.set(name, combineUsages(ps));
-                });
-                return {
-                    isNumber: usages.some(function (u) { return u.isNumber; }),
-                    isString: usages.some(function (u) { return u.isString; }),
-                    isNumberOrString: usages.some(function (u) { return u.isNumberOrString; }),
-                    candidateTypes: ts.flatMap(usages, function (u) { return u.candidateTypes; }),
-                    properties: properties,
-                    calls: ts.flatMap(usages, function (u) { return u.calls; }),
-                    constructs: ts.flatMap(usages, function (u) { return u.constructs; }),
-                    numberIndex: ts.forEach(usages, function (u) { return u.numberIndex; }),
-                    stringIndex: ts.forEach(usages, function (u) { return u.stringIndex; }),
-                    candidateThisTypes: ts.flatMap(usages, function (u) { return u.candidateThisTypes; }),
-                    inferredTypes: undefined,
-                };
-            }
-            function single() {
-                return combineTypes(inferTypesFromReferencesSingle(references));
-            }
-            function parameters(declaration) {
-                if (references.length === 0 || !declaration.parameters) {
-                    return undefined;
-                }
-                var usage = createEmptyUsage();
-                for (var _i = 0, references_2 = references; _i < references_2.length; _i++) {
-                    var reference = references_2[_i];
-                    cancellationToken.throwIfCancellationRequested();
-                    calculateUsageOfNode(reference, usage);
-                }
-                var calls = __spreadArrays(usage.constructs || [], usage.calls || []);
-                return declaration.parameters.map(function (parameter, parameterIndex) {
-                    var types = [];
-                    var isRest = ts.isRestParameter(parameter);
-                    var isOptional = false;
-                    for (var _i = 0, calls_1 = calls; _i < calls_1.length; _i++) {
-                        var call = calls_1[_i];
-                        if (call.argumentTypes.length <= parameterIndex) {
-                            isOptional = ts.isInJSFile(declaration);
-                            types.push(checker.getUndefinedType());
-                        }
-                        else if (isRest) {
-                            for (var i = parameterIndex; i < call.argumentTypes.length; i++) {
-                                types.push(checker.getBaseTypeOfLiteralType(call.argumentTypes[i]));
-                            }
-                        }
-                        else {
-                            types.push(checker.getBaseTypeOfLiteralType(call.argumentTypes[parameterIndex]));
-                        }
-                    }
-                    if (ts.isIdentifier(parameter.name)) {
-                        var inferred = inferTypesFromReferencesSingle(getReferences(parameter.name, program, cancellationToken));
-                        types.push.apply(types, (isRest ? ts.mapDefined(inferred, checker.getElementTypeOfArrayType) : inferred));
-                    }
-                    var type = combineTypes(types);
-                    return {
-                        type: isRest ? checker.createArrayType(type) : type,
-                        isOptional: isOptional && !isRest,
-                        declaration: parameter
-                    };
-                });
-            }
-            function thisParameter() {
-                var usage = createEmptyUsage();
-                for (var _i = 0, references_3 = references; _i < references_3.length; _i++) {
-                    var reference = references_3[_i];
-                    cancellationToken.throwIfCancellationRequested();
-                    calculateUsageOfNode(reference, usage);
-                }
-                return combineTypes(usage.candidateThisTypes || ts.emptyArray);
-            }
-            function inferTypesFromReferencesSingle(references) {
-                var usage = createEmptyUsage();
-                for (var _i = 0, references_4 = references; _i < references_4.length; _i++) {
-                    var reference = references_4[_i];
-                    cancellationToken.throwIfCancellationRequested();
-                    calculateUsageOfNode(reference, usage);
-                }
-                return inferTypes(usage);
-            }
-            function calculateUsageOfNode(node, usage) {
-                while (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
-                    node = node.parent;
-                }
-                switch (node.parent.kind) {
-                    case 227 /* ExpressionStatement */:
-                        addCandidateType(usage, checker.getVoidType());
-                        break;
-                    case 209 /* PostfixUnaryExpression */:
-                        usage.isNumber = true;
-                        break;
-                    case 208 /* PrefixUnaryExpression */:
-                        inferTypeFromPrefixUnaryExpression(node.parent, usage);
-                        break;
-                    case 210 /* BinaryExpression */:
-                        inferTypeFromBinaryExpression(node, node.parent, usage);
-                        break;
-                    case 278 /* CaseClause */:
-                    case 279 /* DefaultClause */:
-                        inferTypeFromSwitchStatementLabel(node.parent, usage);
-                        break;
-                    case 197 /* CallExpression */:
-                    case 198 /* NewExpression */:
-                        if (node.parent.expression === node) {
-                            inferTypeFromCallExpression(node.parent, usage);
-                        }
-                        else {
-                            inferTypeFromContextualType(node, usage);
-                        }
-                        break;
-                    case 195 /* PropertyAccessExpression */:
-                        inferTypeFromPropertyAccessExpression(node.parent, usage);
-                        break;
-                    case 196 /* ElementAccessExpression */:
-                        inferTypeFromPropertyElementExpression(node.parent, node, usage);
-                        break;
-                    case 282 /* PropertyAssignment */:
-                    case 283 /* ShorthandPropertyAssignment */:
-                        inferTypeFromPropertyAssignment(node.parent, usage);
-                        break;
-                    case 160 /* PropertyDeclaration */:
-                        inferTypeFromPropertyDeclaration(node.parent, usage);
-                        break;
-                    case 243 /* VariableDeclaration */: {
-                        var _a = node.parent, name = _a.name, initializer = _a.initializer;
-                        if (node === name) {
-                            if (initializer) { // This can happen for `let x = null;` which still has an implicit-any error.
-                                addCandidateType(usage, checker.getTypeAtLocation(initializer));
-                            }
-                            break;
-                        }
-                    }
-                    // falls through
-                    default:
-                        return inferTypeFromContextualType(node, usage);
-                }
-            }
-            function inferTypeFromContextualType(node, usage) {
-                if (ts.isExpressionNode(node)) {
-                    addCandidateType(usage, checker.getContextualType(node));
-                }
-            }
-            function inferTypeFromPrefixUnaryExpression(node, usage) {
-                switch (node.operator) {
-                    case 45 /* PlusPlusToken */:
-                    case 46 /* MinusMinusToken */:
-                    case 40 /* MinusToken */:
-                    case 54 /* TildeToken */:
-                        usage.isNumber = true;
-                        break;
-                    case 39 /* PlusToken */:
-                        usage.isNumberOrString = true;
-                        break;
-                    // case SyntaxKind.ExclamationToken:
-                    // no inferences here;
-                }
-            }
-            function inferTypeFromBinaryExpression(node, parent, usage) {
-                switch (parent.operatorToken.kind) {
-                    // ExponentiationOperator
-                    case 42 /* AsteriskAsteriskToken */:
-                    // MultiplicativeOperator
-                    // falls through
-                    case 41 /* AsteriskToken */:
-                    case 43 /* SlashToken */:
-                    case 44 /* PercentToken */:
-                    // ShiftOperator
-                    // falls through
-                    case 47 /* LessThanLessThanToken */:
-                    case 48 /* GreaterThanGreaterThanToken */:
-                    case 49 /* GreaterThanGreaterThanGreaterThanToken */:
-                    // BitwiseOperator
-                    // falls through
-                    case 50 /* AmpersandToken */:
-                    case 51 /* BarToken */:
-                    case 52 /* CaretToken */:
-                    // CompoundAssignmentOperator
-                    // falls through
-                    case 64 /* MinusEqualsToken */:
-                    case 66 /* AsteriskAsteriskEqualsToken */:
-                    case 65 /* AsteriskEqualsToken */:
-                    case 67 /* SlashEqualsToken */:
-                    case 68 /* PercentEqualsToken */:
-                    case 72 /* AmpersandEqualsToken */:
-                    case 73 /* BarEqualsToken */:
-                    case 74 /* CaretEqualsToken */:
-                    case 69 /* LessThanLessThanEqualsToken */:
-                    case 71 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                    case 70 /* GreaterThanGreaterThanEqualsToken */:
-                    // AdditiveOperator
-                    // falls through
-                    case 40 /* MinusToken */:
-                    // RelationalOperator
-                    // falls through
-                    case 29 /* LessThanToken */:
-                    case 32 /* LessThanEqualsToken */:
-                    case 31 /* GreaterThanToken */:
-                    case 33 /* GreaterThanEqualsToken */:
-                        var operandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
-                        if (operandType.flags & 1056 /* EnumLike */) {
-                            addCandidateType(usage, operandType);
-                        }
-                        else {
-                            usage.isNumber = true;
-                        }
-                        break;
-                    case 63 /* PlusEqualsToken */:
-                    case 39 /* PlusToken */:
-                        var otherOperandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
-                        if (otherOperandType.flags & 1056 /* EnumLike */) {
-                            addCandidateType(usage, otherOperandType);
-                        }
-                        else if (otherOperandType.flags & 296 /* NumberLike */) {
-                            usage.isNumber = true;
-                        }
-                        else if (otherOperandType.flags & 132 /* StringLike */) {
-                            usage.isString = true;
-                        }
-                        else if (otherOperandType.flags & 1 /* Any */) {
-                            // do nothing, maybe we'll learn something elsewhere
-                        }
-                        else {
-                            usage.isNumberOrString = true;
-                        }
-                        break;
-                    //  AssignmentOperators
-                    case 62 /* EqualsToken */:
-                    case 34 /* EqualsEqualsToken */:
-                    case 36 /* EqualsEqualsEqualsToken */:
-                    case 37 /* ExclamationEqualsEqualsToken */:
-                    case 35 /* ExclamationEqualsToken */:
-                        addCandidateType(usage, checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left));
-                        break;
-                    case 97 /* InKeyword */:
-                        if (node === parent.left) {
-                            usage.isString = true;
-                        }
-                        break;
-                    // LogicalOperator Or NullishCoalescing
-                    case 56 /* BarBarToken */:
-                    case 60 /* QuestionQuestionToken */:
-                        if (node === parent.left &&
-                            (node.parent.parent.kind === 243 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
-                            // var x = x || {};
-                            // TODO: use getFalsyflagsOfType
-                            addCandidateType(usage, checker.getTypeAtLocation(parent.right));
-                        }
-                        break;
-                    case 55 /* AmpersandAmpersandToken */:
-                    case 27 /* CommaToken */:
-                    case 98 /* InstanceOfKeyword */:
-                        // nothing to infer here
-                        break;
-                }
-            }
-            function inferTypeFromSwitchStatementLabel(parent, usage) {
-                addCandidateType(usage, checker.getTypeAtLocation(parent.parent.parent.expression));
-            }
-            function inferTypeFromCallExpression(parent, usage) {
-                var call = {
-                    argumentTypes: [],
-                    return_: createEmptyUsage()
-                };
-                if (parent.arguments) {
-                    for (var _i = 0, _a = parent.arguments; _i < _a.length; _i++) {
-                        var argument = _a[_i];
-                        call.argumentTypes.push(checker.getTypeAtLocation(argument));
-                    }
-                }
-                calculateUsageOfNode(parent, call.return_);
-                if (parent.kind === 197 /* CallExpression */) {
-                    (usage.calls || (usage.calls = [])).push(call);
-                }
-                else {
-                    (usage.constructs || (usage.constructs = [])).push(call);
-                }
-            }
-            function inferTypeFromPropertyAccessExpression(parent, usage) {
-                var name = ts.escapeLeadingUnderscores(parent.name.text);
-                if (!usage.properties) {
-                    usage.properties = ts.createUnderscoreEscapedMap();
-                }
-                var propertyUsage = usage.properties.get(name) || createEmptyUsage();
-                calculateUsageOfNode(parent, propertyUsage);
-                usage.properties.set(name, propertyUsage);
-            }
-            function inferTypeFromPropertyElementExpression(parent, node, usage) {
-                if (node === parent.argumentExpression) {
-                    usage.isNumberOrString = true;
-                    return;
-                }
-                else {
-                    var indexType = checker.getTypeAtLocation(parent.argumentExpression);
-                    var indexUsage = createEmptyUsage();
-                    calculateUsageOfNode(parent, indexUsage);
-                    if (indexType.flags & 296 /* NumberLike */) {
-                        usage.numberIndex = indexUsage;
-                    }
-                    else {
-                        usage.stringIndex = indexUsage;
-                    }
-                }
-            }
-            function inferTypeFromPropertyAssignment(assignment, usage) {
-                var nodeWithRealType = ts.isVariableDeclaration(assignment.parent.parent) ?
-                    assignment.parent.parent :
-                    assignment.parent;
-                addCandidateThisType(usage, checker.getTypeAtLocation(nodeWithRealType));
-            }
-            function inferTypeFromPropertyDeclaration(declaration, usage) {
-                addCandidateThisType(usage, checker.getTypeAtLocation(declaration.parent));
-            }
-            function removeLowPriorityInferences(inferences, priorities) {
-                var toRemove = [];
-                for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
-                    var i = inferences_1[_i];
-                    for (var _a = 0, priorities_1 = priorities; _a < priorities_1.length; _a++) {
-                        var _b = priorities_1[_a], high = _b.high, low = _b.low;
-                        if (high(i)) {
-                            ts.Debug.assert(!low(i), "Priority can't have both low and high");
-                            toRemove.push(low);
-                        }
-                    }
-                }
-                return inferences.filter(function (i) { return toRemove.every(function (f) { return !f(i); }); });
-            }
-            function combineFromUsage(usage) {
-                return combineTypes(inferTypes(usage));
-            }
-            function combineTypes(inferences) {
-                if (!inferences.length)
-                    return checker.getAnyType();
-                // 1. string or number individually override string | number
-                // 2. non-any, non-void overrides any or void
-                // 3. non-nullable, non-any, non-void, non-anonymous overrides anonymous types
-                var stringNumber = checker.getUnionType([checker.getStringType(), checker.getNumberType()]);
-                var priorities = [
-                    {
-                        high: function (t) { return t === checker.getStringType() || t === checker.getNumberType(); },
-                        low: function (t) { return t === stringNumber; }
-                    },
-                    {
-                        high: function (t) { return !(t.flags & (1 /* Any */ | 16384 /* Void */)); },
-                        low: function (t) { return !!(t.flags & (1 /* Any */ | 16384 /* Void */)); }
-                    },
-                    {
-                        high: function (t) { return !(t.flags & (98304 /* Nullable */ | 1 /* Any */ | 16384 /* Void */)) && !(ts.getObjectFlags(t) & 16 /* Anonymous */); },
-                        low: function (t) { return !!(ts.getObjectFlags(t) & 16 /* Anonymous */); }
-                    }
-                ];
-                var good = removeLowPriorityInferences(inferences, priorities);
-                var anons = good.filter(function (i) { return ts.getObjectFlags(i) & 16 /* Anonymous */; });
-                if (anons.length) {
-                    good = good.filter(function (i) { return !(ts.getObjectFlags(i) & 16 /* Anonymous */); });
-                    good.push(combineAnonymousTypes(anons));
-                }
-                return checker.getWidenedType(checker.getUnionType(good.map(checker.getBaseTypeOfLiteralType), 2 /* Subtype */));
-            }
-            function combineAnonymousTypes(anons) {
-                if (anons.length === 1) {
-                    return anons[0];
-                }
-                var calls = [];
-                var constructs = [];
-                var stringIndices = [];
-                var numberIndices = [];
-                var stringIndexReadonly = false;
-                var numberIndexReadonly = false;
-                var props = ts.createMultiMap();
-                for (var _i = 0, anons_1 = anons; _i < anons_1.length; _i++) {
-                    var anon = anons_1[_i];
-                    for (var _a = 0, _b = checker.getPropertiesOfType(anon); _a < _b.length; _a++) {
-                        var p = _b[_a];
-                        props.add(p.name, checker.getTypeOfSymbolAtLocation(p, p.valueDeclaration));
-                    }
-                    calls.push.apply(calls, checker.getSignaturesOfType(anon, 0 /* Call */));
-                    constructs.push.apply(constructs, checker.getSignaturesOfType(anon, 1 /* Construct */));
-                    if (anon.stringIndexInfo) {
-                        stringIndices.push(anon.stringIndexInfo.type);
-                        stringIndexReadonly = stringIndexReadonly || anon.stringIndexInfo.isReadonly;
-                    }
-                    if (anon.numberIndexInfo) {
-                        numberIndices.push(anon.numberIndexInfo.type);
-                        numberIndexReadonly = numberIndexReadonly || anon.numberIndexInfo.isReadonly;
-                    }
-                }
-                var members = ts.mapEntries(props, function (name, types) {
-                    var isOptional = types.length < anons.length ? 16777216 /* Optional */ : 0;
-                    var s = checker.createSymbol(4 /* Property */ | isOptional, name);
-                    s.type = checker.getUnionType(types);
-                    return [name, s];
-                });
-                return checker.createAnonymousType(anons[0].symbol, members, calls, constructs, stringIndices.length ? checker.createIndexInfo(checker.getUnionType(stringIndices), stringIndexReadonly) : undefined, numberIndices.length ? checker.createIndexInfo(checker.getUnionType(numberIndices), numberIndexReadonly) : undefined);
-            }
-            function inferTypes(usage) {
-                var types = [];
-                if (usage.isNumber) {
-                    types.push(checker.getNumberType());
-                }
-                if (usage.isString) {
-                    types.push(checker.getStringType());
-                }
-                if (usage.isNumberOrString) {
-                    types.push(checker.getUnionType([checker.getStringType(), checker.getNumberType()]));
-                }
-                if (usage.numberIndex) {
-                    types.push(checker.createArrayType(combineFromUsage(usage.numberIndex)));
-                }
-                if (usage.properties && usage.properties.size
-                    || usage.calls && usage.calls.length
-                    || usage.constructs && usage.constructs.length
-                    || usage.stringIndex) {
-                    types.push(inferStructuralType(usage));
-                }
-                types.push.apply(types, (usage.candidateTypes || []).map(function (t) { return checker.getBaseTypeOfLiteralType(t); }));
-                types.push.apply(types, inferNamedTypesFromProperties(usage));
-                return types;
-            }
-            function inferStructuralType(usage) {
-                var members = ts.createUnderscoreEscapedMap();
-                if (usage.properties) {
-                    usage.properties.forEach(function (u, name) {
-                        var symbol = checker.createSymbol(4 /* Property */, name);
-                        symbol.type = combineFromUsage(u);
-                        members.set(name, symbol);
-                    });
-                }
-                var callSignatures = usage.calls ? [getSignatureFromCalls(usage.calls)] : [];
-                var constructSignatures = usage.constructs ? [getSignatureFromCalls(usage.constructs)] : [];
-                var stringIndexInfo = usage.stringIndex && checker.createIndexInfo(combineFromUsage(usage.stringIndex), /*isReadonly*/ false);
-                return checker.createAnonymousType(/*symbol*/ undefined, members, callSignatures, constructSignatures, stringIndexInfo, /*numberIndexInfo*/ undefined);
-            }
-            function inferNamedTypesFromProperties(usage) {
-                if (!usage.properties || !usage.properties.size)
-                    return [];
-                var types = builtins.filter(function (t) { return allPropertiesAreAssignableToUsage(t, usage); });
-                if (0 < types.length && types.length < 3) {
-                    return types.map(function (t) { return inferInstantiationFromUsage(t, usage); });
-                }
-                return [];
-            }
-            function allPropertiesAreAssignableToUsage(type, usage) {
-                if (!usage.properties)
-                    return false;
-                return !ts.forEachEntry(usage.properties, function (propUsage, name) {
-                    var source = checker.getTypeOfPropertyOfType(type, name);
-                    if (!source) {
-                        return true;
-                    }
-                    if (propUsage.calls) {
-                        var sigs = checker.getSignaturesOfType(source, 0 /* Call */);
-                        return !sigs.length || !checker.isTypeAssignableTo(source, getFunctionFromCalls(propUsage.calls));
-                    }
-                    else {
-                        return !checker.isTypeAssignableTo(source, combineFromUsage(propUsage));
-                    }
-                });
-            }
-            /**
-             * inference is limited to
-             * 1. generic types with a single parameter
-             * 2. inference to/from calls with a single signature
-             */
-            function inferInstantiationFromUsage(type, usage) {
-                if (!(ts.getObjectFlags(type) & 4 /* Reference */) || !usage.properties) {
-                    return type;
-                }
-                var generic = type.target;
-                var singleTypeParameter = ts.singleOrUndefined(generic.typeParameters);
-                if (!singleTypeParameter)
-                    return type;
-                var types = [];
-                usage.properties.forEach(function (propUsage, name) {
-                    var genericPropertyType = checker.getTypeOfPropertyOfType(generic, name);
-                    ts.Debug.assert(!!genericPropertyType, "generic should have all the properties of its reference.");
-                    types.push.apply(types, inferTypeParameters(genericPropertyType, combineFromUsage(propUsage), singleTypeParameter));
-                });
-                return builtinConstructors[type.symbol.escapedName](combineTypes(types));
-            }
-            function inferTypeParameters(genericType, usageType, typeParameter) {
-                if (genericType === typeParameter) {
-                    return [usageType];
-                }
-                else if (genericType.flags & 3145728 /* UnionOrIntersection */) {
-                    return ts.flatMap(genericType.types, function (t) { return inferTypeParameters(t, usageType, typeParameter); });
-                }
-                else if (genericType.flags & 134217728 /* Awaited */) {
-                    return inferTypeParameters(genericType.awaitedType, usageType, typeParameter);
-                }
-                else if (ts.getObjectFlags(genericType) & 4 /* Reference */ && ts.getObjectFlags(usageType) & 4 /* Reference */) {
-                    // this is wrong because we need a reference to the targetType to, so we can check that it's also a reference
-                    var genericArgs = checker.getTypeArguments(genericType);
-                    var usageArgs = checker.getTypeArguments(usageType);
-                    var types = [];
-                    if (genericArgs && usageArgs) {
-                        for (var i = 0; i < genericArgs.length; i++) {
-                            if (usageArgs[i]) {
-                                types.push.apply(types, inferTypeParameters(genericArgs[i], usageArgs[i], typeParameter));
-                            }
-                        }
-                    }
-                    return types;
-                }
-                var genericSigs = checker.getSignaturesOfType(genericType, 0 /* Call */);
-                var usageSigs = checker.getSignaturesOfType(usageType, 0 /* Call */);
-                if (genericSigs.length === 1 && usageSigs.length === 1) {
-                    return inferFromSignatures(genericSigs[0], usageSigs[0], typeParameter);
-                }
-                return [];
-            }
-            function inferFromSignatures(genericSig, usageSig, typeParameter) {
-                var types = [];
-                for (var i = 0; i < genericSig.parameters.length; i++) {
-                    var genericParam = genericSig.parameters[i];
-                    var usageParam = usageSig.parameters[i];
-                    var isRest = genericSig.declaration && ts.isRestParameter(genericSig.declaration.parameters[i]);
-                    if (!usageParam) {
-                        break;
-                    }
-                    var genericParamType = checker.getTypeOfSymbolAtLocation(genericParam, genericParam.valueDeclaration);
-                    var elementType = isRest && checker.getElementTypeOfArrayType(genericParamType);
-                    if (elementType) {
-                        genericParamType = elementType;
-                    }
-                    var targetType = usageParam.type || checker.getTypeOfSymbolAtLocation(usageParam, usageParam.valueDeclaration);
-                    types.push.apply(types, inferTypeParameters(genericParamType, targetType, typeParameter));
-                }
-                var genericReturn = checker.getReturnTypeOfSignature(genericSig);
-                var usageReturn = checker.getReturnTypeOfSignature(usageSig);
-                types.push.apply(types, inferTypeParameters(genericReturn, usageReturn, typeParameter));
-                return types;
-            }
-            function getFunctionFromCalls(calls) {
-                return checker.createAnonymousType(/*symbol*/ undefined, ts.createSymbolTable(), [getSignatureFromCalls(calls)], ts.emptyArray, /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined);
-            }
-            function getSignatureFromCalls(calls) {
-                var parameters = [];
-                var length = Math.max.apply(Math, calls.map(function (c) { return c.argumentTypes.length; }));
-                var _loop_12 = function (i) {
-                    var symbol = checker.createSymbol(1 /* FunctionScopedVariable */, ts.escapeLeadingUnderscores("arg" + i));
-                    symbol.type = combineTypes(calls.map(function (call) { return call.argumentTypes[i] || checker.getUndefinedType(); }));
-                    if (calls.some(function (call) { return call.argumentTypes[i] === undefined; })) {
-                        symbol.flags |= 16777216 /* Optional */;
-                    }
-                    parameters.push(symbol);
-                };
-                for (var i = 0; i < length; i++) {
-                    _loop_12(i);
-                }
-                var returnType = combineFromUsage(combineUsages(calls.map(function (call) { return call.return_; })));
-                // TODO: GH#18217
-                return checker.createSignature(/*declaration*/ undefined, /*typeParameters*/ undefined, /*thisParameter*/ undefined, parameters, returnType, /*typePredicate*/ undefined, length, 0 /* None */);
-            }
-            function addCandidateType(usage, type) {
-                if (type && !(type.flags & 1 /* Any */) && !(type.flags & 131072 /* Never */)) {
-                    (usage.candidateTypes || (usage.candidateTypes = [])).push(type);
-                }
-            }
-            function addCandidateThisType(usage, type) {
-                if (type && !(type.flags & 1 /* Any */) && !(type.flags & 131072 /* Never */)) {
-                    (usage.candidateThisTypes || (usage.candidateThisTypes = [])).push(type);
-                }
-            }
-        }
-    })(codefix = ts.codefix || (ts.codefix = {}));
-})(ts || (ts = {}));
-/* @internal */
-var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -127889,7 +127207,7 @@ var ts;
             }
             // add the async keyword
             changes.insertLastModifierBefore(sourceFile, 126 /* AsyncKeyword */, functionToConvert);
-            var _loop_13 = function (returnStatement) {
+            var _loop_12 = function (returnStatement) {
                 ts.forEachChild(returnStatement, function visit(node) {
                     if (ts.isCallExpression(node)) {
                         var newNodes = transformExpression(node, transformer);
@@ -127902,7 +127220,7 @@ var ts;
             };
             for (var _i = 0, returnStatements_1 = returnStatements; _i < returnStatements_1.length; _i++) {
                 var returnStatement = returnStatements_1[_i];
-                _loop_13(returnStatement);
+                _loop_12(returnStatement);
             }
         }
         function getReturnStatementsWithPromiseHandlers(body) {
@@ -128881,6 +128199,54 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var errorCodes = [ts.Diagnostics.This_import_is_never_used_as_a_value_and_must_use_import_type_because_the_importsNotUsedAsValues_is_set_to_error.code];
+        var fixId = "convertToTypeOnlyImport";
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) {
+                    var importDeclaration = getImportDeclarationForDiagnosticSpan(context.span, context.sourceFile);
+                    fixSingleImportDeclaration(t, importDeclaration, context);
+                });
+                if (changes.length) {
+                    return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Convert_to_type_only_import, fixId, ts.Diagnostics.Convert_all_imports_not_used_as_a_value_to_type_only_imports)];
+                }
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                    var importDeclaration = getImportDeclarationForDiagnosticSpan(diag, context.sourceFile);
+                    fixSingleImportDeclaration(changes, importDeclaration, context);
+                });
+            }
+        });
+        function getImportDeclarationForDiagnosticSpan(span, sourceFile) {
+            return ts.tryCast(ts.getTokenAtPosition(sourceFile, span.start).parent, ts.isImportDeclaration);
+        }
+        function fixSingleImportDeclaration(changes, importDeclaration, context) {
+            if (!(importDeclaration === null || importDeclaration === void 0 ? void 0 : importDeclaration.importClause)) {
+                return;
+            }
+            var importClause = importDeclaration.importClause;
+            // `changes.insertModifierBefore` produces a range that might overlap further changes
+            changes.insertText(context.sourceFile, importDeclaration.getStart() + "import".length, " type");
+            // `import type foo, { Bar }` is not allowed, so move `foo` to new declaration
+            if (importClause.name && importClause.namedBindings) {
+                changes.deleteNodeRangeExcludingEnd(context.sourceFile, importClause.name, importDeclaration.importClause.namedBindings);
+                changes.insertNodeBefore(context.sourceFile, importDeclaration, ts.updateImportDeclaration(importDeclaration, 
+                /*decorators*/ undefined, 
+                /*modifiers*/ undefined, ts.createImportClause(importClause.name, 
+                /*namedBindings*/ undefined, 
+                /*isTypeOnly*/ true), importDeclaration.moduleSpecifier));
+            }
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -129270,7 +128636,7 @@ var ts;
             var allowsImportingSpecifier = createAutoImportFilter(sourceFile, program, host).allowsImportingSpecifier;
             var choicesForEachExportingModule = ts.flatMap(moduleSymbols, function (_a) {
                 var moduleSymbol = _a.moduleSymbol, importKind = _a.importKind, exportedSymbolIsTypeOnly = _a.exportedSymbolIsTypeOnly;
-                return ts.moduleSpecifiers.getModuleSpecifiers(moduleSymbol, compilerOptions, sourceFile, host, program.getSourceFiles(), preferences, program.redirectTargetsMap)
+                return ts.moduleSpecifiers.getModuleSpecifiers(moduleSymbol, compilerOptions, sourceFile, ts.createModuleSpecifierResolutionHost(program, host), preferences)
                     .map(function (moduleSpecifier) {
                     // `position` should only be undefined at a missing jsx namespace, in which case we shouldn't be looking for pure types.
                     return exportedSymbolIsTypeOnly && isJs
@@ -129620,12 +128986,11 @@ var ts;
         }
         function forEachExternalModuleToImportFrom(program, host, from, filterByPackageJson, cb) {
             var filteredCount = 0;
-            var moduleSpecifierResolutionHost = createModuleSpecifierResolutionHost(program, host);
+            var moduleSpecifierResolutionHost = ts.createModuleSpecifierResolutionHost(program, host);
             var packageJson = filterByPackageJson && createAutoImportFilter(from, program, host, moduleSpecifierResolutionHost);
-            var allSourceFiles = program.getSourceFiles();
-            forEachExternalModule(program.getTypeChecker(), allSourceFiles, function (module, sourceFile) {
+            forEachExternalModule(program.getTypeChecker(), program.getSourceFiles(), function (module, sourceFile) {
                 if (sourceFile === undefined) {
-                    if (!packageJson || packageJson.allowsImportingAmbientModule(module, allSourceFiles)) {
+                    if (!packageJson || packageJson.allowsImportingAmbientModule(module)) {
                         cb(module);
                     }
                     else if (packageJson) {
@@ -129635,7 +129000,7 @@ var ts;
                 else if (sourceFile &&
                     sourceFile !== from &&
                     isImportableFile(program, from, sourceFile, moduleSpecifierResolutionHost)) {
-                    if (!packageJson || packageJson.allowsImportingSourceFile(sourceFile, allSourceFiles)) {
+                    if (!packageJson || packageJson.allowsImportingSourceFile(sourceFile)) {
                         cb(module);
                     }
                     else if (packageJson) {
@@ -129664,7 +129029,7 @@ var ts;
             var _a;
             var getCanonicalFileName = ts.hostGetCanonicalFileName(moduleSpecifierResolutionHost);
             var globalTypingsCache = (_a = moduleSpecifierResolutionHost.getGlobalTypingsCacheLocation) === null || _a === void 0 ? void 0 : _a.call(moduleSpecifierResolutionHost);
-            return !!ts.moduleSpecifiers.forEachFileNameOfModule(program.getSourceFiles(), from.fileName, to.fileName, ts.hostGetCanonicalFileName(moduleSpecifierResolutionHost), moduleSpecifierResolutionHost, program.redirectTargetsMap, 
+            return !!ts.moduleSpecifiers.forEachFileNameOfModule(from.fileName, to.fileName, moduleSpecifierResolutionHost, 
             /*preferSymlinks*/ false, function (toPath) {
                 var toFile = program.getSourceFile(toPath);
                 // Determine to import using toPath only if toPath is what we were looking at
@@ -129716,21 +129081,8 @@ var ts;
             return !ts.isStringANonContextualKeyword(res) ? res || "_" : "_" + res;
         }
         codefix.moduleSpecifierToValidIdentifier = moduleSpecifierToValidIdentifier;
-        function createModuleSpecifierResolutionHost(program, host) {
-            // Mix in `getProbablySymlinks` from Program when host doesn't have it
-            // in order for non-Project hosts to have a symlinks cache.
-            return {
-                directoryExists: ts.maybeBind(host, host.directoryExists),
-                fileExists: ts.maybeBind(host, host.fileExists),
-                getCurrentDirectory: ts.maybeBind(host, host.getCurrentDirectory),
-                readFile: ts.maybeBind(host, host.readFile),
-                useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames),
-                getProbableSymlinks: ts.maybeBind(host, host.getProbableSymlinks) || program.getProbableSymlinks,
-                getGlobalTypingsCacheLocation: ts.maybeBind(host, host.getGlobalTypingsCacheLocation),
-            };
-        }
         function createAutoImportFilter(fromFile, program, host, moduleSpecifierResolutionHost) {
-            if (moduleSpecifierResolutionHost === void 0) { moduleSpecifierResolutionHost = createModuleSpecifierResolutionHost(program, host); }
+            if (moduleSpecifierResolutionHost === void 0) { moduleSpecifierResolutionHost = ts.createModuleSpecifierResolutionHost(program, host); }
             var packageJsons = host.getPackageJsonsVisibleToFile && host.getPackageJsonsVisibleToFile(fromFile.fileName) || ts.getPackageJsonsVisibleToFile(fromFile.fileName, host);
             var dependencyGroups = 1 /* Dependencies */ | 2 /* DevDependencies */ | 8 /* OptionalDependencies */;
             var usesNodeCoreModules;
@@ -129745,12 +129097,12 @@ var ts;
                 }
                 return false;
             }
-            function allowsImportingAmbientModule(moduleSymbol, allSourceFiles) {
+            function allowsImportingAmbientModule(moduleSymbol) {
                 if (!packageJsons.length) {
                     return true;
                 }
                 var declaringSourceFile = moduleSymbol.valueDeclaration.getSourceFile();
-                var declaringNodeModuleName = getNodeModulesPackageNameFromFileName(declaringSourceFile.fileName, allSourceFiles);
+                var declaringNodeModuleName = getNodeModulesPackageNameFromFileName(declaringSourceFile.fileName);
                 if (typeof declaringNodeModuleName === "undefined") {
                     return true;
                 }
@@ -129761,11 +129113,11 @@ var ts;
                 return moduleSpecifierIsCoveredByPackageJson(declaringNodeModuleName)
                     || moduleSpecifierIsCoveredByPackageJson(declaredModuleSpecifier);
             }
-            function allowsImportingSourceFile(sourceFile, allSourceFiles) {
+            function allowsImportingSourceFile(sourceFile) {
                 if (!packageJsons.length) {
                     return true;
                 }
-                var moduleSpecifier = getNodeModulesPackageNameFromFileName(sourceFile.fileName, allSourceFiles);
+                var moduleSpecifier = getNodeModulesPackageNameFromFileName(sourceFile.fileName);
                 if (!moduleSpecifier) {
                     return true;
                 }
@@ -129800,11 +129152,11 @@ var ts;
                 }
                 return false;
             }
-            function getNodeModulesPackageNameFromFileName(importedFileName, allSourceFiles) {
+            function getNodeModulesPackageNameFromFileName(importedFileName) {
                 if (!ts.stringContains(importedFileName, "node_modules")) {
                     return undefined;
                 }
-                var specifier = ts.moduleSpecifiers.getNodeModulesPackageName(host.getCompilationSettings(), fromFile.path, importedFileName, moduleSpecifierResolutionHost, allSourceFiles, program.redirectTargetsMap);
+                var specifier = ts.moduleSpecifiers.getNodeModulesPackageName(host.getCompilationSettings(), fromFile.path, importedFileName, moduleSpecifierResolutionHost);
                 if (!specifier) {
                     return undefined;
                 }
@@ -129827,6 +129179,68 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "fixImplicitThis";
+        var errorCodes = [ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, program = context.program, span = context.span;
+                var diagnostic;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) {
+                    diagnostic = doChange(t, sourceFile, span.start, program.getTypeChecker());
+                });
+                return diagnostic ? [codefix.createCodeFixAction(fixId, changes, diagnostic, fixId, ts.Diagnostics.Fix_all_implicit_this_errors)] : ts.emptyArray;
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                doChange(changes, diag.file, diag.start, context.program.getTypeChecker());
+            }); },
+        });
+        function doChange(changes, sourceFile, pos, checker) {
+            var token = ts.getTokenAtPosition(sourceFile, pos);
+            ts.Debug.assert(token.kind === 104 /* ThisKeyword */);
+            var fn = ts.getThisContainer(token, /*includeArrowFunctions*/ false);
+            if (!ts.isFunctionDeclaration(fn) && !ts.isFunctionExpression(fn))
+                return undefined;
+            if (!ts.isSourceFile(ts.getThisContainer(fn, /*includeArrowFunctions*/ false))) { // 'this' is defined outside, convert to arrow function
+                var fnKeyword = ts.Debug.assertDefined(ts.findChildOfKind(fn, 94 /* FunctionKeyword */, sourceFile));
+                var name = fn.name;
+                var body = ts.Debug.assertDefined(fn.body); // Should be defined because the function contained a 'this' expression
+                if (ts.isFunctionExpression(fn)) {
+                    if (name && ts.FindAllReferences.Core.isSymbolReferencedInFile(name, checker, sourceFile, body)) {
+                        // Function expression references itself. To fix we would have to extract it to a const.
+                        return undefined;
+                    }
+                    // `function() {}` --> `() => {}`
+                    changes.delete(sourceFile, fnKeyword);
+                    if (name) {
+                        changes.delete(sourceFile, name);
+                    }
+                    changes.insertText(sourceFile, body.pos, " =>");
+                    return [ts.Diagnostics.Convert_function_expression_0_to_arrow_function, name ? name.text : ts.ANONYMOUS];
+                }
+                else {
+                    // `function f() {}` => `const f = () => {}`
+                    // `name` should be defined because we only do this in inner contexts, and name is only undefined for `export default function() {}`.
+                    changes.replaceNode(sourceFile, fnKeyword, ts.createToken(81 /* ConstKeyword */));
+                    changes.insertText(sourceFile, name.end, " = ");
+                    changes.insertText(sourceFile, body.pos, " =>");
+                    return [ts.Diagnostics.Convert_function_declaration_0_to_arrow_function, name.text];
+                }
+            }
+            // No outer 'this', add a @class tag if in a JS constructor function
+            else if (ts.isSourceFileJS(sourceFile) && ts.isPropertyAccessExpression(token.parent) && ts.isAssignmentExpression(token.parent.parent)) {
+                codefix.addJSDocTags(changes, sourceFile, fn, [ts.createJSDocClassTag()]);
+                return ts.Diagnostics.Add_class_tag;
+            }
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -129985,7 +129399,7 @@ var ts;
                     });
                     typeDeclToMembers.forEach(function (infos, classDeclaration) {
                         var supers = getAllSupers(classDeclaration, checker);
-                        var _loop_14 = function (info) {
+                        var _loop_13 = function (info) {
                             // If some superclass added this property, don't add it again.
                             if (supers.some(function (superClassOrInterface) {
                                 var superInfos = typeDeclToMembers.get(superClassOrInterface);
@@ -130012,7 +129426,7 @@ var ts;
                         };
                         for (var _i = 0, infos_1 = infos; _i < infos_1.length; _i++) {
                             var info = infos_1[_i];
-                            _loop_14(info);
+                            _loop_13(info);
                         }
                     });
                 }));
@@ -130679,21 +130093,27 @@ var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
-        var fixIdHtmlEntity = "invalidJsxCharactersConvertToHtmlEntity";
-        var fixIdExpression = "invalidJsxCharactersConvertToExpression";
-        var errorCodes = [ts.Diagnostics.Unexpected_token_Did_you_mean_or_gt.code, ts.Diagnostics.Unexpected_token_Did_you_mean_or_rbrace.code];
+        var fixIdExpression = "fixInvalidJsxCharacters_expression";
+        var fixIdHtmlEntity = "fixInvalidJsxCharacters_htmlEntity";
+        var errorCodes = [
+            ts.Diagnostics.Unexpected_token_Did_you_mean_or_gt.code,
+            ts.Diagnostics.Unexpected_token_Did_you_mean_or_rbrace.code
+        ];
         codefix.registerCodeFix({
             errorCodes: errorCodes,
+            fixIds: [fixIdExpression, fixIdHtmlEntity],
             getCodeActions: function (context) {
-                var sourceFile = context.sourceFile, span = context.span;
-                var changeToExpression = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, span.start, /* useHtmlEntity */ false); });
-                var changeToHtmlEntity = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, span.start, /* useHtmlEntity */ true); });
+                var sourceFile = context.sourceFile, preferences = context.preferences, span = context.span;
+                var changeToExpression = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, preferences, sourceFile, span.start, /* useHtmlEntity */ false); });
+                var changeToHtmlEntity = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, preferences, sourceFile, span.start, /* useHtmlEntity */ true); });
                 return [
-                    codefix.createCodeFixActionWithoutFixAll(fixIdExpression, changeToExpression, ts.Diagnostics.Wrap_invalid_character_in_an_expression_container),
-                    codefix.createCodeFixAction(fixIdHtmlEntity, changeToHtmlEntity, ts.Diagnostics.Convert_invalid_character_to_its_html_entity_code, fixIdHtmlEntity, ts.Diagnostics.Convert_invalid_character_to_its_html_entity_code),
+                    codefix.createCodeFixAction(fixIdExpression, changeToExpression, ts.Diagnostics.Wrap_invalid_character_in_an_expression_container, fixIdExpression, ts.Diagnostics.Wrap_all_invalid_characters_in_an_expression_container),
+                    codefix.createCodeFixAction(fixIdHtmlEntity, changeToHtmlEntity, ts.Diagnostics.Convert_invalid_character_to_its_html_entity_code, fixIdHtmlEntity, ts.Diagnostics.Convert_all_invalid_characters_to_HTML_entity_code)
                 ];
             },
-            fixIds: [fixIdExpression, fixIdHtmlEntity],
+            getAllCodeActions: function (context) {
+                return codefix.codeFixAll(context, errorCodes, function (changes, diagnostic) { return doChange(changes, context.preferences, diagnostic.file, diagnostic.start, context.fixId === fixIdHtmlEntity); });
+            }
         });
         var htmlEntity = {
             ">": "&gt;",
@@ -130702,15 +130122,13 @@ var ts;
         function isValidCharacter(character) {
             return ts.hasProperty(htmlEntity, character);
         }
-        function doChange(changes, sourceFile, start, useHtmlEntity) {
+        function doChange(changes, preferences, sourceFile, start, useHtmlEntity) {
             var character = sourceFile.getText()[start];
             // sanity check
             if (!isValidCharacter(character)) {
                 return;
             }
-            var replacement = useHtmlEntity
-                ? htmlEntity[character]
-                : "{'" + character + "'}";
+            var replacement = useHtmlEntity ? htmlEntity[character] : "{" + ts.quote(character, preferences) + "}";
             changes.replaceRangeWithText(sourceFile, { pos: start, end: start + 1 }, replacement);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
@@ -131263,6 +130681,989 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "inferFromUsage";
+        var errorCodes = [
+            // Variable declarations
+            ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code,
+            // Variable uses
+            ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code,
+            // Parameter declarations
+            ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code,
+            ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code,
+            // Get Accessor declarations
+            ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code,
+            ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code,
+            // Set Accessor declarations
+            ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code,
+            // Property declarations
+            ts.Diagnostics.Member_0_implicitly_has_an_1_type.code,
+            //// Suggestions
+            // Variable declarations
+            ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage.code,
+            // Variable uses
+            ts.Diagnostics.Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Parameter declarations
+            ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
+            ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Get Accessor declarations
+            ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_get_accessor_may_be_inferred_from_usage.code,
+            ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Set Accessor declarations
+            ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code,
+            // Property declarations
+            ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Function expressions and declarations
+            ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code,
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, program = context.program, start = context.span.start, errorCode = context.errorCode, cancellationToken = context.cancellationToken, host = context.host, preferences = context.preferences;
+                var token = ts.getTokenAtPosition(sourceFile, start);
+                var declaration;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (changes) { declaration = doChange(changes, sourceFile, token, errorCode, program, cancellationToken, /*markSeen*/ ts.returnTrue, host, preferences); });
+                var name = declaration && ts.getNameOfDeclaration(declaration);
+                return !name || changes.length === 0 ? undefined
+                    : [codefix.createCodeFixAction(fixId, changes, [getDiagnostic(errorCode, token), name.getText(sourceFile)], fixId, ts.Diagnostics.Infer_all_types_from_usage)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                var sourceFile = context.sourceFile, program = context.program, cancellationToken = context.cancellationToken, host = context.host, preferences = context.preferences;
+                var markSeen = ts.nodeSeenTracker();
+                return codefix.codeFixAll(context, errorCodes, function (changes, err) {
+                    doChange(changes, sourceFile, ts.getTokenAtPosition(err.file, err.start), err.code, program, cancellationToken, markSeen, host, preferences);
+                });
+            },
+        });
+        function getDiagnostic(errorCode, token) {
+            switch (errorCode) {
+                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code:
+                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.isSetAccessorDeclaration(ts.getContainingFunction(token)) ? ts.Diagnostics.Infer_type_of_0_from_usage : ts.Diagnostics.Infer_parameter_types_from_usage; // TODO: GH#18217
+                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
+                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Infer_parameter_types_from_usage;
+                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
+                    return ts.Diagnostics.Infer_this_type_of_0_from_usage;
+                default:
+                    return ts.Diagnostics.Infer_type_of_0_from_usage;
+            }
+        }
+        /** Map suggestion code to error code */
+        function mapSuggestionDiagnostic(errorCode) {
+            switch (errorCode) {
+                case ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code;
+                case ts.Diagnostics.Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code;
+                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code;
+                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code;
+                case ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_get_accessor_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code;
+                case ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code;
+                case ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code;
+                case ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Member_0_implicitly_has_an_1_type.code;
+            }
+            return errorCode;
+        }
+        function doChange(changes, sourceFile, token, errorCode, program, cancellationToken, markSeen, host, preferences) {
+            if (!ts.isParameterPropertyModifier(token.kind) && token.kind !== 75 /* Identifier */ && token.kind !== 25 /* DotDotDotToken */ && token.kind !== 104 /* ThisKeyword */) {
+                return undefined;
+            }
+            var parent = token.parent;
+            var importAdder = codefix.createImportAdder(sourceFile, program, preferences, host);
+            errorCode = mapSuggestionDiagnostic(errorCode);
+            switch (errorCode) {
+                // Variable and Property declarations
+                case ts.Diagnostics.Member_0_implicitly_has_an_1_type.code:
+                case ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code:
+                    if ((ts.isVariableDeclaration(parent) && markSeen(parent)) || ts.isPropertyDeclaration(parent) || ts.isPropertySignature(parent)) { // handle bad location
+                        annotateVariableDeclaration(changes, importAdder, sourceFile, parent, program, host, cancellationToken);
+                        importAdder.writeFixes(changes);
+                        return parent;
+                    }
+                    if (ts.isPropertyAccessExpression(parent)) {
+                        var type = inferTypeForVariableFromUsage(parent.name, program, cancellationToken);
+                        var typeNode = ts.getTypeNodeIfAccessible(type, parent, program, host);
+                        if (typeNode) {
+                            // Note that the codefix will never fire with an existing `@type` tag, so there is no need to merge tags
+                            var typeTag = ts.createJSDocTypeTag(ts.createJSDocTypeExpression(typeNode), /*comment*/ "");
+                            addJSDocTags(changes, sourceFile, ts.cast(parent.parent.parent, ts.isExpressionStatement), [typeTag]);
+                        }
+                        importAdder.writeFixes(changes);
+                        return parent;
+                    }
+                    return undefined;
+                case ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code: {
+                    var symbol = program.getTypeChecker().getSymbolAtLocation(token);
+                    if (symbol && symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) && markSeen(symbol.valueDeclaration)) {
+                        annotateVariableDeclaration(changes, importAdder, sourceFile, symbol.valueDeclaration, program, host, cancellationToken);
+                        importAdder.writeFixes(changes);
+                        return symbol.valueDeclaration;
+                    }
+                    return undefined;
+                }
+            }
+            var containingFunction = ts.getContainingFunction(token);
+            if (containingFunction === undefined) {
+                return undefined;
+            }
+            var declaration;
+            switch (errorCode) {
+                // Parameter declarations
+                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code:
+                    if (ts.isSetAccessorDeclaration(containingFunction)) {
+                        annotateSetAccessor(changes, importAdder, sourceFile, containingFunction, program, host, cancellationToken);
+                        declaration = containingFunction;
+                        break;
+                    }
+                // falls through
+                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
+                    if (markSeen(containingFunction)) {
+                        var param = ts.cast(parent, ts.isParameter);
+                        annotateParameters(changes, importAdder, sourceFile, param, containingFunction, program, host, cancellationToken);
+                        declaration = param;
+                    }
+                    break;
+                // Get Accessor declarations
+                case ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code:
+                case ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code:
+                    if (ts.isGetAccessorDeclaration(containingFunction) && ts.isIdentifier(containingFunction.name)) {
+                        annotate(changes, importAdder, sourceFile, containingFunction, inferTypeForVariableFromUsage(containingFunction.name, program, cancellationToken), program, host);
+                        declaration = containingFunction;
+                    }
+                    break;
+                // Set Accessor declarations
+                case ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code:
+                    if (ts.isSetAccessorDeclaration(containingFunction)) {
+                        annotateSetAccessor(changes, importAdder, sourceFile, containingFunction, program, host, cancellationToken);
+                        declaration = containingFunction;
+                    }
+                    break;
+                // Function 'this'
+                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
+                    if (ts.textChanges.isThisTypeAnnotatable(containingFunction) && markSeen(containingFunction)) {
+                        annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken);
+                        declaration = containingFunction;
+                    }
+                    break;
+                default:
+                    return ts.Debug.fail(String(errorCode));
+            }
+            importAdder.writeFixes(changes);
+            return declaration;
+        }
+        function annotateVariableDeclaration(changes, importAdder, sourceFile, declaration, program, host, cancellationToken) {
+            if (ts.isIdentifier(declaration.name)) {
+                annotate(changes, importAdder, sourceFile, declaration, inferTypeForVariableFromUsage(declaration.name, program, cancellationToken), program, host);
+            }
+        }
+        function annotateParameters(changes, importAdder, sourceFile, parameterDeclaration, containingFunction, program, host, cancellationToken) {
+            if (!ts.isIdentifier(parameterDeclaration.name)) {
+                return;
+            }
+            var parameterInferences = inferTypeForParametersFromUsage(containingFunction, sourceFile, program, cancellationToken);
+            ts.Debug.assert(containingFunction.parameters.length === parameterInferences.length, "Parameter count and inference count should match");
+            if (ts.isInJSFile(containingFunction)) {
+                annotateJSDocParameters(changes, sourceFile, parameterInferences, program, host);
+            }
+            else {
+                var needParens = ts.isArrowFunction(containingFunction) && !ts.findChildOfKind(containingFunction, 20 /* OpenParenToken */, sourceFile);
+                if (needParens)
+                    changes.insertNodeBefore(sourceFile, ts.first(containingFunction.parameters), ts.createToken(20 /* OpenParenToken */));
+                for (var _i = 0, parameterInferences_1 = parameterInferences; _i < parameterInferences_1.length; _i++) {
+                    var _a = parameterInferences_1[_i], declaration = _a.declaration, type = _a.type;
+                    if (declaration && !declaration.type && !declaration.initializer) {
+                        annotate(changes, importAdder, sourceFile, declaration, type, program, host);
+                    }
+                }
+                if (needParens)
+                    changes.insertNodeAfter(sourceFile, ts.last(containingFunction.parameters), ts.createToken(21 /* CloseParenToken */));
+            }
+        }
+        function annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken) {
+            var references = getFunctionReferences(containingFunction, sourceFile, program, cancellationToken);
+            if (!references || !references.length) {
+                return;
+            }
+            var thisInference = inferTypeFromReferences(program, references, cancellationToken).thisParameter();
+            var typeNode = ts.getTypeNodeIfAccessible(thisInference, containingFunction, program, host);
+            if (!typeNode) {
+                return;
+            }
+            if (ts.isInJSFile(containingFunction)) {
+                annotateJSDocThis(changes, sourceFile, containingFunction, typeNode);
+            }
+            else {
+                changes.tryInsertThisTypeAnnotation(sourceFile, containingFunction, typeNode);
+            }
+        }
+        function annotateJSDocThis(changes, sourceFile, containingFunction, typeNode) {
+            addJSDocTags(changes, sourceFile, containingFunction, [
+                ts.createJSDocThisTag(ts.createJSDocTypeExpression(typeNode)),
+            ]);
+        }
+        function annotateSetAccessor(changes, importAdder, sourceFile, setAccessorDeclaration, program, host, cancellationToken) {
+            var param = ts.firstOrUndefined(setAccessorDeclaration.parameters);
+            if (param && ts.isIdentifier(setAccessorDeclaration.name) && ts.isIdentifier(param.name)) {
+                var type = inferTypeForVariableFromUsage(setAccessorDeclaration.name, program, cancellationToken);
+                if (type === program.getTypeChecker().getAnyType()) {
+                    type = inferTypeForVariableFromUsage(param.name, program, cancellationToken);
+                }
+                if (ts.isInJSFile(setAccessorDeclaration)) {
+                    annotateJSDocParameters(changes, sourceFile, [{ declaration: param, type: type }], program, host);
+                }
+                else {
+                    annotate(changes, importAdder, sourceFile, param, type, program, host);
+                }
+            }
+        }
+        function annotate(changes, importAdder, sourceFile, declaration, type, program, host) {
+            var typeNode = ts.getTypeNodeIfAccessible(type, declaration, program, host);
+            if (typeNode) {
+                if (ts.isInJSFile(sourceFile) && declaration.kind !== 159 /* PropertySignature */) {
+                    var parent = ts.isVariableDeclaration(declaration) ? ts.tryCast(declaration.parent.parent, ts.isVariableStatement) : declaration;
+                    if (!parent) {
+                        return;
+                    }
+                    var typeExpression = ts.createJSDocTypeExpression(typeNode);
+                    var typeTag = ts.isGetAccessorDeclaration(declaration) ? ts.createJSDocReturnTag(typeExpression, "") : ts.createJSDocTypeTag(typeExpression, "");
+                    addJSDocTags(changes, sourceFile, parent, [typeTag]);
+                }
+                else if (!tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, type, sourceFile, changes, importAdder, ts.getEmitScriptTarget(program.getCompilerOptions()))) {
+                    changes.tryInsertTypeAnnotation(sourceFile, declaration, typeNode);
+                }
+            }
+        }
+        function tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, type, sourceFile, changes, importAdder, scriptTarget) {
+            var importableReference = codefix.tryGetAutoImportableReferenceFromImportTypeNode(typeNode, type, scriptTarget);
+            if (importableReference && changes.tryInsertTypeAnnotation(sourceFile, declaration, importableReference.typeReference)) {
+                ts.forEach(importableReference.symbols, function (s) { return importAdder.addImportFromExportedSymbol(s, /*usageIsTypeOnly*/ true); });
+                return true;
+            }
+            return false;
+        }
+        function annotateJSDocParameters(changes, sourceFile, parameterInferences, program, host) {
+            var signature = parameterInferences.length && parameterInferences[0].declaration.parent;
+            if (!signature) {
+                return;
+            }
+            var paramTags = ts.mapDefined(parameterInferences, function (inference) {
+                var param = inference.declaration;
+                // only infer parameters that have (1) no type and (2) an accessible inferred type
+                if (param.initializer || ts.getJSDocType(param) || !ts.isIdentifier(param.name))
+                    return;
+                var typeNode = inference.type && ts.getTypeNodeIfAccessible(inference.type, param, program, host);
+                var name = ts.getSynthesizedClone(param.name);
+                ts.setEmitFlags(name, 1536 /* NoComments */ | 2048 /* NoNestedComments */);
+                return typeNode && ts.createJSDocParamTag(name, !!inference.isOptional, ts.createJSDocTypeExpression(typeNode), "");
+            });
+            addJSDocTags(changes, sourceFile, signature, paramTags);
+        }
+        function addJSDocTags(changes, sourceFile, parent, newTags) {
+            var comments = ts.mapDefined(parent.jsDoc, function (j) { return j.comment; });
+            var oldTags = ts.flatMapToMutable(parent.jsDoc, function (j) { return j.tags; });
+            var unmergedNewTags = newTags.filter(function (newTag) { return !oldTags || !oldTags.some(function (tag, i) {
+                var merged = tryMergeJsdocTags(tag, newTag);
+                if (merged)
+                    oldTags[i] = merged;
+                return !!merged;
+            }); });
+            var tag = ts.createJSDocComment(comments.join("\n"), ts.createNodeArray(__spreadArrays((oldTags || ts.emptyArray), unmergedNewTags)));
+            var jsDocNode = parent.kind === 203 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
+            jsDocNode.jsDoc = parent.jsDoc;
+            jsDocNode.jsDocCache = parent.jsDocCache;
+            changes.insertJsdocCommentBefore(sourceFile, jsDocNode, tag);
+        }
+        codefix.addJSDocTags = addJSDocTags;
+        function getJsDocNodeForArrowFunction(signature) {
+            if (signature.parent.kind === 160 /* PropertyDeclaration */) {
+                return signature.parent;
+            }
+            return signature.parent.parent;
+        }
+        function tryMergeJsdocTags(oldTag, newTag) {
+            if (oldTag.kind !== newTag.kind) {
+                return undefined;
+            }
+            switch (oldTag.kind) {
+                case 318 /* JSDocParameterTag */: {
+                    var oldParam = oldTag;
+                    var newParam = newTag;
+                    return ts.isIdentifier(oldParam.name) && ts.isIdentifier(newParam.name) && oldParam.name.escapedText === newParam.name.escapedText
+                        ? ts.createJSDocParamTag(newParam.name, newParam.isBracketed, newParam.typeExpression, oldParam.comment)
+                        : undefined;
+                }
+                case 319 /* JSDocReturnTag */:
+                    return ts.createJSDocReturnTag(newTag.typeExpression, oldTag.comment);
+            }
+        }
+        function getReferences(token, program, cancellationToken) {
+            // Position shouldn't matter since token is not a SourceFile.
+            return ts.mapDefined(ts.FindAllReferences.getReferenceEntriesForNode(-1, token, program, program.getSourceFiles(), cancellationToken), function (entry) {
+                return entry.kind !== 0 /* Span */ ? ts.tryCast(entry.node, ts.isIdentifier) : undefined;
+            });
+        }
+        function inferTypeForVariableFromUsage(token, program, cancellationToken) {
+            var references = getReferences(token, program, cancellationToken);
+            return inferTypeFromReferences(program, references, cancellationToken).single();
+        }
+        function inferTypeForParametersFromUsage(func, sourceFile, program, cancellationToken) {
+            var references = getFunctionReferences(func, sourceFile, program, cancellationToken);
+            return references && inferTypeFromReferences(program, references, cancellationToken).parameters(func) ||
+                func.parameters.map(function (p) { return ({
+                    declaration: p,
+                    type: ts.isIdentifier(p.name) ? inferTypeForVariableFromUsage(p.name, program, cancellationToken) : program.getTypeChecker().getAnyType()
+                }); });
+        }
+        function getFunctionReferences(containingFunction, sourceFile, program, cancellationToken) {
+            var searchToken;
+            switch (containingFunction.kind) {
+                case 163 /* Constructor */:
+                    searchToken = ts.findChildOfKind(containingFunction, 130 /* ConstructorKeyword */, sourceFile);
+                    break;
+                case 203 /* ArrowFunction */:
+                case 202 /* FunctionExpression */:
+                    var parent = containingFunction.parent;
+                    searchToken = ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name) ?
+                        parent.name :
+                        containingFunction.name;
+                    break;
+                case 245 /* FunctionDeclaration */:
+                case 162 /* MethodDeclaration */:
+                    searchToken = containingFunction.name;
+                    break;
+            }
+            if (!searchToken) {
+                return undefined;
+            }
+            return getReferences(searchToken, program, cancellationToken);
+        }
+        function inferTypeFromReferences(program, references, cancellationToken) {
+            var checker = program.getTypeChecker();
+            var builtinConstructors = {
+                string: function () { return checker.getStringType(); },
+                number: function () { return checker.getNumberType(); },
+                Array: function (t) { return checker.createArrayType(t); },
+                Promise: function (t) { return checker.createPromiseType(t); },
+            };
+            var builtins = [
+                checker.getStringType(),
+                checker.getNumberType(),
+                checker.createArrayType(checker.getAnyType()),
+                checker.createPromiseType(checker.getAnyType()),
+            ];
+            return {
+                single: single,
+                parameters: parameters,
+                thisParameter: thisParameter,
+            };
+            function createEmptyUsage() {
+                return {
+                    isNumber: undefined,
+                    isString: undefined,
+                    isNumberOrString: undefined,
+                    candidateTypes: undefined,
+                    properties: undefined,
+                    calls: undefined,
+                    constructs: undefined,
+                    numberIndex: undefined,
+                    stringIndex: undefined,
+                    candidateThisTypes: undefined,
+                    inferredTypes: undefined,
+                };
+            }
+            function combineUsages(usages) {
+                var combinedProperties = ts.createUnderscoreEscapedMap();
+                for (var _i = 0, usages_1 = usages; _i < usages_1.length; _i++) {
+                    var u = usages_1[_i];
+                    if (u.properties) {
+                        u.properties.forEach(function (p, name) {
+                            if (!combinedProperties.has(name)) {
+                                combinedProperties.set(name, []);
+                            }
+                            combinedProperties.get(name).push(p);
+                        });
+                    }
+                }
+                var properties = ts.createUnderscoreEscapedMap();
+                combinedProperties.forEach(function (ps, name) {
+                    properties.set(name, combineUsages(ps));
+                });
+                return {
+                    isNumber: usages.some(function (u) { return u.isNumber; }),
+                    isString: usages.some(function (u) { return u.isString; }),
+                    isNumberOrString: usages.some(function (u) { return u.isNumberOrString; }),
+                    candidateTypes: ts.flatMap(usages, function (u) { return u.candidateTypes; }),
+                    properties: properties,
+                    calls: ts.flatMap(usages, function (u) { return u.calls; }),
+                    constructs: ts.flatMap(usages, function (u) { return u.constructs; }),
+                    numberIndex: ts.forEach(usages, function (u) { return u.numberIndex; }),
+                    stringIndex: ts.forEach(usages, function (u) { return u.stringIndex; }),
+                    candidateThisTypes: ts.flatMap(usages, function (u) { return u.candidateThisTypes; }),
+                    inferredTypes: undefined,
+                };
+            }
+            function single() {
+                return combineTypes(inferTypesFromReferencesSingle(references));
+            }
+            function parameters(declaration) {
+                if (references.length === 0 || !declaration.parameters) {
+                    return undefined;
+                }
+                var usage = createEmptyUsage();
+                for (var _i = 0, references_2 = references; _i < references_2.length; _i++) {
+                    var reference = references_2[_i];
+                    cancellationToken.throwIfCancellationRequested();
+                    calculateUsageOfNode(reference, usage);
+                }
+                var calls = __spreadArrays(usage.constructs || [], usage.calls || []);
+                return declaration.parameters.map(function (parameter, parameterIndex) {
+                    var types = [];
+                    var isRest = ts.isRestParameter(parameter);
+                    var isOptional = false;
+                    for (var _i = 0, calls_1 = calls; _i < calls_1.length; _i++) {
+                        var call = calls_1[_i];
+                        if (call.argumentTypes.length <= parameterIndex) {
+                            isOptional = ts.isInJSFile(declaration);
+                            types.push(checker.getUndefinedType());
+                        }
+                        else if (isRest) {
+                            for (var i = parameterIndex; i < call.argumentTypes.length; i++) {
+                                types.push(checker.getBaseTypeOfLiteralType(call.argumentTypes[i]));
+                            }
+                        }
+                        else {
+                            types.push(checker.getBaseTypeOfLiteralType(call.argumentTypes[parameterIndex]));
+                        }
+                    }
+                    if (ts.isIdentifier(parameter.name)) {
+                        var inferred = inferTypesFromReferencesSingle(getReferences(parameter.name, program, cancellationToken));
+                        types.push.apply(types, (isRest ? ts.mapDefined(inferred, checker.getElementTypeOfArrayType) : inferred));
+                    }
+                    var type = combineTypes(types);
+                    return {
+                        type: isRest ? checker.createArrayType(type) : type,
+                        isOptional: isOptional && !isRest,
+                        declaration: parameter
+                    };
+                });
+            }
+            function thisParameter() {
+                var usage = createEmptyUsage();
+                for (var _i = 0, references_3 = references; _i < references_3.length; _i++) {
+                    var reference = references_3[_i];
+                    cancellationToken.throwIfCancellationRequested();
+                    calculateUsageOfNode(reference, usage);
+                }
+                return combineTypes(usage.candidateThisTypes || ts.emptyArray);
+            }
+            function inferTypesFromReferencesSingle(references) {
+                var usage = createEmptyUsage();
+                for (var _i = 0, references_4 = references; _i < references_4.length; _i++) {
+                    var reference = references_4[_i];
+                    cancellationToken.throwIfCancellationRequested();
+                    calculateUsageOfNode(reference, usage);
+                }
+                return inferTypes(usage);
+            }
+            function calculateUsageOfNode(node, usage) {
+                while (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
+                    node = node.parent;
+                }
+                switch (node.parent.kind) {
+                    case 227 /* ExpressionStatement */:
+                        addCandidateType(usage, checker.getVoidType());
+                        break;
+                    case 209 /* PostfixUnaryExpression */:
+                        usage.isNumber = true;
+                        break;
+                    case 208 /* PrefixUnaryExpression */:
+                        inferTypeFromPrefixUnaryExpression(node.parent, usage);
+                        break;
+                    case 210 /* BinaryExpression */:
+                        inferTypeFromBinaryExpression(node, node.parent, usage);
+                        break;
+                    case 278 /* CaseClause */:
+                    case 279 /* DefaultClause */:
+                        inferTypeFromSwitchStatementLabel(node.parent, usage);
+                        break;
+                    case 197 /* CallExpression */:
+                    case 198 /* NewExpression */:
+                        if (node.parent.expression === node) {
+                            inferTypeFromCallExpression(node.parent, usage);
+                        }
+                        else {
+                            inferTypeFromContextualType(node, usage);
+                        }
+                        break;
+                    case 195 /* PropertyAccessExpression */:
+                        inferTypeFromPropertyAccessExpression(node.parent, usage);
+                        break;
+                    case 196 /* ElementAccessExpression */:
+                        inferTypeFromPropertyElementExpression(node.parent, node, usage);
+                        break;
+                    case 282 /* PropertyAssignment */:
+                    case 283 /* ShorthandPropertyAssignment */:
+                        inferTypeFromPropertyAssignment(node.parent, usage);
+                        break;
+                    case 160 /* PropertyDeclaration */:
+                        inferTypeFromPropertyDeclaration(node.parent, usage);
+                        break;
+                    case 243 /* VariableDeclaration */: {
+                        var _a = node.parent, name = _a.name, initializer = _a.initializer;
+                        if (node === name) {
+                            if (initializer) { // This can happen for `let x = null;` which still has an implicit-any error.
+                                addCandidateType(usage, checker.getTypeAtLocation(initializer));
+                            }
+                            break;
+                        }
+                    }
+                    // falls through
+                    default:
+                        return inferTypeFromContextualType(node, usage);
+                }
+            }
+            function inferTypeFromContextualType(node, usage) {
+                if (ts.isExpressionNode(node)) {
+                    addCandidateType(usage, checker.getContextualType(node));
+                }
+            }
+            function inferTypeFromPrefixUnaryExpression(node, usage) {
+                switch (node.operator) {
+                    case 45 /* PlusPlusToken */:
+                    case 46 /* MinusMinusToken */:
+                    case 40 /* MinusToken */:
+                    case 54 /* TildeToken */:
+                        usage.isNumber = true;
+                        break;
+                    case 39 /* PlusToken */:
+                        usage.isNumberOrString = true;
+                        break;
+                    // case SyntaxKind.ExclamationToken:
+                    // no inferences here;
+                }
+            }
+            function inferTypeFromBinaryExpression(node, parent, usage) {
+                switch (parent.operatorToken.kind) {
+                    // ExponentiationOperator
+                    case 42 /* AsteriskAsteriskToken */:
+                    // MultiplicativeOperator
+                    // falls through
+                    case 41 /* AsteriskToken */:
+                    case 43 /* SlashToken */:
+                    case 44 /* PercentToken */:
+                    // ShiftOperator
+                    // falls through
+                    case 47 /* LessThanLessThanToken */:
+                    case 48 /* GreaterThanGreaterThanToken */:
+                    case 49 /* GreaterThanGreaterThanGreaterThanToken */:
+                    // BitwiseOperator
+                    // falls through
+                    case 50 /* AmpersandToken */:
+                    case 51 /* BarToken */:
+                    case 52 /* CaretToken */:
+                    // CompoundAssignmentOperator
+                    // falls through
+                    case 64 /* MinusEqualsToken */:
+                    case 66 /* AsteriskAsteriskEqualsToken */:
+                    case 65 /* AsteriskEqualsToken */:
+                    case 67 /* SlashEqualsToken */:
+                    case 68 /* PercentEqualsToken */:
+                    case 72 /* AmpersandEqualsToken */:
+                    case 73 /* BarEqualsToken */:
+                    case 74 /* CaretEqualsToken */:
+                    case 69 /* LessThanLessThanEqualsToken */:
+                    case 71 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 70 /* GreaterThanGreaterThanEqualsToken */:
+                    // AdditiveOperator
+                    // falls through
+                    case 40 /* MinusToken */:
+                    // RelationalOperator
+                    // falls through
+                    case 29 /* LessThanToken */:
+                    case 32 /* LessThanEqualsToken */:
+                    case 31 /* GreaterThanToken */:
+                    case 33 /* GreaterThanEqualsToken */:
+                        var operandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
+                        if (operandType.flags & 1056 /* EnumLike */) {
+                            addCandidateType(usage, operandType);
+                        }
+                        else {
+                            usage.isNumber = true;
+                        }
+                        break;
+                    case 63 /* PlusEqualsToken */:
+                    case 39 /* PlusToken */:
+                        var otherOperandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
+                        if (otherOperandType.flags & 1056 /* EnumLike */) {
+                            addCandidateType(usage, otherOperandType);
+                        }
+                        else if (otherOperandType.flags & 296 /* NumberLike */) {
+                            usage.isNumber = true;
+                        }
+                        else if (otherOperandType.flags & 132 /* StringLike */) {
+                            usage.isString = true;
+                        }
+                        else if (otherOperandType.flags & 1 /* Any */) {
+                            // do nothing, maybe we'll learn something elsewhere
+                        }
+                        else {
+                            usage.isNumberOrString = true;
+                        }
+                        break;
+                    //  AssignmentOperators
+                    case 62 /* EqualsToken */:
+                    case 34 /* EqualsEqualsToken */:
+                    case 36 /* EqualsEqualsEqualsToken */:
+                    case 37 /* ExclamationEqualsEqualsToken */:
+                    case 35 /* ExclamationEqualsToken */:
+                        addCandidateType(usage, checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left));
+                        break;
+                    case 97 /* InKeyword */:
+                        if (node === parent.left) {
+                            usage.isString = true;
+                        }
+                        break;
+                    // LogicalOperator Or NullishCoalescing
+                    case 56 /* BarBarToken */:
+                    case 60 /* QuestionQuestionToken */:
+                        if (node === parent.left &&
+                            (node.parent.parent.kind === 243 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
+                            // var x = x || {};
+                            // TODO: use getFalsyflagsOfType
+                            addCandidateType(usage, checker.getTypeAtLocation(parent.right));
+                        }
+                        break;
+                    case 55 /* AmpersandAmpersandToken */:
+                    case 27 /* CommaToken */:
+                    case 98 /* InstanceOfKeyword */:
+                        // nothing to infer here
+                        break;
+                }
+            }
+            function inferTypeFromSwitchStatementLabel(parent, usage) {
+                addCandidateType(usage, checker.getTypeAtLocation(parent.parent.parent.expression));
+            }
+            function inferTypeFromCallExpression(parent, usage) {
+                var call = {
+                    argumentTypes: [],
+                    return_: createEmptyUsage()
+                };
+                if (parent.arguments) {
+                    for (var _i = 0, _a = parent.arguments; _i < _a.length; _i++) {
+                        var argument = _a[_i];
+                        call.argumentTypes.push(checker.getTypeAtLocation(argument));
+                    }
+                }
+                calculateUsageOfNode(parent, call.return_);
+                if (parent.kind === 197 /* CallExpression */) {
+                    (usage.calls || (usage.calls = [])).push(call);
+                }
+                else {
+                    (usage.constructs || (usage.constructs = [])).push(call);
+                }
+            }
+            function inferTypeFromPropertyAccessExpression(parent, usage) {
+                var name = ts.escapeLeadingUnderscores(parent.name.text);
+                if (!usage.properties) {
+                    usage.properties = ts.createUnderscoreEscapedMap();
+                }
+                var propertyUsage = usage.properties.get(name) || createEmptyUsage();
+                calculateUsageOfNode(parent, propertyUsage);
+                usage.properties.set(name, propertyUsage);
+            }
+            function inferTypeFromPropertyElementExpression(parent, node, usage) {
+                if (node === parent.argumentExpression) {
+                    usage.isNumberOrString = true;
+                    return;
+                }
+                else {
+                    var indexType = checker.getTypeAtLocation(parent.argumentExpression);
+                    var indexUsage = createEmptyUsage();
+                    calculateUsageOfNode(parent, indexUsage);
+                    if (indexType.flags & 296 /* NumberLike */) {
+                        usage.numberIndex = indexUsage;
+                    }
+                    else {
+                        usage.stringIndex = indexUsage;
+                    }
+                }
+            }
+            function inferTypeFromPropertyAssignment(assignment, usage) {
+                var nodeWithRealType = ts.isVariableDeclaration(assignment.parent.parent) ?
+                    assignment.parent.parent :
+                    assignment.parent;
+                addCandidateThisType(usage, checker.getTypeAtLocation(nodeWithRealType));
+            }
+            function inferTypeFromPropertyDeclaration(declaration, usage) {
+                addCandidateThisType(usage, checker.getTypeAtLocation(declaration.parent));
+            }
+            function removeLowPriorityInferences(inferences, priorities) {
+                var toRemove = [];
+                for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
+                    var i = inferences_1[_i];
+                    for (var _a = 0, priorities_1 = priorities; _a < priorities_1.length; _a++) {
+                        var _b = priorities_1[_a], high = _b.high, low = _b.low;
+                        if (high(i)) {
+                            ts.Debug.assert(!low(i), "Priority can't have both low and high");
+                            toRemove.push(low);
+                        }
+                    }
+                }
+                return inferences.filter(function (i) { return toRemove.every(function (f) { return !f(i); }); });
+            }
+            function combineFromUsage(usage) {
+                return combineTypes(inferTypes(usage));
+            }
+            function combineTypes(inferences) {
+                if (!inferences.length)
+                    return checker.getAnyType();
+                // 1. string or number individually override string | number
+                // 2. non-any, non-void overrides any or void
+                // 3. non-nullable, non-any, non-void, non-anonymous overrides anonymous types
+                var stringNumber = checker.getUnionType([checker.getStringType(), checker.getNumberType()]);
+                var priorities = [
+                    {
+                        high: function (t) { return t === checker.getStringType() || t === checker.getNumberType(); },
+                        low: function (t) { return t === stringNumber; }
+                    },
+                    {
+                        high: function (t) { return !(t.flags & (1 /* Any */ | 16384 /* Void */)); },
+                        low: function (t) { return !!(t.flags & (1 /* Any */ | 16384 /* Void */)); }
+                    },
+                    {
+                        high: function (t) { return !(t.flags & (98304 /* Nullable */ | 1 /* Any */ | 16384 /* Void */)) && !(ts.getObjectFlags(t) & 16 /* Anonymous */); },
+                        low: function (t) { return !!(ts.getObjectFlags(t) & 16 /* Anonymous */); }
+                    }
+                ];
+                var good = removeLowPriorityInferences(inferences, priorities);
+                var anons = good.filter(function (i) { return ts.getObjectFlags(i) & 16 /* Anonymous */; });
+                if (anons.length) {
+                    good = good.filter(function (i) { return !(ts.getObjectFlags(i) & 16 /* Anonymous */); });
+                    good.push(combineAnonymousTypes(anons));
+                }
+                return checker.getWidenedType(checker.getUnionType(good.map(checker.getBaseTypeOfLiteralType), 2 /* Subtype */));
+            }
+            function combineAnonymousTypes(anons) {
+                if (anons.length === 1) {
+                    return anons[0];
+                }
+                var calls = [];
+                var constructs = [];
+                var stringIndices = [];
+                var numberIndices = [];
+                var stringIndexReadonly = false;
+                var numberIndexReadonly = false;
+                var props = ts.createMultiMap();
+                for (var _i = 0, anons_1 = anons; _i < anons_1.length; _i++) {
+                    var anon = anons_1[_i];
+                    for (var _a = 0, _b = checker.getPropertiesOfType(anon); _a < _b.length; _a++) {
+                        var p = _b[_a];
+                        props.add(p.name, checker.getTypeOfSymbolAtLocation(p, p.valueDeclaration));
+                    }
+                    calls.push.apply(calls, checker.getSignaturesOfType(anon, 0 /* Call */));
+                    constructs.push.apply(constructs, checker.getSignaturesOfType(anon, 1 /* Construct */));
+                    if (anon.stringIndexInfo) {
+                        stringIndices.push(anon.stringIndexInfo.type);
+                        stringIndexReadonly = stringIndexReadonly || anon.stringIndexInfo.isReadonly;
+                    }
+                    if (anon.numberIndexInfo) {
+                        numberIndices.push(anon.numberIndexInfo.type);
+                        numberIndexReadonly = numberIndexReadonly || anon.numberIndexInfo.isReadonly;
+                    }
+                }
+                var members = ts.mapEntries(props, function (name, types) {
+                    var isOptional = types.length < anons.length ? 16777216 /* Optional */ : 0;
+                    var s = checker.createSymbol(4 /* Property */ | isOptional, name);
+                    s.type = checker.getUnionType(types);
+                    return [name, s];
+                });
+                return checker.createAnonymousType(anons[0].symbol, members, calls, constructs, stringIndices.length ? checker.createIndexInfo(checker.getUnionType(stringIndices), stringIndexReadonly) : undefined, numberIndices.length ? checker.createIndexInfo(checker.getUnionType(numberIndices), numberIndexReadonly) : undefined);
+            }
+            function inferTypes(usage) {
+                var types = [];
+                if (usage.isNumber) {
+                    types.push(checker.getNumberType());
+                }
+                if (usage.isString) {
+                    types.push(checker.getStringType());
+                }
+                if (usage.isNumberOrString) {
+                    types.push(checker.getUnionType([checker.getStringType(), checker.getNumberType()]));
+                }
+                if (usage.numberIndex) {
+                    types.push(checker.createArrayType(combineFromUsage(usage.numberIndex)));
+                }
+                if (usage.properties && usage.properties.size
+                    || usage.calls && usage.calls.length
+                    || usage.constructs && usage.constructs.length
+                    || usage.stringIndex) {
+                    types.push(inferStructuralType(usage));
+                }
+                types.push.apply(types, (usage.candidateTypes || []).map(function (t) { return checker.getBaseTypeOfLiteralType(t); }));
+                types.push.apply(types, inferNamedTypesFromProperties(usage));
+                return types;
+            }
+            function inferStructuralType(usage) {
+                var members = ts.createUnderscoreEscapedMap();
+                if (usage.properties) {
+                    usage.properties.forEach(function (u, name) {
+                        var symbol = checker.createSymbol(4 /* Property */, name);
+                        symbol.type = combineFromUsage(u);
+                        members.set(name, symbol);
+                    });
+                }
+                var callSignatures = usage.calls ? [getSignatureFromCalls(usage.calls)] : [];
+                var constructSignatures = usage.constructs ? [getSignatureFromCalls(usage.constructs)] : [];
+                var stringIndexInfo = usage.stringIndex && checker.createIndexInfo(combineFromUsage(usage.stringIndex), /*isReadonly*/ false);
+                return checker.createAnonymousType(/*symbol*/ undefined, members, callSignatures, constructSignatures, stringIndexInfo, /*numberIndexInfo*/ undefined);
+            }
+            function inferNamedTypesFromProperties(usage) {
+                if (!usage.properties || !usage.properties.size)
+                    return [];
+                var types = builtins.filter(function (t) { return allPropertiesAreAssignableToUsage(t, usage); });
+                if (0 < types.length && types.length < 3) {
+                    return types.map(function (t) { return inferInstantiationFromUsage(t, usage); });
+                }
+                return [];
+            }
+            function allPropertiesAreAssignableToUsage(type, usage) {
+                if (!usage.properties)
+                    return false;
+                return !ts.forEachEntry(usage.properties, function (propUsage, name) {
+                    var source = checker.getTypeOfPropertyOfType(type, name);
+                    if (!source) {
+                        return true;
+                    }
+                    if (propUsage.calls) {
+                        var sigs = checker.getSignaturesOfType(source, 0 /* Call */);
+                        return !sigs.length || !checker.isTypeAssignableTo(source, getFunctionFromCalls(propUsage.calls));
+                    }
+                    else {
+                        return !checker.isTypeAssignableTo(source, combineFromUsage(propUsage));
+                    }
+                });
+            }
+            /**
+             * inference is limited to
+             * 1. generic types with a single parameter
+             * 2. inference to/from calls with a single signature
+             */
+            function inferInstantiationFromUsage(type, usage) {
+                if (!(ts.getObjectFlags(type) & 4 /* Reference */) || !usage.properties) {
+                    return type;
+                }
+                var generic = type.target;
+                var singleTypeParameter = ts.singleOrUndefined(generic.typeParameters);
+                if (!singleTypeParameter)
+                    return type;
+                var types = [];
+                usage.properties.forEach(function (propUsage, name) {
+                    var genericPropertyType = checker.getTypeOfPropertyOfType(generic, name);
+                    ts.Debug.assert(!!genericPropertyType, "generic should have all the properties of its reference.");
+                    types.push.apply(types, inferTypeParameters(genericPropertyType, combineFromUsage(propUsage), singleTypeParameter));
+                });
+                return builtinConstructors[type.symbol.escapedName](combineTypes(types));
+            }
+            function inferTypeParameters(genericType, usageType, typeParameter) {
+                if (genericType === typeParameter) {
+                    return [usageType];
+                }
+                else if (genericType.flags & 3145728 /* UnionOrIntersection */) {
+                    return ts.flatMap(genericType.types, function (t) { return inferTypeParameters(t, usageType, typeParameter); });
+                }
+                else if (genericType.flags & 134217728 /* Awaited */) {
+                    return inferTypeParameters(genericType.awaitedType, usageType, typeParameter);
+                }
+                else if (ts.getObjectFlags(genericType) & 4 /* Reference */ && ts.getObjectFlags(usageType) & 4 /* Reference */) {
+                    // this is wrong because we need a reference to the targetType to, so we can check that it's also a reference
+                    var genericArgs = checker.getTypeArguments(genericType);
+                    var usageArgs = checker.getTypeArguments(usageType);
+                    var types = [];
+                    if (genericArgs && usageArgs) {
+                        for (var i = 0; i < genericArgs.length; i++) {
+                            if (usageArgs[i]) {
+                                types.push.apply(types, inferTypeParameters(genericArgs[i], usageArgs[i], typeParameter));
+                            }
+                        }
+                    }
+                    return types;
+                }
+                var genericSigs = checker.getSignaturesOfType(genericType, 0 /* Call */);
+                var usageSigs = checker.getSignaturesOfType(usageType, 0 /* Call */);
+                // allow for multiple overloads of `then`.
+                if (genericSigs.length === 1 && usageSigs.length === 1) {
+                    return inferFromSignatures(genericSigs[0], usageSigs[0], typeParameter);
+                }
+                return [];
+            }
+            function inferFromSignatures(genericSig, usageSig, typeParameter) {
+                var types = [];
+                for (var i = 0; i < genericSig.parameters.length; i++) {
+                    var genericParam = genericSig.parameters[i];
+                    var usageParam = usageSig.parameters[i];
+                    var isRest = genericSig.declaration && ts.isRestParameter(genericSig.declaration.parameters[i]);
+                    if (!usageParam) {
+                        break;
+                    }
+                    var genericParamType = checker.getTypeOfSymbolAtLocation(genericParam, genericParam.valueDeclaration);
+                    var elementType = isRest && checker.getElementTypeOfArrayType(genericParamType);
+                    if (elementType) {
+                        genericParamType = elementType;
+                    }
+                    var targetType = usageParam.type || checker.getTypeOfSymbolAtLocation(usageParam, usageParam.valueDeclaration);
+                    types.push.apply(types, inferTypeParameters(genericParamType, targetType, typeParameter));
+                }
+                var genericReturn = checker.getReturnTypeOfSignature(genericSig);
+                var usageReturn = checker.getReturnTypeOfSignature(usageSig);
+                types.push.apply(types, inferTypeParameters(genericReturn, usageReturn, typeParameter));
+                return types;
+            }
+            function getFunctionFromCalls(calls) {
+                return checker.createAnonymousType(/*symbol*/ undefined, ts.createSymbolTable(), [getSignatureFromCalls(calls)], ts.emptyArray, /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined);
+            }
+            function getSignatureFromCalls(calls) {
+                var parameters = [];
+                var length = Math.max.apply(Math, calls.map(function (c) { return c.argumentTypes.length; }));
+                var _loop_14 = function (i) {
+                    var symbol = checker.createSymbol(1 /* FunctionScopedVariable */, ts.escapeLeadingUnderscores("arg" + i));
+                    symbol.type = combineTypes(calls.map(function (call) { return call.argumentTypes[i] || checker.getUndefinedType(); }));
+                    if (calls.some(function (call) { return call.argumentTypes[i] === undefined; })) {
+                        symbol.flags |= 16777216 /* Optional */;
+                    }
+                    parameters.push(symbol);
+                };
+                for (var i = 0; i < length; i++) {
+                    _loop_14(i);
+                }
+                var returnType = combineFromUsage(combineUsages(calls.map(function (call) { return call.return_; })));
+                // TODO: GH#18217
+                return checker.createSignature(/*declaration*/ undefined, /*typeParameters*/ undefined, /*thisParameter*/ undefined, parameters, returnType, /*typePredicate*/ undefined, length, 0 /* None */);
+            }
+            function addCandidateType(usage, type) {
+                if (type && !(type.flags & 1 /* Any */) && !(type.flags & 131072 /* Never */)) {
+                    (usage.candidateTypes || (usage.candidateTypes = [])).push(type);
+                }
+            }
+            function addCandidateThisType(usage, type) {
+                if (type && !(type.flags & 1 /* Any */) && !(type.flags & 131072 /* Never */)) {
+                    (usage.candidateThisTypes || (usage.candidateThisTypes = [])).push(type);
+                }
+            }
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -131333,21 +131734,10 @@ var ts;
             }
         }
         codefix.createMissingMemberNodes = createMissingMemberNodes;
-        function getModuleSpecifierResolverHost(context) {
-            return {
-                directoryExists: context.host.directoryExists ? function (d) { return context.host.directoryExists(d); } : undefined,
-                fileExists: context.host.fileExists ? function (f) { return context.host.fileExists(f); } : undefined,
-                getCurrentDirectory: context.host.getCurrentDirectory ? function () { return context.host.getCurrentDirectory(); } : undefined,
-                readFile: context.host.readFile ? function (f) { return context.host.readFile(f); } : undefined,
-                useCaseSensitiveFileNames: context.host.useCaseSensitiveFileNames ? function () { return context.host.useCaseSensitiveFileNames(); } : undefined,
-                getSourceFiles: function () { return context.program.getSourceFiles(); },
-                getCommonSourceDirectory: function () { return context.program.getCommonSourceDirectory(); },
-            };
-        }
         function getNoopSymbolTrackerWithResolver(context) {
             return {
                 trackSymbol: ts.noop,
-                moduleResolverHost: getModuleSpecifierResolverHost(context),
+                moduleResolverHost: ts.getModuleSpecifierResolverHost(context.program, context.host),
             };
         }
         codefix.getNoopSymbolTrackerWithResolver = getNoopSymbolTrackerWithResolver;
@@ -133133,7 +133523,7 @@ var ts;
                     case 245 /* FunctionDeclaration */:
                         return scope.name
                             ? "function '" + scope.name.text + "'"
-                            : "anonymous function";
+                            : ts.ANONYMOUS;
                     case 203 /* ArrowFunction */:
                         return "arrow function";
                     case 162 /* MethodDeclaration */:
@@ -134262,7 +134652,7 @@ var ts;
             var newTypeNode = ts.createTypeAliasDeclaration(
             /* decorators */ undefined, 
             /* modifiers */ undefined, name, typeParameters.map(function (id) { return ts.updateTypeParameterDeclaration(id, id.name, id.constraint, /* defaultType */ undefined); }), selection);
-            changes.insertNodeBefore(file, firstStatement, newTypeNode, /* blankLineBetween */ true);
+            changes.insertNodeBefore(file, firstStatement, ts.ignoreSourceNewlines(newTypeNode), /* blankLineBetween */ true);
             changes.replaceNode(file, selection, ts.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })));
         }
         function doInterfaceChange(changes, file, name, info) {
@@ -134271,7 +134661,7 @@ var ts;
             /* decorators */ undefined, 
             /* modifiers */ undefined, name, typeParameters, 
             /* heritageClauses */ undefined, typeElements);
-            changes.insertNodeBefore(file, firstStatement, newTypeNode, /* blankLineBetween */ true);
+            changes.insertNodeBefore(file, firstStatement, ts.ignoreSourceNewlines(newTypeNode), /* blankLineBetween */ true);
             changes.replaceNode(file, selection, ts.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })));
         }
         function doTypedefChange(changes, file, name, info) {
@@ -139042,7 +139432,10 @@ var ts;
         /// Emit
         LanguageServiceShimObject.prototype.getEmitOutput = function (fileName) {
             var _this = this;
-            return this.forwardJSONCall("getEmitOutput('" + fileName + "')", function () { return _this.languageService.getEmitOutput(fileName); });
+            return this.forwardJSONCall("getEmitOutput('" + fileName + "')", function () {
+                var _a = _this.languageService.getEmitOutput(fileName), diagnostics = _a.diagnostics, rest = __rest(_a, ["diagnostics"]);
+                return __assign(__assign({}, rest), { diagnostics: _this.realizeDiagnostics(diagnostics) });
+            });
         };
         LanguageServiceShimObject.prototype.getEmitOutputObject = function (fileName) {
             var _this = this;
@@ -141164,17 +141557,25 @@ var ts;
              */
             Project.prototype.emitFile = function (scriptInfo, writeFile) {
                 if (!this.languageServiceEnabled || !this.shouldEmitFile(scriptInfo)) {
-                    return false;
+                    return { emitSkipped: true, diagnostics: server.emptyArray };
                 }
-                var _a = this.getLanguageService(/*ensureSynchronized*/ false).getEmitOutput(scriptInfo.fileName), emitSkipped = _a.emitSkipped, outputFiles = _a.outputFiles;
+                var _a = this.getLanguageService().getEmitOutput(scriptInfo.fileName), emitSkipped = _a.emitSkipped, diagnostics = _a.diagnostics, outputFiles = _a.outputFiles;
                 if (!emitSkipped) {
                     for (var _i = 0, outputFiles_1 = outputFiles; _i < outputFiles_1.length; _i++) {
                         var outputFile = outputFiles_1[_i];
                         var outputFileAbsoluteFileName = ts.getNormalizedAbsolutePath(outputFile.name, this.currentDirectory);
                         writeFile(outputFileAbsoluteFileName, outputFile.text, outputFile.writeByteOrderMark);
                     }
+                    // Update the signature
+                    if (this.builderState && ts.getEmitDeclarations(this.compilerOptions)) {
+                        var dtsFiles = outputFiles.filter(function (f) { return ts.fileExtensionIs(f.name, ".d.ts" /* Dts */); });
+                        if (dtsFiles.length === 1) {
+                            var sourceFile = this.program.getSourceFile(scriptInfo.fileName);
+                            ts.BuilderState.updateSignatureOfFile(this.builderState, this.projectService.host.createHash(dtsFiles[0].text), sourceFile.resolvedPath);
+                        }
+                    }
                 }
-                return !emitSkipped;
+                return { emitSkipped: emitSkipped, diagnostics: diagnostics };
             };
             Project.prototype.enableLanguageService = function () {
                 if (this.languageServiceEnabled || this.projectService.syntaxOnly) {
@@ -144842,6 +145243,13 @@ var ts;
                 // At this point if file is part of any any configured or external project, then it would be present in the containing projects
                 // So if it still doesnt have any containing projects, it needs to be part of inferred project
                 if (info.isOrphan()) {
+                    // Even though this info did not belong to any of the configured projects, send the config file diag
+                    if (ts.isArray(retainProjects)) {
+                        retainProjects.forEach(function (project) { return _this.sendConfigFileDiagEvent(project, info.fileName); });
+                    }
+                    else if (retainProjects) {
+                        this.sendConfigFileDiagEvent(retainProjects, info.fileName);
+                    }
                     ts.Debug.assert(this.openFiles.has(info.path));
                     this.assignOrphanScriptInfoToInferredProject(info, this.openFiles.get(info.path));
                 }
@@ -145570,7 +145978,7 @@ var ts;
         function convertToLocation(lineAndCharacter) {
             return { line: lineAndCharacter.line + 1, offset: lineAndCharacter.character + 1 };
         }
-        function formatConfigFileDiag(diag, includeFileName) {
+        function formatDiagnosticToProtocol(diag, includeFileName) {
             var start = (diag.file && convertToLocation(ts.getLineAndCharacterOfPosition(diag.file, diag.start))); // TODO: GH#18217
             var end = (diag.file && convertToLocation(ts.getLineAndCharacterOfPosition(diag.file, diag.start + diag.length))); // TODO: GH#18217
             var text = ts.flattenDiagnosticMessageText(diag.messageText, "\n");
@@ -146347,7 +146755,7 @@ var ts;
                         break;
                     case server.ConfigFileDiagEvent:
                         var _c = event.data, triggerFile = _c.triggerFile, configFile = _c.configFileName, diagnostics = _c.diagnostics;
-                        var bakedDiags = ts.map(diagnostics, function (diagnostic) { return formatConfigFileDiag(diagnostic, /*includeFileName*/ true); });
+                        var bakedDiags = ts.map(diagnostics, function (diagnostic) { return formatDiagnosticToProtocol(diagnostic, /*includeFileName*/ true); });
                         this.event({
                             triggerFile: triggerFile,
                             configFile: configFile,
@@ -146611,7 +147019,7 @@ var ts;
                 var diagnosticsForConfigFile = ts.filter(ts.concatenate(projectErrors, optionsErrors), function (diagnostic) { return !!diagnostic.file && diagnostic.file.fileName === configFile; });
                 return includeLinePosition ?
                     this.convertToDiagnosticsWithLinePositionFromDiagnosticFile(diagnosticsForConfigFile) :
-                    ts.map(diagnosticsForConfigFile, function (diagnostic) { return formatConfigFileDiag(diagnostic, /*includeFileName*/ false); });
+                    ts.map(diagnosticsForConfigFile, function (diagnostic) { return formatDiagnosticToProtocol(diagnostic, /*includeFileName*/ false); });
             };
             Session.prototype.convertToDiagnosticsWithLinePositionFromDiagnosticFile = function (diagnostics) {
                 var _this = this;
@@ -146621,8 +147029,10 @@ var ts;
                     length: d.length,
                     category: ts.diagnosticCategoryName(d),
                     code: d.code,
+                    source: d.source,
                     startLocation: (d.file && convertToLocation(ts.getLineAndCharacterOfPosition(d.file, d.start))),
                     endLocation: (d.file && convertToLocation(ts.getLineAndCharacterOfPosition(d.file, d.start + d.length))),
+                    reportsUnnecessary: d.reportsUnnecessary,
                     relatedInformation: ts.map(d.relatedInformation, formatRelatedInformation)
                 }); });
             };
@@ -146698,9 +147108,14 @@ var ts;
             };
             Session.prototype.getEmitOutput = function (args) {
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
-                return project.shouldEmitFile(project.getScriptInfo(file)) ?
-                    project.getLanguageService().getEmitOutput(file) :
-                    { emitSkipped: true, outputFiles: [] };
+                if (!project.shouldEmitFile(project.getScriptInfo(file))) {
+                    return { emitSkipped: true, outputFiles: [], diagnostics: [] };
+                }
+                var result = project.getLanguageService().getEmitOutput(file);
+                return args.richResponse ? __assign(__assign({}, result), { diagnostics: args.includeLinePosition ?
+                        this.convertToDiagnosticsWithLinePositionFromDiagnosticFile(result.diagnostics) :
+                        result.diagnostics.map(function (d) { return formatDiagnosticToProtocol(d, /*includeFileName*/ true); }) }) :
+                    result;
             };
             Session.prototype.mapDefinitionInfo = function (definitions, project) {
                 var _this = this;
@@ -147206,10 +147621,18 @@ var ts;
                     server.Errors.ThrowNoProject();
                 }
                 if (!project.languageServiceEnabled) {
-                    return false;
+                    return args.richResponse ? { emitSkipped: true, diagnostics: [] } : false;
                 }
                 var scriptInfo = project.getScriptInfo(file);
-                return project.emitFile(scriptInfo, function (path, data, writeByteOrderMark) { return _this.host.writeFile(path, data, writeByteOrderMark); });
+                var _b = project.emitFile(scriptInfo, function (path, data, writeByteOrderMark) { return _this.host.writeFile(path, data, writeByteOrderMark); }), emitSkipped = _b.emitSkipped, diagnostics = _b.diagnostics;
+                return args.richResponse ?
+                    {
+                        emitSkipped: emitSkipped,
+                        diagnostics: args.includeLinePosition ?
+                            this.convertToDiagnosticsWithLinePositionFromDiagnosticFile(diagnostics) :
+                            diagnostics.map(function (d) { return formatDiagnosticToProtocol(d, /*includeFileName*/ true); })
+                    } :
+                    !emitSkipped;
             };
             Session.prototype.getSignatureHelpItems = function (args, simplifiedResult) {
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
diff --git a/lib/tsserverlibrary.d.ts b/lib/tsserverlibrary.d.ts
index b54271da1ff..25747ebefe2 100644
--- a/lib/tsserverlibrary.d.ts
+++ b/lib/tsserverlibrary.d.ts
@@ -1925,7 +1925,7 @@ declare namespace ts {
         /** @throws OperationCanceledException if isCancellationRequested is true */
         throwIfCancellationRequested(): void;
     }
-    export interface Program extends ScriptReferenceHost, ModuleSpecifierResolutionHost {
+    export interface Program extends ScriptReferenceHost {
         getCurrentDirectory(): string;
         /**
          * Get a list of root file names that were passed to a 'createProgram'
@@ -3187,11 +3187,6 @@ declare namespace ts {
         directoryExists?(directoryName: string): boolean;
         getCurrentDirectory?(): string;
     }
-    export interface ModuleSpecifierResolutionHost extends GetEffectiveTypeRootsHost {
-        useCaseSensitiveFileNames?(): boolean;
-        fileExists?(path: string): boolean;
-        readFile?(path: string): string | undefined;
-    }
     export interface TextSpan {
         start: number;
         length: number;
@@ -5107,7 +5102,7 @@ declare namespace ts {
         fileName: Path;
         packageName: string;
     }
-    interface LanguageServiceHost extends ModuleSpecifierResolutionHost {
+    interface LanguageServiceHost extends GetEffectiveTypeRootsHost {
         getCompilationSettings(): CompilerOptions;
         getNewLine?(): string;
         getProjectVersion?(): string;
@@ -5123,6 +5118,7 @@ declare namespace ts {
         log?(s: string): void;
         trace?(s: string): void;
         error?(s: string): void;
+        useCaseSensitiveFileNames?(): boolean;
         readDirectory?(path: string, extensions?: readonly string[], exclude?: readonly string[], include?: readonly string[], depth?: number): string[];
         readFile?(path: string, encoding?: string): string | undefined;
         realpath?(path: string): string;
@@ -7504,6 +7500,16 @@ declare namespace ts.server.protocol {
          * if true - then file should be recompiled even if it does not have any changes.
          */
         forced?: boolean;
+        includeLinePosition?: boolean;
+        /** if true - return response as object with emitSkipped and diagnostics */
+        richResponse?: boolean;
+    }
+    interface CompileOnSaveEmitFileResponse extends Response {
+        body: boolean | EmitResult;
+    }
+    interface EmitResult {
+        emitSkipped: boolean;
+        diagnostics: Diagnostic[] | DiagnosticWithLinePosition[];
     }
     /**
      * Quickinfo request; value of command field is
@@ -8918,7 +8924,7 @@ declare namespace ts.server {
         /**
          * Returns true if emit was conducted
          */
-        emitFile(scriptInfo: ScriptInfo, writeFile: (path: string, data: string, writeByteOrderMark?: boolean) => void): boolean;
+        emitFile(scriptInfo: ScriptInfo, writeFile: (path: string, data: string, writeByteOrderMark?: boolean) => void): EmitResult;
         enableLanguageService(): void;
         disableLanguageService(lastFileExceededProgramSize?: string): void;
         getProjectName(): string;
diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
index e693ffdb2f4..27e0276a092 100644
--- a/lib/tsserverlibrary.js
+++ b/lib/tsserverlibrary.js
@@ -244,7 +244,7 @@ var ts;
     // If changing the text in this section, be sure to test `configurePrerelease` too.
     ts.versionMajorMinor = "3.9";
     /** The version of the TypeScript compiler release */
-    ts.version = ts.versionMajorMinor + ".0-dev";
+    ts.version = ts.versionMajorMinor + ".0-beta";
     /**
      * Returns the native Map implementation if it is available and compatible (i.e. supports iteration).
      */
@@ -4595,6 +4595,7 @@ var ts;
         EmitFlags[EmitFlags["NoAsciiEscaping"] = 16777216] = "NoAsciiEscaping";
         /*@internal*/ EmitFlags[EmitFlags["TypeScriptClassWrapper"] = 33554432] = "TypeScriptClassWrapper";
         /*@internal*/ EmitFlags[EmitFlags["NeverApplyImportHelper"] = 67108864] = "NeverApplyImportHelper";
+        /*@internal*/ EmitFlags[EmitFlags["IgnoreSourceNewlines"] = 134217728] = "IgnoreSourceNewlines";
     })(EmitFlags = ts.EmitFlags || (ts.EmitFlags = {}));
     /**
      * Used by the checker, this enum keeps track of external emit helpers that should be type
@@ -7172,6 +7173,7 @@ var ts;
         Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: diag(2395, ts.DiagnosticCategory.Error, "Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local_2395", "Individual declarations in merged declaration '{0}' must be all exported or all local."),
         Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: diag(2396, ts.DiagnosticCategory.Error, "Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters_2396", "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters."),
         Declaration_name_conflicts_with_built_in_global_identifier_0: diag(2397, ts.DiagnosticCategory.Error, "Declaration_name_conflicts_with_built_in_global_identifier_0_2397", "Declaration name conflicts with built-in global identifier '{0}'."),
+        constructor_cannot_be_used_as_a_parameter_property_name: diag(2398, ts.DiagnosticCategory.Error, "constructor_cannot_be_used_as_a_parameter_property_name_2398", "'constructor' cannot be used as a parameter property name."),
         Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: diag(2399, ts.DiagnosticCategory.Error, "Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference_2399", "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference."),
         Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: diag(2400, ts.DiagnosticCategory.Error, "Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference_2400", "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference."),
         Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: diag(2401, ts.DiagnosticCategory.Error, "Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference_2401", "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference."),
@@ -7506,6 +7508,7 @@ var ts;
         _0_needs_an_explicit_type_annotation: diag(2782, ts.DiagnosticCategory.Message, "_0_needs_an_explicit_type_annotation_2782", "'{0}' needs an explicit type annotation."),
         _0_is_specified_more_than_once_so_this_usage_will_be_overwritten: diag(2783, ts.DiagnosticCategory.Error, "_0_is_specified_more_than_once_so_this_usage_will_be_overwritten_2783", "'{0}' is specified more than once, so this usage will be overwritten."),
         get_and_set_accessors_cannot_declare_this_parameters: diag(2784, ts.DiagnosticCategory.Error, "get_and_set_accessors_cannot_declare_this_parameters_2784", "'get' and 'set' accessors cannot declare 'this' parameters."),
+        This_spread_always_overwrites_this_property: diag(2785, ts.DiagnosticCategory.Error, "This_spread_always_overwrites_this_property_2785", "This spread always overwrites this property."),
         Import_declaration_0_is_using_private_name_1: diag(4000, ts.DiagnosticCategory.Error, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -7857,6 +7860,7 @@ var ts;
         Synchronously_call_callbacks_and_update_the_state_of_directory_watchers_on_platforms_that_don_t_support_recursive_watching_natively: diag(6228, ts.DiagnosticCategory.Message, "Synchronously_call_callbacks_and_update_the_state_of_directory_watchers_on_platforms_that_don_t_supp_6228", "Synchronously call callbacks and update the state of directory watchers on platforms that don't support recursive watching natively."),
         Tag_0_expects_at_least_1_arguments_but_the_JSX_factory_2_provides_at_most_3: diag(6229, ts.DiagnosticCategory.Error, "Tag_0_expects_at_least_1_arguments_but_the_JSX_factory_2_provides_at_most_3_6229", "Tag '{0}' expects at least '{1}' arguments, but the JSX factory '{2}' provides at most '{3}'."),
         Option_0_can_only_be_specified_in_tsconfig_json_file_or_set_to_false_or_null_on_command_line: diag(6230, ts.DiagnosticCategory.Error, "Option_0_can_only_be_specified_in_tsconfig_json_file_or_set_to_false_or_null_on_command_line_6230", "Option '{0}' can only be specified in 'tsconfig.json' file or set to 'false' or 'null' on command line."),
+        Could_not_resolve_the_path_0_with_the_extensions_Colon_1: diag(6231, ts.DiagnosticCategory.Error, "Could_not_resolve_the_path_0_with_the_extensions_Colon_1_6231", "Could not resolve the path '{0}' with the extensions: {1}."),
         Projects_to_reference: diag(6300, ts.DiagnosticCategory.Message, "Projects_to_reference_6300", "Projects to reference"),
         Enable_project_compilation: diag(6302, ts.DiagnosticCategory.Message, "Enable_project_compilation_6302", "Enable project compilation"),
         Composite_projects_may_not_disable_declaration_emit: diag(6304, ts.DiagnosticCategory.Error, "Composite_projects_may_not_disable_declaration_emit_6304", "Composite projects may not disable declaration emit."),
@@ -8153,7 +8157,15 @@ var ts;
         Set_the_target_option_in_your_configuration_file_to_0: diag(95098, ts.DiagnosticCategory.Message, "Set_the_target_option_in_your_configuration_file_to_0_95098", "Set the 'target' option in your configuration file to '{0}'"),
         Set_the_module_option_in_your_configuration_file_to_0: diag(95099, ts.DiagnosticCategory.Message, "Set_the_module_option_in_your_configuration_file_to_0_95099", "Set the 'module' option in your configuration file to '{0}'"),
         Convert_invalid_character_to_its_html_entity_code: diag(95100, ts.DiagnosticCategory.Message, "Convert_invalid_character_to_its_html_entity_code_95100", "Convert invalid character to its html entity code"),
-        Wrap_invalid_character_in_an_expression_container: diag(95101, ts.DiagnosticCategory.Message, "Wrap_invalid_character_in_an_expression_container_95101", "Wrap invalid character in an expression container"),
+        Convert_all_invalid_characters_to_HTML_entity_code: diag(95101, ts.DiagnosticCategory.Message, "Convert_all_invalid_characters_to_HTML_entity_code_95101", "Convert all invalid characters to HTML entity code"),
+        Add_class_tag: diag(95102, ts.DiagnosticCategory.Message, "Add_class_tag_95102", "Add '@class' tag"),
+        Add_this_tag: diag(95103, ts.DiagnosticCategory.Message, "Add_this_tag_95103", "Add '@this' tag"),
+        Add_this_parameter: diag(95104, ts.DiagnosticCategory.Message, "Add_this_parameter_95104", "Add 'this' parameter."),
+        Convert_function_expression_0_to_arrow_function: diag(95105, ts.DiagnosticCategory.Message, "Convert_function_expression_0_to_arrow_function_95105", "Convert function expression '{0}' to arrow function"),
+        Convert_function_declaration_0_to_arrow_function: diag(95106, ts.DiagnosticCategory.Message, "Convert_function_declaration_0_to_arrow_function_95106", "Convert function declaration '{0}' to arrow function"),
+        Fix_all_implicit_this_errors: diag(95107, ts.DiagnosticCategory.Message, "Fix_all_implicit_this_errors_95107", "Fix all implicit-'this' errors"),
+        Wrap_invalid_character_in_an_expression_container: diag(95108, ts.DiagnosticCategory.Message, "Wrap_invalid_character_in_an_expression_container_95108", "Wrap invalid character in an expression container"),
+        Wrap_all_invalid_characters_in_an_expression_container: diag(95109, ts.DiagnosticCategory.Message, "Wrap_all_invalid_characters_in_an_expression_container_95109", "Wrap all invalid characters in an expression container"),
         No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, ts.DiagnosticCategory.Error, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
         Classes_may_not_have_a_field_named_constructor: diag(18006, ts.DiagnosticCategory.Error, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
         JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, ts.DiagnosticCategory.Error, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
@@ -8455,11 +8467,20 @@ var ts;
     }
     ts.getLineStarts = getLineStarts;
     /* @internal */
+    function computeLineAndCharacterOfPosition(lineStarts, position) {
+        var lineNumber = computeLineOfPosition(lineStarts, position);
+        return {
+            line: lineNumber,
+            character: position - lineStarts[lineNumber]
+        };
+    }
+    ts.computeLineAndCharacterOfPosition = computeLineAndCharacterOfPosition;
     /**
+     * @internal
      * We assume the first line starts at position 0 and 'position' is non-negative.
      */
-    function computeLineAndCharacterOfPosition(lineStarts, position) {
-        var lineNumber = ts.binarySearch(lineStarts, position, ts.identity, ts.compareValues);
+    function computeLineOfPosition(lineStarts, position, lowerBound) {
+        var lineNumber = ts.binarySearch(lineStarts, position, ts.identity, ts.compareValues, lowerBound);
         if (lineNumber < 0) {
             // If the actual position was not found,
             // the binary search returns the 2's-complement of the next line start
@@ -8471,12 +8492,22 @@ var ts;
             lineNumber = ~lineNumber - 1;
             ts.Debug.assert(lineNumber !== -1, "position cannot precede the beginning of the file");
         }
-        return {
-            line: lineNumber,
-            character: position - lineStarts[lineNumber]
-        };
+        return lineNumber;
     }
-    ts.computeLineAndCharacterOfPosition = computeLineAndCharacterOfPosition;
+    ts.computeLineOfPosition = computeLineOfPosition;
+    /** @internal */
+    function getLinesBetweenPositions(sourceFile, pos1, pos2) {
+        if (pos1 === pos2)
+            return 0;
+        var lineStarts = getLineStarts(sourceFile);
+        var lower = Math.min(pos1, pos2);
+        var isNegative = lower === pos2;
+        var upper = isNegative ? pos1 : pos2;
+        var lowerLine = computeLineOfPosition(lineStarts, lower);
+        var upperLine = computeLineOfPosition(lineStarts, upper, lowerLine);
+        return isNegative ? lowerLine - upperLine : upperLine - lowerLine;
+    }
+    ts.getLinesBetweenPositions = getLinesBetweenPositions;
     function getLineAndCharacterOfPosition(sourceFile, position) {
         return computeLineAndCharacterOfPosition(getLineStarts(sourceFile), position);
     }
@@ -12848,6 +12879,7 @@ var ts;
     ts.emptyUnderscoreEscapedMap = ts.emptyMap;
     ts.externalHelpersModuleNameText = "tslib";
     ts.defaultMaximumTruncationLength = 160;
+    ts.noTruncationMaximumTruncationLength = 1000000;
     function getDeclarationOfKind(symbol, kind) {
         var declarations = symbol.declarations;
         if (declarations) {
@@ -13301,7 +13333,7 @@ var ts;
             return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos, /*stopAfterLineBreak*/ false, /*stopAtComments*/ true);
         }
         if (includeJsDoc && ts.hasJSDocNodes(node)) {
-            return getTokenPosOfNode(node.jsDoc[0]);
+            return getTokenPosOfNode(node.jsDoc[0], sourceFile);
         }
         // For a syntax list, it is possible that one of its children has JSDocComment nodes, while
         // the syntax list itself considers them as normal trivia. Therefore if we simply skip
@@ -16261,8 +16293,8 @@ var ts;
                 write(s);
             }
         }
-        function writeLine() {
-            if (!lineStart) {
+        function writeLine(force) {
+            if (!lineStart || force) {
                 output += newLine;
                 lineCount++;
                 linePos = output.length;
@@ -16373,6 +16405,14 @@ var ts;
             } });
     }
     ts.getTrailingSemicolonDeferringWriter = getTrailingSemicolonDeferringWriter;
+    function hostUsesCaseSensitiveFileNames(host) {
+        return host.useCaseSensitiveFileNames ? host.useCaseSensitiveFileNames() : false;
+    }
+    ts.hostUsesCaseSensitiveFileNames = hostUsesCaseSensitiveFileNames;
+    function hostGetCanonicalFileName(host) {
+        return ts.createGetCanonicalFileName(hostUsesCaseSensitiveFileNames(host));
+    }
+    ts.hostGetCanonicalFileName = hostGetCanonicalFileName;
     function getResolvedExternalModuleName(host, file, referenceFile) {
         return file.moduleName || getExternalModuleNameFromPath(host, file.fileName, referenceFile && referenceFile.fileName);
     }
@@ -16493,12 +16533,13 @@ var ts;
         }
     }
     ts.writeFileEnsuringDirectories = writeFileEnsuringDirectories;
-    function getLineOfLocalPosition(currentSourceFile, pos) {
-        return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line;
+    function getLineOfLocalPosition(sourceFile, pos) {
+        var lineStarts = ts.getLineStarts(sourceFile);
+        return ts.computeLineOfPosition(lineStarts, pos);
     }
     ts.getLineOfLocalPosition = getLineOfLocalPosition;
     function getLineOfLocalPositionFromLineMap(lineMap, pos) {
-        return ts.computeLineAndCharacterOfPosition(lineMap, pos).line;
+        return ts.computeLineOfPosition(lineMap, pos);
     }
     ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
     function getFirstConstructorWithBody(node) {
@@ -17269,7 +17310,7 @@ var ts;
     }
     ts.rangeIsOnSingleLine = rangeIsOnSingleLine;
     function rangeStartPositionsAreOnSameLine(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), getStartPositionOfRange(range2, sourceFile), sourceFile);
+        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile, /*includeComments*/ false), getStartPositionOfRange(range2, sourceFile, /*includeComments*/ false), sourceFile);
     }
     ts.rangeStartPositionsAreOnSameLine = rangeStartPositionsAreOnSameLine;
     function rangeEndPositionsAreOnSameLine(range1, range2, sourceFile) {
@@ -17277,26 +17318,52 @@ var ts;
     }
     ts.rangeEndPositionsAreOnSameLine = rangeEndPositionsAreOnSameLine;
     function rangeStartIsOnSameLineAsRangeEnd(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), range2.end, sourceFile);
+        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile, /*includeComments*/ false), range2.end, sourceFile);
     }
     ts.rangeStartIsOnSameLineAsRangeEnd = rangeStartIsOnSameLineAsRangeEnd;
     function rangeEndIsOnSameLineAsRangeStart(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile), sourceFile);
+        return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile, /*includeComments*/ false), sourceFile);
     }
     ts.rangeEndIsOnSameLineAsRangeStart = rangeEndIsOnSameLineAsRangeStart;
+    function getLinesBetweenRangeEndAndRangeStart(range1, range2, sourceFile, includeSecondRangeComments) {
+        var range2Start = getStartPositionOfRange(range2, sourceFile, includeSecondRangeComments);
+        return ts.getLinesBetweenPositions(sourceFile, range1.end, range2Start);
+    }
+    ts.getLinesBetweenRangeEndAndRangeStart = getLinesBetweenRangeEndAndRangeStart;
+    function getLinesBetweenRangeEndPositions(range1, range2, sourceFile) {
+        return ts.getLinesBetweenPositions(sourceFile, range1.end, range2.end);
+    }
+    ts.getLinesBetweenRangeEndPositions = getLinesBetweenRangeEndPositions;
     function isNodeArrayMultiLine(list, sourceFile) {
         return !positionsAreOnSameLine(list.pos, list.end, sourceFile);
     }
     ts.isNodeArrayMultiLine = isNodeArrayMultiLine;
     function positionsAreOnSameLine(pos1, pos2, sourceFile) {
-        return pos1 === pos2 ||
-            getLineOfLocalPosition(sourceFile, pos1) === getLineOfLocalPosition(sourceFile, pos2);
+        return ts.getLinesBetweenPositions(sourceFile, pos1, pos2) === 0;
     }
     ts.positionsAreOnSameLine = positionsAreOnSameLine;
-    function getStartPositionOfRange(range, sourceFile) {
-        return positionIsSynthesized(range.pos) ? -1 : ts.skipTrivia(sourceFile.text, range.pos);
+    function getStartPositionOfRange(range, sourceFile, includeComments) {
+        return positionIsSynthesized(range.pos) ? -1 : ts.skipTrivia(sourceFile.text, range.pos, /*stopAfterLineBreak*/ false, includeComments);
     }
     ts.getStartPositionOfRange = getStartPositionOfRange;
+    function getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter(pos, sourceFile, includeComments) {
+        var startPos = ts.skipTrivia(sourceFile.text, pos, /*stopAfterLineBreak*/ false, includeComments);
+        var prevPos = getPreviousNonWhitespacePosition(startPos, sourceFile);
+        return ts.getLinesBetweenPositions(sourceFile, prevPos || 0, startPos);
+    }
+    ts.getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter = getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter;
+    function getLinesBetweenPositionAndNextNonWhitespaceCharacter(pos, sourceFile, includeComments) {
+        var nextPos = ts.skipTrivia(sourceFile.text, pos, /*stopAfterLineBreak*/ false, includeComments);
+        return ts.getLinesBetweenPositions(sourceFile, pos, nextPos);
+    }
+    ts.getLinesBetweenPositionAndNextNonWhitespaceCharacter = getLinesBetweenPositionAndNextNonWhitespaceCharacter;
+    function getPreviousNonWhitespacePosition(pos, sourceFile) {
+        while (pos-- > 0) {
+            if (!ts.isWhiteSpaceLike(sourceFile.text.charCodeAt(pos))) {
+                return pos;
+            }
+        }
+    }
     /**
      * Determines whether a name was originally the declaration name of an enum or namespace
      * declaration.
@@ -22806,7 +22873,11 @@ var ts;
                         parseErrorAtRange(openingTag, ts.Diagnostics.JSX_fragment_has_no_corresponding_closing_tag);
                     }
                     else {
-                        parseErrorAtRange(openingTag.tagName, ts.Diagnostics.JSX_element_0_has_no_corresponding_closing_tag, ts.getTextOfNodeFromSourceText(sourceText, openingTag.tagName));
+                        // We want the error span to cover only 'Foo.Bar' in < Foo.Bar >
+                        // or to cover only 'Foo' in < Foo >
+                        var tag = openingTag.tagName;
+                        var start = ts.skipTrivia(sourceText, tag.pos);
+                        parseErrorAt(start, tag.end, ts.Diagnostics.JSX_element_0_has_no_corresponding_closing_tag, ts.getTextOfNodeFromSourceText(sourceText, openingTag.tagName));
                     }
                     return undefined;
                 case 30 /* LessThanSlashToken */:
@@ -35841,7 +35912,7 @@ var ts;
                 return true;
             }
             if (isUsedInFunctionOrInstanceProperty(usage, declaration, container)) {
-                if (compilerOptions.target === 99 /* ESNext */ && !!compilerOptions.useDefineForClassFields) {
+                if (compilerOptions.target === 99 /* ESNext */ && !!compilerOptions.useDefineForClassFields && ts.getContainingClass(declaration)) {
                     return (ts.isPropertyDeclaration(declaration) || ts.isParameterPropertyDeclaration(declaration, declaration.parent)) &&
                         !isPropertyImmediatelyReferencedWithinDeclaration(declaration, usage, /*stopAtAnyPropertyDeclaration*/ true);
                 }
@@ -37352,7 +37423,7 @@ var ts;
             return getPackagesSet().has(ts.getTypesPackageName(packageName));
         }
         function resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias) {
-            if (moduleSymbol) {
+            if (moduleSymbol === null || moduleSymbol === void 0 ? void 0 : moduleSymbol.exports) {
                 var exportEquals = resolveSymbol(moduleSymbol.exports.get("export=" /* ExportEquals */), dontResolveAlias);
                 var exported = getCommonJsExportEquals(getMergedSymbol(exportEquals), getMergedSymbol(moduleSymbol));
                 return getMergedSymbol(exported) || moduleSymbol;
@@ -38182,7 +38253,7 @@ var ts;
             var sourceFile = enclosingDeclaration && ts.getSourceFileOfNode(enclosingDeclaration);
             printer.writeNode(4 /* Unspecified */, typeNode, /*sourceFile*/ sourceFile, writer);
             var result = writer.getText();
-            var maxLength = noTruncation ? undefined : ts.defaultMaximumTruncationLength * 2;
+            var maxLength = noTruncation ? ts.noTruncationMaximumTruncationLength * 2 : ts.defaultMaximumTruncationLength * 2;
             if (maxLength && result && result.length >= maxLength) {
                 return result.substr(0, maxLength - "...".length) + "...";
             }
@@ -38243,9 +38314,13 @@ var ts;
                     tracker: tracker && tracker.trackSymbol ? tracker : { trackSymbol: ts.noop, moduleResolverHost: flags & 134217728 /* DoNotIncludeSymbolChain */ ? {
                             getCommonSourceDirectory: host.getCommonSourceDirectory ? function () { return host.getCommonSourceDirectory(); } : function () { return ""; },
                             getSourceFiles: function () { return host.getSourceFiles(); },
-                            getCurrentDirectory: ts.maybeBind(host, host.getCurrentDirectory),
+                            getCurrentDirectory: function () { return host.getCurrentDirectory(); },
                             getProbableSymlinks: ts.maybeBind(host, host.getProbableSymlinks),
-                            useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames)
+                            useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames),
+                            redirectTargetsMap: host.redirectTargetsMap,
+                            getProjectReferenceRedirect: function (fileName) { return host.getProjectReferenceRedirect(fileName); },
+                            isSourceOfProjectReferenceRedirect: function (fileName) { return host.isSourceOfProjectReferenceRedirect(fileName); },
+                            fileExists: function (fileName) { return host.fileExists(fileName); },
                         } : undefined },
                     encounteredError: false,
                     visitedTypes: undefined,
@@ -38259,7 +38334,7 @@ var ts;
             function checkTruncationLength(context) {
                 if (context.truncating)
                     return context.truncating;
-                return context.truncating = !(context.flags & 1 /* NoTruncation */) && context.approximateLength > ts.defaultMaximumTruncationLength;
+                return context.truncating = context.approximateLength > ((context.flags & 1 /* NoTruncation */) ? ts.noTruncationMaximumTruncationLength : ts.defaultMaximumTruncationLength);
             }
             function typeToTypeNodeHelper(type, context) {
                 if (cancellationToken && cancellationToken.throwIfCancellationRequested) {
@@ -39145,7 +39220,7 @@ var ts;
                     // specifier preference
                     var moduleResolverHost = context.tracker.moduleResolverHost;
                     var specifierCompilerOptions = isBundle_1 ? __assign(__assign({}, compilerOptions), { baseUrl: moduleResolverHost.getCommonSourceDirectory() }) : compilerOptions;
-                    specifier = ts.first(ts.moduleSpecifiers.getModuleSpecifiers(symbol, specifierCompilerOptions, contextFile, moduleResolverHost, host.getSourceFiles(), { importModuleSpecifierPreference: isBundle_1 ? "non-relative" : "relative" }, host.redirectTargetsMap));
+                    specifier = ts.first(ts.moduleSpecifiers.getModuleSpecifiers(symbol, specifierCompilerOptions, contextFile, moduleResolverHost, { importModuleSpecifierPreference: isBundle_1 ? "non-relative" : "relative" }));
                     links.specifierCache = links.specifierCache || ts.createMap();
                     links.specifierCache.set(contextFile.path, specifier);
                 }
@@ -40336,7 +40411,7 @@ var ts;
                                     var getCanonicalFileName = ts.createGetCanonicalFileName(!!host.useCaseSensitiveFileNames);
                                     var resolverHost = {
                                         getCanonicalFileName: getCanonicalFileName,
-                                        getCurrentDirectory: context.tracker.moduleResolverHost.getCurrentDirectory ? function () { return context.tracker.moduleResolverHost.getCurrentDirectory(); } : function () { return ""; },
+                                        getCurrentDirectory: function () { return context.tracker.moduleResolverHost.getCurrentDirectory(); },
                                         getCommonSourceDirectory: function () { return context.tracker.moduleResolverHost.getCommonSourceDirectory(); }
                                     };
                                     var newName = ts.getResolvedExternalModuleName(resolverHost, targetFile);
@@ -41081,7 +41156,7 @@ var ts;
                 // [Symbol.iterator] or next). This may be because we accessed properties from anyType,
                 // or it may have led to an error inside getElementTypeOfIterable.
                 var forOfStatement = declaration.parent.parent;
-                return checkRightHandSideOfForOf(forOfStatement.expression, forOfStatement.awaitModifier) || anyType;
+                return checkRightHandSideOfForOf(forOfStatement) || anyType;
             }
             if (ts.isBindingPattern(declaration.parent)) {
                 return getTypeForBindingElement(declaration);
@@ -44293,7 +44368,10 @@ var ts;
             return true;
         }
         function getSignatureOfTypeTag(node) {
-            var typeTag = ts.isInJSFile(node) ? ts.getJSDocTypeTag(node) : undefined;
+            // should be attached to a function declaration or expression
+            if (!(ts.isInJSFile(node) && ts.isFunctionLikeDeclaration(node)))
+                return undefined;
+            var typeTag = ts.getJSDocTypeTag(node);
             var signature = typeTag && typeTag.typeExpression && getSingleCallSignature(getTypeFromTypeNode(typeTag.typeExpression));
             return signature && getErasedSignature(signature);
         }
@@ -46307,65 +46385,89 @@ var ts;
             return type;
         }
         function getConditionalType(root, mapper) {
-            var checkType = instantiateType(root.checkType, mapper);
-            var extendsType = instantiateType(root.extendsType, mapper);
-            if (checkType === wildcardType || extendsType === wildcardType) {
-                return wildcardType;
+            var result;
+            var extraTypes;
+            var _loop_11 = function () {
+                var checkType = instantiateType(root.checkType, mapper);
+                var checkTypeInstantiable = isGenericObjectType(checkType) || isGenericIndexType(checkType);
+                var extendsType = instantiateType(root.extendsType, mapper);
+                if (checkType === wildcardType || extendsType === wildcardType) {
+                    return { value: wildcardType };
+                }
+                var combinedMapper = void 0;
+                if (root.inferTypeParameters) {
+                    var context = createInferenceContext(root.inferTypeParameters, /*signature*/ undefined, 0 /* None */);
+                    // We skip inference of the possible `infer` types unles the `extendsType` _is_ an infer type
+                    // if it was, it's trivial to say that extendsType = checkType, however such a pattern is used to
+                    // "reset" the type being build up during constraint calculation and avoid making an apparently "infinite" constraint
+                    // so in those cases we refain from performing inference and retain the uninfered type parameter
+                    if (!checkTypeInstantiable || !ts.some(root.inferTypeParameters, function (t) { return t === extendsType; })) {
+                        // We don't want inferences from constraints as they may cause us to eagerly resolve the
+                        // conditional type instead of deferring resolution. Also, we always want strict function
+                        // types rules (i.e. proper contravariance) for inferences.
+                        inferTypes(context.inferences, checkType, extendsType, 128 /* NoConstraints */ | 256 /* AlwaysStrict */);
+                    }
+                    combinedMapper = mergeTypeMappers(mapper, context.mapper);
+                }
+                // Instantiate the extends type including inferences for 'infer T' type parameters
+                var inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
+                // We attempt to resolve the conditional type only when the check and extends types are non-generic
+                if (!checkTypeInstantiable && !isGenericObjectType(inferredExtendsType) && !isGenericIndexType(inferredExtendsType)) {
+                    // Return falseType for a definitely false extends check. We check an instantiations of the two
+                    // types with type parameters mapped to the wildcard type, the most permissive instantiations
+                    // possible (the wildcard type is assignable to and from all types). If those are not related,
+                    // then no instantiations will be and we can just return the false branch type.
+                    if (!(inferredExtendsType.flags & 3 /* AnyOrUnknown */) && (checkType.flags & 1 /* Any */ || !isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType)))) {
+                        // Return union of trueType and falseType for 'any' since it matches anything
+                        if (checkType.flags & 1 /* Any */) {
+                            (extraTypes || (extraTypes = [])).push(instantiateTypeWithoutDepthIncrease(root.trueType, combinedMapper || mapper));
+                        }
+                        // If falseType is an immediately nested conditional type that isn't distributive or has an
+                        // identical checkType, switch to that type and loop.
+                        var falseType_1 = root.falseType;
+                        if (falseType_1.flags & 16777216 /* Conditional */) {
+                            var newRoot = falseType_1.root;
+                            if (newRoot.node.parent === root.node && (!newRoot.isDistributive || newRoot.checkType === root.checkType)) {
+                                root = newRoot;
+                                return "continue";
+                            }
+                        }
+                        result = instantiateTypeWithoutDepthIncrease(falseType_1, mapper);
+                        return "break";
+                    }
+                    // Return trueType for a definitely true extends check. We check instantiations of the two
+                    // types with type parameters mapped to their restrictive form, i.e. a form of the type parameter
+                    // that has no constraint. This ensures that, for example, the type
+                    //   type Foo<T extends { x: any }> = T extends { x: string } ? string : number
+                    // doesn't immediately resolve to 'string' instead of being deferred.
+                    if (inferredExtendsType.flags & 3 /* AnyOrUnknown */ || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(inferredExtendsType))) {
+                        result = instantiateTypeWithoutDepthIncrease(root.trueType, combinedMapper || mapper);
+                        return "break";
+                    }
+                }
+                // Return a deferred type for a check that is neither definitely true nor definitely false
+                var erasedCheckType = getActualTypeVariable(checkType);
+                result = createType(16777216 /* Conditional */);
+                result.root = root;
+                result.checkType = erasedCheckType;
+                result.extendsType = extendsType;
+                result.mapper = mapper;
+                result.combinedMapper = combinedMapper;
+                result.aliasSymbol = root.aliasSymbol;
+                result.aliasTypeArguments = instantiateTypes(root.aliasTypeArguments, mapper); // TODO: GH#18217
+                return "break";
+            };
+            // We loop here for an immediately nested conditional type in the false position, effectively treating
+            // types of the form 'A extends B ? X : C extends D ? Y : E extends F ? Z : ...' as a single construct for
+            // purposes of resolution. This means such types aren't subject to the instatiation depth limiter.
+            while (true) {
+                var state_4 = _loop_11();
+                if (typeof state_4 === "object")
+                    return state_4.value;
+                if (state_4 === "break")
+                    break;
             }
-            var checkTypeInstantiable = isGenericObjectType(checkType) || isGenericIndexType(checkType);
-            var combinedMapper;
-            if (root.inferTypeParameters) {
-                var context = createInferenceContext(root.inferTypeParameters, /*signature*/ undefined, 0 /* None */);
-                // We skip inference of the possible `infer` types unles the `extendsType` _is_ an infer type
-                // if it was, it's trivial to say that extendsType = checkType, however such a pattern is used to
-                // "reset" the type being build up during constraint calculation and avoid making an apparently "infinite" constraint
-                // so in those cases we refain from performing inference and retain the uninfered type parameter
-                if (!checkTypeInstantiable || !ts.some(root.inferTypeParameters, function (t) { return t === extendsType; })) {
-                    // We don't want inferences from constraints as they may cause us to eagerly resolve the
-                    // conditional type instead of deferring resolution. Also, we always want strict function
-                    // types rules (i.e. proper contravariance) for inferences.
-                    inferTypes(context.inferences, checkType, extendsType, 128 /* NoConstraints */ | 256 /* AlwaysStrict */);
-                }
-                combinedMapper = mergeTypeMappers(mapper, context.mapper);
-            }
-            // Instantiate the extends type including inferences for 'infer T' type parameters
-            var inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
-            // We attempt to resolve the conditional type only when the check and extends types are non-generic
-            if (!checkTypeInstantiable && !isGenericObjectType(inferredExtendsType) && !isGenericIndexType(inferredExtendsType)) {
-                if (inferredExtendsType.flags & 3 /* AnyOrUnknown */) {
-                    return instantiateType(root.trueType, combinedMapper || mapper);
-                }
-                // Return union of trueType and falseType for 'any' since it matches anything
-                if (checkType.flags & 1 /* Any */) {
-                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), instantiateType(root.falseType, mapper)]);
-                }
-                // Return falseType for a definitely false extends check. We check an instantiations of the two
-                // types with type parameters mapped to the wildcard type, the most permissive instantiations
-                // possible (the wildcard type is assignable to and from all types). If those are not related,
-                // then no instantiations will be and we can just return the false branch type.
-                if (!isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType))) {
-                    return instantiateType(root.falseType, mapper);
-                }
-                // Return trueType for a definitely true extends check. We check instantiations of the two
-                // types with type parameters mapped to their restrictive form, i.e. a form of the type parameter
-                // that has no constraint. This ensures that, for example, the type
-                //   type Foo<T extends { x: any }> = T extends { x: string } ? string : number
-                // doesn't immediately resolve to 'string' instead of being deferred.
-                if (isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(inferredExtendsType))) {
-                    return instantiateType(root.trueType, combinedMapper || mapper);
-                }
-            }
-            // Return a deferred type for a check that is neither definitely true nor definitely false
-            var erasedCheckType = getActualTypeVariable(checkType);
-            var result = createType(16777216 /* Conditional */);
-            result.root = root;
-            result.checkType = erasedCheckType;
-            result.extendsType = extendsType;
-            result.mapper = mapper;
-            result.combinedMapper = combinedMapper;
-            result.aliasSymbol = root.aliasSymbol;
-            result.aliasTypeArguments = instantiateTypes(root.aliasTypeArguments, mapper); // TODO: GH#18217
-            return result;
+            return extraTypes ? getUnionType(ts.append(extraTypes, result)) : result;
         }
         function getTrueTypeFromConditionalType(type) {
             return type.resolvedTrueType || (type.resolvedTrueType = instantiateType(type.root.trueType, type.mapper));
@@ -47253,6 +47355,16 @@ var ts;
             instantiationDepth--;
             return result;
         }
+        /**
+         * This can be used to avoid the penalty on instantiation depth for types which result from immediate
+         * simplification. It essentially removes the depth increase done in `instantiateType`.
+         */
+        function instantiateTypeWithoutDepthIncrease(type, mapper) {
+            instantiationDepth--;
+            var result = instantiateType(type, mapper);
+            instantiationDepth++;
+            return result;
+        }
         function instantiateTypeWorker(type, mapper) {
             var _a;
             var flags = type.flags;
@@ -48738,7 +48850,7 @@ var ts;
                     reducedTarget = findMatchingDiscriminantType(source, target, isRelatedTo) || filterPrimitivesIfContainsNonPrimitive(target);
                     checkTypes = reducedTarget.flags & 1048576 /* Union */ ? reducedTarget.types : [reducedTarget];
                 }
-                var _loop_11 = function (prop) {
+                var _loop_12 = function (prop) {
                     if (shouldCheckAsExcessProperty(prop, source.symbol) && !isIgnoredJsxProperty(source, prop)) {
                         if (!isKnownProperty(reducedTarget, prop.escapedName, isComparingJsxAttributes)) {
                             if (reportErrors) {
@@ -48794,9 +48906,9 @@ var ts;
                 };
                 for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    var state_4 = _loop_11(prop);
-                    if (typeof state_4 === "object")
-                        return state_4.value;
+                    var state_5 = _loop_12(prop);
+                    if (typeof state_5 === "object")
+                        return state_5.value;
                 }
                 return false;
             }
@@ -49232,6 +49344,8 @@ var ts;
                         }
                     }
                     else {
+                        // conditionals aren't related to one another via distributive constraint as it is much too inaccurate and allows way
+                        // more assignments than are desirable (since it maps the source check type to its constraint, it loses information)
                         var distributiveConstraint = getConstraintOfDistributiveConditionalType(source);
                         if (distributiveConstraint) {
                             if (result = isRelatedTo(distributiveConstraint, target, reportErrors)) {
@@ -49239,12 +49353,14 @@ var ts;
                                 return result;
                             }
                         }
-                        var defaultConstraint = getDefaultConstraintOfConditionalType(source);
-                        if (defaultConstraint) {
-                            if (result = isRelatedTo(defaultConstraint, target, reportErrors)) {
-                                resetErrorInfo(saveErrorInfo);
-                                return result;
-                            }
+                    }
+                    // conditionals _can_ be related to one another via normal constraint, as, eg, `A extends B ? O : never` should be assignable to `O`
+                    // when `O` is a conditional (`never` is trivially aissgnable to `O`, as is `O`!).
+                    var defaultConstraint = getDefaultConstraintOfConditionalType(source);
+                    if (defaultConstraint) {
+                        if (result = isRelatedTo(defaultConstraint, target, reportErrors)) {
+                            resetErrorInfo(saveErrorInfo);
+                            return result;
                         }
                     }
                 }
@@ -49473,11 +49589,11 @@ var ts;
                 // constituents of 'target'. If any combination does not have a match then 'source' is not relatable.
                 var discriminantCombinations = ts.cartesianProduct(sourceDiscriminantTypes);
                 var matchingTypes = [];
-                var _loop_12 = function (combination) {
+                var _loop_13 = function (combination) {
                     var hasMatch = false;
                     outer: for (var _i = 0, _a = target.types; _i < _a.length; _i++) {
                         var type = _a[_i];
-                        var _loop_13 = function (i) {
+                        var _loop_14 = function (i) {
                             var sourceProperty = sourcePropertiesFiltered[i];
                             var targetProperty = getPropertyOfType(type, sourceProperty.escapedName);
                             if (!targetProperty)
@@ -49493,8 +49609,8 @@ var ts;
                             }
                         };
                         for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
-                            var state_6 = _loop_13(i);
-                            switch (state_6) {
+                            var state_7 = _loop_14(i);
+                            switch (state_7) {
                                 case "continue-outer": continue outer;
                             }
                         }
@@ -49507,9 +49623,9 @@ var ts;
                 };
                 for (var _a = 0, discriminantCombinations_1 = discriminantCombinations; _a < discriminantCombinations_1.length; _a++) {
                     var combination = discriminantCombinations_1[_a];
-                    var state_5 = _loop_12(combination);
-                    if (typeof state_5 === "object")
-                        return state_5.value;
+                    var state_6 = _loop_13(combination);
+                    if (typeof state_6 === "object")
+                        return state_6.value;
                 }
                 // Compare the remaining non-discriminant properties of each match.
                 var result = -1 /* True */;
@@ -50094,7 +50210,7 @@ var ts;
                 // The emptyArray singleton is used to signal a recursive invocation.
                 cache.variances = ts.emptyArray;
                 variances = [];
-                var _loop_14 = function (tp) {
+                var _loop_15 = function (tp) {
                     var unmeasurable = false;
                     var unreliable = false;
                     var oldHandler = outofbandVarianceMarkerHandler;
@@ -50124,7 +50240,7 @@ var ts;
                 };
                 for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
                     var tp = typeParameters_1[_i];
-                    _loop_14(tp);
+                    _loop_15(tp);
                 }
                 cache.variances = variances;
             }
@@ -51232,7 +51348,7 @@ var ts;
         function inferTypes(inferences, originalSource, originalTarget, priority, contravariant) {
             if (priority === void 0) { priority = 0; }
             if (contravariant === void 0) { contravariant = false; }
-            var symbolStack;
+            var symbolOrTypeStack;
             var visited;
             var bivariant = false;
             var propagationType;
@@ -51411,8 +51527,8 @@ var ts;
                     priority = savePriority;
                 }
                 else if (target.flags & 134217728 /* Awaited */) {
-                    var targetTypes = [target.awaitedType, createPromiseLikeType(target.awaitedType)];
-                    inferToMultipleTypes(source, targetTypes, target.flags);
+                    inferFromTypes(source, target.awaitedType);
+                    inferFromTypes(source, createPromiseLikeType(target.awaitedType));
                 }
                 else if (target.flags & 3145728 /* UnionOrIntersection */) {
                     inferToMultipleTypes(source, target.types, target.flags);
@@ -51539,10 +51655,34 @@ var ts;
                 }
                 return typeVariable;
             }
+            function isPromiseForType(promiseType, promisedType) {
+                var _a;
+                return isThenableType(promiseType) && unwrapAwaitedType((_a = getPromisedTypeOfPromise(promiseType)) !== null && _a !== void 0 ? _a : errorType) === promisedType;
+            }
             function inferToMultipleTypes(source, targets, targetFlags) {
                 var typeVariableCount = 0;
                 if (targetFlags & 1048576 /* Union */) {
                     var nakedTypeVariable = void 0;
+                    for (var _i = 0, targets_2 = targets; _i < targets_2.length; _i++) {
+                        var t = targets_2[_i];
+                        if (getInferenceInfoForType(t)) {
+                            nakedTypeVariable = t;
+                            typeVariableCount++;
+                        }
+                    }
+                    // To better support backwards compatibility with the new `awaited` type, we detect a target
+                    // union of exactly `T | PromiseLike<T>` (for any compatible `PromiseLike`). When encountered,
+                    // we infer from source to the type parameter `T`, where each type of source is mapped to extract
+                    // the promised type of any promise (e.g., `string | Promise<number>` becomes `string | number`).
+                    if (typeVariableCount === 1 && targets.length === 2) {
+                        for (var _a = 0, targets_3 = targets; _a < targets_3.length; _a++) {
+                            var t = targets_3[_a];
+                            if (!getInferenceInfoForType(t) && isPromiseForType(t, nakedTypeVariable)) {
+                                inferFromTypes(mapType(source, function (s) { var _a; return (_a = getPromisedTypeOfPromise(s)) !== null && _a !== void 0 ? _a : s; }), nakedTypeVariable);
+                                return;
+                            }
+                        }
+                    }
                     var sources = source.flags & 1048576 /* Union */ ? source.types : [source];
                     var matched_1 = new Array(sources.length);
                     var inferenceCircularity = false;
@@ -51550,13 +51690,9 @@ var ts;
                     // track whether inferences were made from that particular type to some target with
                     // equal priority (i.e. of equal quality) to what we would infer for a naked type
                     // parameter.
-                    for (var _i = 0, targets_2 = targets; _i < targets_2.length; _i++) {
-                        var t = targets_2[_i];
-                        if (getInferenceInfoForType(t)) {
-                            nakedTypeVariable = t;
-                            typeVariableCount++;
-                        }
-                        else {
+                    for (var _b = 0, targets_4 = targets; _b < targets_4.length; _b++) {
+                        var t = targets_4[_b];
+                        if (!getInferenceInfoForType(t)) {
                             for (var i = 0; i < sources.length; i++) {
                                 var saveInferencePriority = inferencePriority;
                                 inferencePriority = 512 /* MaxValue */;
@@ -51594,8 +51730,8 @@ var ts;
                     // We infer from types that are not naked type variables first so that inferences we
                     // make from nested naked type variables and given slightly higher priority by virtue
                     // of being first in the candidates array.
-                    for (var _a = 0, targets_3 = targets; _a < targets_3.length; _a++) {
-                        var t = targets_3[_a];
+                    for (var _c = 0, targets_5 = targets; _c < targets_5.length; _c++) {
+                        var t = targets_5[_c];
                         if (getInferenceInfoForType(t)) {
                             typeVariableCount++;
                         }
@@ -51609,8 +51745,8 @@ var ts;
                 // we want to infer string for T, not Promise<string> | string. For intersection types
                 // we only infer to single naked type variables.
                 if (targetFlags & 2097152 /* Intersection */ ? typeVariableCount === 1 : typeVariableCount > 0) {
-                    for (var _b = 0, targets_4 = targets; _b < targets_4.length; _b++) {
-                        var t = targets_4[_b];
+                    for (var _d = 0, targets_6 = targets; _d < targets_6.length; _d++) {
+                        var t = targets_6[_d];
                         if (getInferenceInfoForType(t)) {
                             inferWithPriority(source, t, 1 /* NakedTypeVariable */);
                         }
@@ -51675,15 +51811,15 @@ var ts;
                 // its symbol with the instance side which would lead to false positives.
                 var isNonConstructorObject = target.flags & 524288 /* Object */ &&
                     !(ts.getObjectFlags(target) & 16 /* Anonymous */ && target.symbol && target.symbol.flags & 32 /* Class */);
-                var symbol = isNonConstructorObject ? target.symbol : undefined;
-                if (symbol) {
-                    if (ts.contains(symbolStack, symbol)) {
+                var symbolOrType = isNonConstructorObject ? isTupleType(target) ? target.target : target.symbol : undefined;
+                if (symbolOrType) {
+                    if (ts.contains(symbolOrTypeStack, symbolOrType)) {
                         inferencePriority = -1 /* Circularity */;
                         return;
                     }
-                    (symbolStack || (symbolStack = [])).push(symbol);
+                    (symbolOrTypeStack || (symbolOrTypeStack = [])).push(symbolOrType);
                     inferFromObjectTypesWorker(source, target);
-                    symbolStack.pop();
+                    symbolOrTypeStack.pop();
                 }
                 else {
                     inferFromObjectTypesWorker(source, target);
@@ -52012,6 +52148,12 @@ var ts;
             }
             return false;
         }
+        // Given a source x, check if target matches x or is an && operation with an operand that matches x.
+        function containsTruthyCheck(source, target) {
+            return isMatchingReference(source, target) ||
+                (target.kind === 210 /* BinaryExpression */ && target.operatorToken.kind === 55 /* AmpersandAmpersandToken */ &&
+                    (containsTruthyCheck(source, target.left) || containsTruthyCheck(source, target.right)));
+        }
         function getAccessedPropertyName(access) {
             return access.kind === 195 /* PropertyAccessExpression */ ? access.name.escapedText :
                 ts.isStringOrNumericLiteralLike(access.argumentExpression) ? ts.escapeLeadingUnderscores(access.argumentExpression.text) :
@@ -52258,7 +52400,7 @@ var ts;
                 case 232 /* ForInStatement */:
                     return stringType;
                 case 233 /* ForOfStatement */:
-                    return checkRightHandSideOfForOf(parent.expression, parent.awaitModifier) || errorType;
+                    return checkRightHandSideOfForOf(parent) || errorType;
                 case 210 /* BinaryExpression */:
                     return getAssignedTypeOfBinaryExpression(parent);
                 case 204 /* DeleteExpression */:
@@ -52299,7 +52441,7 @@ var ts;
                 return stringType;
             }
             if (node.parent.parent.kind === 233 /* ForOfStatement */) {
-                return checkRightHandSideOfForOf(node.parent.parent.expression, node.parent.parent.awaitModifier) || errorType;
+                return checkRightHandSideOfForOf(node.parent.parent) || errorType;
             }
             return errorType;
         }
@@ -52531,20 +52673,29 @@ var ts;
             return isLengthPushOrUnshift || isElementAssignment;
         }
         function isDeclarationWithExplicitTypeAnnotation(declaration) {
-            return !!(declaration && (declaration.kind === 243 /* VariableDeclaration */ || declaration.kind === 157 /* Parameter */ ||
+            return (declaration.kind === 243 /* VariableDeclaration */ || declaration.kind === 157 /* Parameter */ ||
                 declaration.kind === 160 /* PropertyDeclaration */ || declaration.kind === 159 /* PropertySignature */) &&
-                ts.getEffectiveTypeAnnotationNode(declaration));
+                !!ts.getEffectiveTypeAnnotationNode(declaration);
         }
         function getExplicitTypeOfSymbol(symbol, diagnostic) {
             if (symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 512 /* ValueModule */)) {
                 return getTypeOfSymbol(symbol);
             }
             if (symbol.flags & (3 /* Variable */ | 4 /* Property */)) {
-                if (isDeclarationWithExplicitTypeAnnotation(symbol.valueDeclaration)) {
-                    return getTypeOfSymbol(symbol);
-                }
-                if (diagnostic && symbol.valueDeclaration) {
-                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(symbol.valueDeclaration, ts.Diagnostics._0_needs_an_explicit_type_annotation, symbolToString(symbol)));
+                var declaration = symbol.valueDeclaration;
+                if (declaration) {
+                    if (isDeclarationWithExplicitTypeAnnotation(declaration)) {
+                        return getTypeOfSymbol(symbol);
+                    }
+                    if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 233 /* ForOfStatement */) {
+                        var expressionType = getTypeOfDottedName(declaration.parent.parent.expression, /*diagnostic*/ undefined);
+                        if (expressionType) {
+                            return getForOfIterationType(declaration.parent.parent, expressionType);
+                        }
+                    }
+                    if (diagnostic) {
+                        ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(declaration, ts.Diagnostics._0_needs_an_explicit_type_annotation, symbolToString(symbol)));
+                    }
                 }
             }
         }
@@ -53309,14 +53460,22 @@ var ts;
                 if (type.flags & 1 /* Any */ && literal.text === "function") {
                     return type;
                 }
+                if (assumeTrue && type.flags & 2 /* Unknown */ && literal.text === "object") {
+                    // The pattern x && typeof x === 'object', where x is of type unknown, narrows x to type object. We don't
+                    // need to check for the reverse typeof x === 'object' && x since that already narrows correctly.
+                    if (typeOfExpr.parent.parent.kind === 210 /* BinaryExpression */) {
+                        var expr = typeOfExpr.parent.parent;
+                        if (expr.operatorToken.kind === 55 /* AmpersandAmpersandToken */ && expr.right === typeOfExpr.parent && containsTruthyCheck(reference, expr.left)) {
+                            return nonPrimitiveType;
+                        }
+                    }
+                    return getUnionType([nonPrimitiveType, nullType]);
+                }
                 var facts = assumeTrue ?
                     typeofEQFacts.get(literal.text) || 128 /* TypeofEQHostObject */ :
                     typeofNEFacts.get(literal.text) || 32768 /* TypeofNEHostObject */;
                 return getTypeWithFacts(assumeTrue ? mapType(type, narrowTypeForTypeof) : type, facts);
                 function narrowTypeForTypeof(type) {
-                    if (type.flags & 2 /* Unknown */ && literal.text === "object") {
-                        return getUnionType([nonPrimitiveType, nullType]);
-                    }
                     // 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.
@@ -53591,7 +53750,10 @@ var ts;
                         }
                         if (strictNullChecks && assumeTrue && optionalChainContainsReference(predicateArgument, reference) &&
                             !(getTypeFacts(predicate.type) & 65536 /* EQUndefined */)) {
-                            return getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
+                            type = getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
+                        }
+                        if (isMatchingReferenceDiscriminant(predicateArgument, declaredType)) {
+                            return narrowTypeByDiscriminant(type, predicateArgument, function (t) { return getNarrowedType(t, predicate.type, assumeTrue, isTypeSubtypeOf); });
                         }
                     }
                 }
@@ -55473,8 +55635,8 @@ var ts;
             var inDestructuringPattern = ts.isAssignmentTarget(node);
             // Grammar checking
             checkGrammarObjectLiteralExpression(node, inDestructuringPattern);
-            var propertiesTable;
-            var allPropertiesTable = ts.createSymbolTable();
+            var allPropertiesTable = strictNullChecks ? ts.createSymbolTable() : undefined;
+            var propertiesTable = ts.createSymbolTable();
             var propertiesArray = [];
             var spread = emptyObjectType;
             var contextualType = getApparentTypeOfContextualType(node);
@@ -55489,7 +55651,6 @@ var ts;
             var patternWithComputedProperties = false;
             var hasComputedStringProperty = false;
             var hasComputedNumberProperty = false;
-            propertiesTable = ts.createSymbolTable();
             var offset = 0;
             for (var i = 0; i < node.properties.length; i++) {
                 var memberDecl = node.properties[i];
@@ -55548,7 +55709,7 @@ var ts;
                     prop.type = type;
                     prop.target = member;
                     member = prop;
-                    allPropertiesTable.set(prop.escapedName, prop);
+                    allPropertiesTable === null || allPropertiesTable === void 0 ? void 0 : allPropertiesTable.set(prop.escapedName, prop);
                 }
                 else if (memberDecl.kind === 284 /* SpreadAssignment */) {
                     if (languageVersion < 2 /* ES2015 */) {
@@ -55566,15 +55727,8 @@ var ts;
                         error(memberDecl, ts.Diagnostics.Spread_types_may_only_be_created_from_object_types);
                         return errorType;
                     }
-                    for (var _i = 0, _a = getPropertiesOfType(type); _i < _a.length; _i++) {
-                        var right = _a[_i];
-                        var rightType = getTypeOfSymbol(right);
-                        var left = allPropertiesTable.get(right.escapedName);
-                        if (strictNullChecks &&
-                            left &&
-                            !maybeTypeOfKind(rightType, 98304 /* Nullable */)) {
-                            error(left.valueDeclaration, ts.Diagnostics._0_is_specified_more_than_once_so_this_usage_will_be_overwritten, ts.unescapeLeadingUnderscores(left.escapedName));
-                        }
+                    if (allPropertiesTable) {
+                        checkSpreadPropOverrides(type, allPropertiesTable, memberDecl);
                     }
                     spread = getSpreadType(spread, type, node.symbol, objectFlags, inConstContext);
                     offset = i + 1;
@@ -55612,8 +55766,8 @@ var ts;
             // If the object literal is spread into another object literal, skip this step and let the top-level object
             // literal handle it instead.
             if (contextualTypeHasPattern && node.parent.kind !== 284 /* SpreadAssignment */) {
-                for (var _b = 0, _c = getPropertiesOfType(contextualType); _b < _c.length; _b++) {
-                    var prop = _c[_b];
+                for (var _i = 0, _a = getPropertiesOfType(contextualType); _i < _a.length; _i++) {
+                    var prop = _a[_i];
                     if (!propertiesTable.get(prop.escapedName) && !getPropertyOfType(spread, prop.escapedName)) {
                         if (!(prop.flags & 16777216 /* Optional */)) {
                             error(prop.valueDeclaration || prop.bindingElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
@@ -55726,6 +55880,7 @@ var ts;
          */
         function createJsxAttributesTypeFromAttributesProperty(openingLikeElement, checkMode) {
             var attributes = openingLikeElement.attributes;
+            var allAttributesTable = strictNullChecks ? ts.createSymbolTable() : undefined;
             var attributesTable = ts.createSymbolTable();
             var spread = emptyJsxObjectType;
             var hasSpreadAnyType = false;
@@ -55748,6 +55903,7 @@ var ts;
                     attributeSymbol.type = exprType;
                     attributeSymbol.target = member;
                     attributesTable.set(attributeSymbol.escapedName, attributeSymbol);
+                    allAttributesTable === null || allAttributesTable === void 0 ? void 0 : allAttributesTable.set(attributeSymbol.escapedName, attributeSymbol);
                     if (attributeDecl.name.escapedText === jsxChildrenPropertyName) {
                         explicitlySpecifyChildrenAttribute = true;
                     }
@@ -55764,6 +55920,9 @@ var ts;
                     }
                     if (isValidSpreadType(exprType)) {
                         spread = getSpreadType(spread, exprType, attributes.symbol, objectFlags, /*readonly*/ false);
+                        if (allAttributesTable) {
+                            checkSpreadPropOverrides(exprType, allAttributesTable, attributeDecl);
+                        }
                     }
                     else {
                         typeToIntersect = typeToIntersect ? getIntersectionType([typeToIntersect, exprType]) : exprType;
@@ -55839,6 +55998,16 @@ var ts;
             }
             return childrenTypes;
         }
+        function checkSpreadPropOverrides(type, props, spread) {
+            for (var _i = 0, _a = getPropertiesOfType(type); _i < _a.length; _i++) {
+                var right = _a[_i];
+                var left = props.get(right.escapedName);
+                if (left && !maybeTypeOfKind(getTypeOfSymbol(right), 98304 /* Nullable */)) {
+                    var diagnostic = error(left.valueDeclaration, ts.Diagnostics._0_is_specified_more_than_once_so_this_usage_will_be_overwritten, ts.unescapeLeadingUnderscores(left.escapedName));
+                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(spread, ts.Diagnostics.This_spread_always_overwrites_this_property));
+                }
+            }
+        }
         /**
          * Check attributes property of opening-like element. This function is called during chooseOverload to get call signature of a JSX opening-like element.
          * (See "checkApplicableSignatureForJsxOpeningLikeElement" for how the function is used)
@@ -57750,7 +57919,7 @@ var ts;
                         var min_3 = Number.MAX_VALUE;
                         var minIndex = 0;
                         var i_1 = 0;
-                        var _loop_15 = function (c) {
+                        var _loop_16 = function (c) {
                             var chain_2 = function () { return ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Overload_0_of_1_2_gave_the_following_error, i_1 + 1, candidates.length, signatureToString(c)); };
                             var diags_2 = getSignatureApplicabilityError(node, args, c, assignableRelation, 0 /* Normal */, /*reportErrors*/ true, chain_2);
                             if (diags_2) {
@@ -57768,7 +57937,7 @@ var ts;
                         };
                         for (var _a = 0, candidatesForArgumentError_1 = candidatesForArgumentError; _a < candidatesForArgumentError_1.length; _a++) {
                             var c = candidatesForArgumentError_1[_a];
-                            _loop_15(c);
+                            _loop_16(c);
                         }
                         var diags_3 = max > 1 ? allDiagnostics[minIndex] : ts.flatten(allDiagnostics);
                         ts.Debug.assert(diags_3.length > 0, "No errors reported for 3 or fewer overload signatures");
@@ -57902,7 +58071,7 @@ var ts;
             }
             var _a = ts.minAndMax(candidates, getNumNonRestParameters), minArgumentCount = _a.min, maxNonRestParam = _a.max;
             var parameters = [];
-            var _loop_16 = function (i) {
+            var _loop_17 = function (i) {
                 var symbols = ts.mapDefined(candidates, function (s) { return signatureHasRestParameter(s) ?
                     i < s.parameters.length - 1 ? s.parameters[i] : ts.last(s.parameters) :
                     i < s.parameters.length ? s.parameters[i] : undefined; });
@@ -57910,7 +58079,7 @@ var ts;
                 parameters.push(createCombinedSymbolFromTypes(symbols, ts.mapDefined(candidates, function (candidate) { return tryGetTypeAtPosition(candidate, i); })));
             };
             for (var i = 0; i < maxNonRestParam; i++) {
-                _loop_16(i);
+                _loop_17(i);
             }
             var restParameterSymbols = ts.mapDefined(candidates, function (c) { return signatureHasRestParameter(c) ? ts.last(c.parameters) : undefined; });
             var flags = 0 /* None */;
@@ -59016,7 +59185,7 @@ var ts;
             var globalPromiseType = getGlobalPromiseType(/*reportErrors*/ true);
             if (globalPromiseType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || unknownType;
+                promisedType = unwrapAwaitedType(getAwaitedType(promisedType) || unknownType);
                 return createTypeReference(globalPromiseType, [promisedType]);
             }
             return unknownType;
@@ -59026,7 +59195,7 @@ var ts;
             var globalPromiseLikeType = getGlobalPromiseLikeType(/*reportErrors*/ true);
             if (globalPromiseLikeType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || unknownType;
+                promisedType = unwrapAwaitedType(getAwaitedType(promisedType) || unknownType);
                 return createTypeReference(globalPromiseLikeType, [promisedType]);
             }
             return unknownType;
@@ -61081,6 +61250,9 @@ var ts;
                 if (!(func.kind === 163 /* Constructor */ && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
+                if (func.kind === 163 /* Constructor */ && ts.isIdentifier(node.name) && node.name.escapedText === "constructor") {
+                    error(node.name, ts.Diagnostics.constructor_cannot_be_used_as_a_parameter_property_name);
+                }
             }
             if (node.questionToken && ts.isBindingPattern(node.name) && func.body) {
                 error(node, ts.Diagnostics.A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature);
@@ -62200,6 +62372,9 @@ var ts;
          *   - The type has no base constraint,
          *   - OR The base constraint of the type is `any`, `unknown`, `object`, or the empty object `{}`,
          *   - OR The base constraint has a callable `then` member.
+         * This behavior is not entirely sound, as a `T extends { x: any }` could be instantiated with a
+         * subtype that has a callable `then`, however this is unlikely in practice and this slightly more unsound
+         * behavior is much more developer friendly.
          */
         function isGenericAwaitableType(type) {
             if (isGenericObjectType(type)) {
@@ -63560,7 +63735,7 @@ var ts;
             }
             else {
                 var varExpr = node.initializer;
-                var iteratedType = checkRightHandSideOfForOf(node.expression, node.awaitModifier);
+                var iteratedType = checkRightHandSideOfForOf(node);
                 // There may be a destructuring assignment on the left side
                 if (varExpr.kind === 193 /* ArrayLiteralExpression */ || varExpr.kind === 194 /* ObjectLiteralExpression */) {
                     // iteratedType may be undefined. In this case, we still want to check the structure of
@@ -63637,10 +63812,12 @@ var ts;
                 checkVariableDeclaration(decl);
             }
         }
-        function checkRightHandSideOfForOf(rhsExpression, awaitModifier) {
-            var expressionType = checkNonNullExpression(rhsExpression);
-            var use = awaitModifier ? 15 /* ForAwaitOf */ : 13 /* ForOf */;
-            return checkIteratedTypeOrElementType(use, expressionType, undefinedType, rhsExpression);
+        function checkRightHandSideOfForOf(statement) {
+            return getForOfIterationType(statement, checkNonNullExpression(statement.expression));
+        }
+        function getForOfIterationType(statement, expressionType) {
+            var use = statement.awaitModifier ? 15 /* ForAwaitOf */ : 13 /* ForOf */;
+            return checkIteratedTypeOrElementType(use, expressionType, undefinedType, statement.expression);
         }
         function checkIteratedTypeOrElementType(use, inputType, sentType, errorNode) {
             if (isTypeAny(inputType)) {
@@ -64760,7 +64937,7 @@ var ts;
         function issueMemberSpecificError(node, typeWithThis, baseWithThis, broadDiag) {
             // iterate over all implemented properties and issue errors on each one which isn't compatible, rather than the class as a whole, if possible
             var issuedMemberError = false;
-            var _loop_17 = function (member) {
+            var _loop_18 = function (member) {
                 if (ts.hasStaticModifier(member)) {
                     return "continue";
                 }
@@ -64779,7 +64956,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_17(member);
+                _loop_18(member);
             }
             if (!issuedMemberError) {
                 // check again with diagnostics to generate a less-specific error
@@ -66676,7 +66853,7 @@ var ts;
             //     for ( { a } of elems) {
             //     }
             if (expr.parent.kind === 233 /* ForOfStatement */) {
-                var iteratedType = checkRightHandSideOfForOf(expr.parent.expression, expr.parent.awaitModifier);
+                var iteratedType = checkRightHandSideOfForOf(expr.parent);
                 return checkDestructuringAssignment(expr, iteratedType || errorType);
             }
             // If this is from "for" initializer
@@ -71294,6 +71471,11 @@ var ts;
     }
     ts.createJSDocParamTag = createJSDocParamTag;
     /* @internal */
+    function createJSDocClassTag() {
+        return createJSDocTag(311 /* JSDocClassTag */, "class");
+    }
+    ts.createJSDocClassTag = createJSDocClassTag;
+    /* @internal */
     function createJSDocComment(comment, tags) {
         var node = createSynthesizedNode(304 /* JSDocComment */);
         node.comment = comment;
@@ -72312,6 +72494,12 @@ var ts;
         return node;
     }
     ts.moveSyntheticComments = moveSyntheticComments;
+    /** @internal */
+    function ignoreSourceNewlines(node) {
+        getOrCreateEmitNode(node).flags |= 134217728 /* IgnoreSourceNewlines */;
+        return node;
+    }
+    ts.ignoreSourceNewlines = ignoreSourceNewlines;
     /**
      * Gets the constant value to emit for an expression.
      */
@@ -91922,8 +92110,8 @@ var ts;
                         declFileName = paths.declarationFilePath || paths.jsFilePath || file.fileName;
                     }
                     if (declFileName) {
-                        var specifier = ts.moduleSpecifiers.getModuleSpecifier(__assign(__assign({}, options), { baseUrl: options.baseUrl && ts.toPath(options.baseUrl, host.getCurrentDirectory(), host.getCanonicalFileName) }), currentSourceFile, ts.toPath(outputFilePath, host.getCurrentDirectory(), host.getCanonicalFileName), ts.toPath(declFileName, host.getCurrentDirectory(), host.getCanonicalFileName), host, host.getSourceFiles(), 
-                        /*preferences*/ undefined, host.redirectTargetsMap);
+                        var specifier = ts.moduleSpecifiers.getModuleSpecifier(__assign(__assign({}, options), { baseUrl: options.baseUrl && ts.toPath(options.baseUrl, host.getCurrentDirectory(), host.getCanonicalFileName) }), currentSourceFile, ts.toPath(outputFilePath, host.getCurrentDirectory(), host.getCanonicalFileName), ts.toPath(declFileName, host.getCurrentDirectory(), host.getCanonicalFileName), host, 
+                        /*preferences*/ undefined);
                         if (!ts.pathIsRelative(specifier)) {
                             // If some compiler option/symlink/whatever allows access to the file containing the ambient module declaration
                             // via a non-relative name, emit a type reference directive to that non-relative name, rather than
@@ -91938,7 +92126,7 @@ var ts;
                         }
                         // omit references to files from node_modules (npm may disambiguate module
                         // references when installing this package, making the path is unreliable).
-                        if (ts.startsWith(fileName, "node_modules/") || fileName.indexOf("/node_modules/") !== -1) {
+                        if (ts.startsWith(fileName, "node_modules/") || ts.pathContainsNodeModules(fileName)) {
                             return;
                         }
                         references.push({ pos: -1, end: -1, fileName: fileName });
@@ -93977,6 +94165,7 @@ var ts;
             getLibFileFromReference: ts.notImplemented,
             isSourceFileFromExternalLibrary: ts.returnFalse,
             getResolvedProjectReferenceToRedirect: ts.returnUndefined,
+            getProjectReferenceRedirect: ts.returnUndefined,
             isSourceOfProjectReferenceRedirect: ts.returnFalse,
             writeFile: function (name, text, writeByteOrderMark) {
                 switch (name) {
@@ -94016,7 +94205,6 @@ var ts;
             isEmitBlocked: ts.returnFalse,
             readFile: function (f) { return host.readFile(f); },
             fileExists: function (f) { return host.fileExists(f); },
-            directoryExists: host.directoryExists && (function (f) { return host.directoryExists(f); }),
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
             getProgramBuildInfo: ts.returnUndefined,
             getSourceFileFromReference: ts.returnUndefined,
@@ -94051,6 +94239,7 @@ var ts;
         var tempFlags; // TempFlags for the current name generation scope.
         var reservedNamesStack; // Stack of TempFlags reserved in enclosing name generation scopes.
         var reservedNames; // TempFlags to reserve in nested name generation scopes.
+        var preserveSourceNewlines = printerOptions.preserveSourceNewlines; // Can be overridden inside nodes with the `IgnoreSourceNewlines` emit flag.
         var writer;
         var ownWriter; // Reusable `EmitTextWriter` for basic printing.
         var write = writeBase;
@@ -94333,14 +94522,19 @@ var ts;
         function pipelineEmit(emitHint, node) {
             var savedLastNode = lastNode;
             var savedLastSubstitution = lastSubstitution;
+            var savedPreserveSourceNewlines = preserveSourceNewlines;
             lastNode = node;
             lastSubstitution = undefined;
+            if (preserveSourceNewlines && !!(ts.getEmitFlags(node) & 134217728 /* IgnoreSourceNewlines */)) {
+                preserveSourceNewlines = false;
+            }
             var pipelinePhase = getPipelinePhase(0 /* Notification */, emitHint, node);
             pipelinePhase(emitHint, node);
             ts.Debug.assert(lastNode === node);
             var substitute = lastSubstitution;
             lastNode = savedLastNode;
             lastSubstitution = savedLastSubstitution;
+            preserveSourceNewlines = savedPreserveSourceNewlines;
             return substitute || node;
         }
         function getPipelinePhase(phase, emitHint, node) {
@@ -95327,9 +95521,9 @@ var ts;
         function emitPropertyAccessExpression(node) {
             var expression = ts.cast(emitExpression(node.expression), ts.isExpression);
             var token = node.questionDotToken || ts.createNode(24 /* DotToken */, node.expression.end, node.name.pos);
-            var indentBeforeDot = needsIndentation(node, node.expression, token);
-            var indentAfterDot = needsIndentation(node, token, node.name);
-            increaseIndentIf(indentBeforeDot, /*writeSpaceIfNotIndenting*/ false);
+            var linesBeforeDot = getLinesBetweenNodes(node, node.expression, token);
+            var linesAfterDot = getLinesBetweenNodes(node, token, node.name);
+            writeLinesAndIndent(linesBeforeDot, /*writeSpaceIfNotIndenting*/ false);
             var shouldEmitDotDot = token.kind !== 28 /* QuestionDotToken */ &&
                 mayNeedDotDotForPropertyAccess(expression) &&
                 !writer.hasTrailingComment() &&
@@ -95343,9 +95537,9 @@ var ts;
             else {
                 emitTokenWithComment(token.kind, node.expression.end, writePunctuation, node);
             }
-            increaseIndentIf(indentAfterDot, /*writeSpaceIfNotIndenting*/ false);
+            writeLinesAndIndent(linesAfterDot, /*writeSpaceIfNotIndenting*/ false);
             emit(node.name);
-            decreaseIndentIf(indentBeforeDot, indentAfterDot);
+            decreaseIndentIf(linesBeforeDot, linesAfterDot);
         }
         // 1..toString is a valid property access, emit a dot after the literal
         // Also emit a dot if expression is a integer const enum value - it will appear in generated code as numeric literal
@@ -95400,7 +95594,16 @@ var ts;
         }
         function emitParenthesizedExpression(node) {
             var openParenPos = emitTokenWithComment(20 /* OpenParenToken */, node.pos, writePunctuation, node);
+            var leadingNewlines = preserveSourceNewlines && getLeadingLineTerminatorCount(node, [node.expression], 0 /* None */);
+            if (leadingNewlines) {
+                writeLinesAndIndent(leadingNewlines, /*writeLinesIfNotIndenting*/ false);
+            }
             emitExpression(node.expression);
+            var trailingNewlines = preserveSourceNewlines && getClosingLineTerminatorCount(node, [node.expression], 0 /* None */);
+            if (trailingNewlines) {
+                writeLine(trailingNewlines);
+            }
+            decreaseIndentIf(leadingNewlines);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression ? node.expression.end : openParenPos, writePunctuation, node);
         }
         function emitFunctionExpression(node) {
@@ -95492,20 +95695,20 @@ var ts;
                     }
                     case 1 /* EmitRight */: {
                         var isCommaOperator = node.operatorToken.kind !== 27 /* CommaToken */;
-                        var indentBeforeOperator = needsIndentation(node, node.left, node.operatorToken);
-                        var indentAfterOperator = needsIndentation(node, node.operatorToken, node.right);
-                        increaseIndentIf(indentBeforeOperator, isCommaOperator);
+                        var linesBeforeOperator = getLinesBetweenNodes(node, node.left, node.operatorToken);
+                        var linesAfterOperator = getLinesBetweenNodes(node, node.operatorToken, node.right);
+                        writeLinesAndIndent(linesBeforeOperator, isCommaOperator);
                         emitLeadingCommentsOfPosition(node.operatorToken.pos);
                         writeTokenNode(node.operatorToken, node.operatorToken.kind === 97 /* InKeyword */ ? writeKeyword : writeOperator);
                         emitTrailingCommentsOfPosition(node.operatorToken.end, /*prefixSpace*/ true); // Binary operators should have a space before the comment starts
-                        increaseIndentIf(indentAfterOperator, /*writeSpaceIfNotIndenting*/ true);
+                        writeLinesAndIndent(linesAfterOperator, /*writeSpaceIfNotIndenting*/ true);
                         maybePipelineEmitExpression(node.right);
                         break;
                     }
                     case 2 /* FinishEmit */: {
-                        var indentBeforeOperator = needsIndentation(node, node.left, node.operatorToken);
-                        var indentAfterOperator = needsIndentation(node, node.operatorToken, node.right);
-                        decreaseIndentIf(indentBeforeOperator, indentAfterOperator);
+                        var linesBeforeOperator = getLinesBetweenNodes(node, node.left, node.operatorToken);
+                        var linesAfterOperator = getLinesBetweenNodes(node, node.operatorToken, node.right);
+                        decreaseIndentIf(linesBeforeOperator, linesAfterOperator);
                         stackIndex--;
                         break;
                     }
@@ -95541,21 +95744,21 @@ var ts;
             }
         }
         function emitConditionalExpression(node) {
-            var indentBeforeQuestion = needsIndentation(node, node.condition, node.questionToken);
-            var indentAfterQuestion = needsIndentation(node, node.questionToken, node.whenTrue);
-            var indentBeforeColon = needsIndentation(node, node.whenTrue, node.colonToken);
-            var indentAfterColon = needsIndentation(node, node.colonToken, node.whenFalse);
+            var linesBeforeQuestion = getLinesBetweenNodes(node, node.condition, node.questionToken);
+            var linesAfterQuestion = getLinesBetweenNodes(node, node.questionToken, node.whenTrue);
+            var linesBeforeColon = getLinesBetweenNodes(node, node.whenTrue, node.colonToken);
+            var linesAfterColon = getLinesBetweenNodes(node, node.colonToken, node.whenFalse);
             emitExpression(node.condition);
-            increaseIndentIf(indentBeforeQuestion, /*writeSpaceIfNotIndenting*/ true);
+            writeLinesAndIndent(linesBeforeQuestion, /*writeSpaceIfNotIndenting*/ true);
             emit(node.questionToken);
-            increaseIndentIf(indentAfterQuestion, /*writeSpaceIfNotIndenting*/ true);
+            writeLinesAndIndent(linesAfterQuestion, /*writeSpaceIfNotIndenting*/ true);
             emitExpression(node.whenTrue);
-            decreaseIndentIf(indentBeforeQuestion, indentAfterQuestion);
-            increaseIndentIf(indentBeforeColon, /*writeSpaceIfNotIndenting*/ true);
+            decreaseIndentIf(linesBeforeQuestion, linesAfterQuestion);
+            writeLinesAndIndent(linesBeforeColon, /*writeSpaceIfNotIndenting*/ true);
             emit(node.colonToken);
-            increaseIndentIf(indentAfterColon, /*writeSpaceIfNotIndenting*/ true);
+            writeLinesAndIndent(linesAfterColon, /*writeSpaceIfNotIndenting*/ true);
             emitExpression(node.whenFalse);
-            decreaseIndentIf(indentBeforeColon, indentAfterColon);
+            decreaseIndentIf(linesBeforeColon, linesAfterColon);
         }
         function emitTemplateExpression(node) {
             emit(node.head);
@@ -95896,14 +96099,14 @@ var ts;
             if (!ts.nodeIsSynthesized(body) && !ts.rangeIsOnSingleLine(body, currentSourceFile)) {
                 return false;
             }
-            if (shouldWriteLeadingLineTerminator(body, body.statements, 2 /* PreserveLines */)
-                || shouldWriteClosingLineTerminator(body, body.statements, 2 /* PreserveLines */)) {
+            if (getLeadingLineTerminatorCount(body, body.statements, 2 /* PreserveLines */)
+                || getClosingLineTerminatorCount(body, body.statements, 2 /* PreserveLines */)) {
                 return false;
             }
             var previousStatement;
             for (var _a = 0, _b = body.statements; _a < _b.length; _a++) {
                 var statement = _b[_a];
-                if (shouldWriteSeparatingLineTerminator(previousStatement, statement, 2 /* PreserveLines */)) {
+                if (getSeparatingLineTerminatorCount(previousStatement, statement, 2 /* PreserveLines */) > 0) {
                     return false;
                 }
                 previousStatement = statement;
@@ -96865,7 +97068,7 @@ var ts;
             }
             if (isEmpty) {
                 // Write a line terminator if the parent node was multi-line
-                if (format & 1 /* MultiLine */) {
+                if (format & 1 /* MultiLine */ && !(preserveSourceNewlines && ts.rangeIsOnSingleLine(parentNode, currentSourceFile))) {
                     writeLine();
                 }
                 else if (format & 256 /* SpaceBetweenBraces */ && !(format & 524288 /* NoSpaceIfEmpty */)) {
@@ -96876,8 +97079,9 @@ var ts;
                 // Write the opening line terminator or leading whitespace.
                 var mayEmitInterveningComments = (format & 262144 /* NoInterveningComments */) === 0;
                 var shouldEmitInterveningComments = mayEmitInterveningComments;
-                if (shouldWriteLeadingLineTerminator(parentNode, children, format)) { // TODO: GH#18217
-                    writeLine();
+                var leadingLineTerminatorCount = getLeadingLineTerminatorCount(parentNode, children, format); // TODO: GH#18217
+                if (leadingLineTerminatorCount) {
+                    writeLine(leadingLineTerminatorCount);
                     shouldEmitInterveningComments = false;
                 }
                 else if (format & 256 /* SpaceBetweenBraces */) {
@@ -96912,14 +97116,15 @@ var ts;
                         writeDelimiter(format);
                         recordBundleFileInternalSectionEnd(previousSourceFileTextKind);
                         // Write either a line terminator or whitespace to separate the elements.
-                        if (shouldWriteSeparatingLineTerminator(previousSibling, child, format)) {
+                        var separatingLineTerminatorCount = getSeparatingLineTerminatorCount(previousSibling, child, format);
+                        if (separatingLineTerminatorCount > 0) {
                             // If a synthesized node in a single-line list starts on a new
                             // line, we should increase the indent.
                             if ((format & (3 /* LinesMask */ | 128 /* Indented */)) === 0 /* SingleLine */) {
                                 increaseIndent();
                                 shouldDecreaseIndentAfterEmit = true;
                             }
-                            writeLine();
+                            writeLine(separatingLineTerminatorCount);
                             shouldEmitInterveningComments = false;
                         }
                         else if (previousSibling && format & 512 /* SpaceBetweenSiblings */) {
@@ -96964,8 +97169,9 @@ var ts;
                 }
                 recordBundleFileInternalSectionEnd(previousSourceFileTextKind);
                 // Write the closing line terminator or closing whitespace.
-                if (shouldWriteClosingLineTerminator(parentNode, children, format)) {
-                    writeLine();
+                var closingLineTerminatorCount = getClosingLineTerminatorCount(parentNode, children, format);
+                if (closingLineTerminatorCount) {
+                    writeLine(closingLineTerminatorCount);
                 }
                 else if (format & 256 /* SpaceBetweenBraces */) {
                     writeSpace();
@@ -97019,8 +97225,11 @@ var ts;
         function writeProperty(s) {
             writer.writeProperty(s);
         }
-        function writeLine() {
-            writer.writeLine();
+        function writeLine(count) {
+            if (count === void 0) { count = 1; }
+            for (var i = 0; i < count; i++) {
+                writer.writeLine(i > 0);
+            }
         }
         function increaseIndent() {
             writer.increaseIndent();
@@ -97067,10 +97276,10 @@ var ts;
                 }
             }
         }
-        function increaseIndentIf(value, writeSpaceIfNotIndenting) {
-            if (value) {
+        function writeLinesAndIndent(lineCount, writeSpaceIfNotIndenting) {
+            if (lineCount) {
                 increaseIndent();
-                writeLine();
+                writeLine(lineCount);
             }
             else if (writeSpaceIfNotIndenting) {
                 writeSpace();
@@ -97088,70 +97297,101 @@ var ts;
                 decreaseIndent();
             }
         }
-        function shouldWriteLeadingLineTerminator(parentNode, children, format) {
-            if (format & 1 /* MultiLine */) {
-                return true;
-            }
-            if (format & 2 /* PreserveLines */) {
+        function getLeadingLineTerminatorCount(parentNode, children, format) {
+            if (format & 2 /* PreserveLines */ || preserveSourceNewlines) {
                 if (format & 65536 /* PreferNewLine */) {
-                    return true;
+                    return 1;
                 }
-                var firstChild = children[0];
-                if (firstChild === undefined) {
-                    return !ts.rangeIsOnSingleLine(parentNode, currentSourceFile);
+                var firstChild_1 = children[0];
+                if (firstChild_1 === undefined) {
+                    return ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
                 }
-                else if (ts.positionIsSynthesized(parentNode.pos) || ts.nodeIsSynthesized(firstChild)) {
-                    return synthesizedNodeStartsOnNewLine(firstChild, format);
+                if (firstChild_1.kind === 11 /* JsxText */) {
+                    // JsxText will be written with its leading whitespace, so don't add more manually.
+                    return 0;
                 }
-                else {
-                    return !ts.rangeStartPositionsAreOnSameLine(parentNode, firstChild, currentSourceFile);
+                if (!ts.positionIsSynthesized(parentNode.pos) && !ts.nodeIsSynthesized(firstChild_1) && firstChild_1.parent === parentNode) {
+                    if (preserveSourceNewlines) {
+                        return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter(firstChild_1.pos, currentSourceFile, includeComments); });
+                    }
+                    return ts.rangeStartPositionsAreOnSameLine(parentNode, firstChild_1, currentSourceFile) ? 0 : 1;
+                }
+                if (synthesizedNodeStartsOnNewLine(firstChild_1, format)) {
+                    return 1;
                 }
             }
-            else {
-                return false;
-            }
+            return format & 1 /* MultiLine */ ? 1 : 0;
         }
-        function shouldWriteSeparatingLineTerminator(previousNode, nextNode, format) {
-            if (format & 1 /* MultiLine */) {
-                return true;
-            }
-            else if (format & 2 /* PreserveLines */) {
+        function getSeparatingLineTerminatorCount(previousNode, nextNode, format) {
+            if (format & 2 /* PreserveLines */ || preserveSourceNewlines) {
                 if (previousNode === undefined || nextNode === undefined) {
-                    return false;
+                    return 0;
                 }
-                else if (ts.nodeIsSynthesized(previousNode) || ts.nodeIsSynthesized(nextNode)) {
-                    return synthesizedNodeStartsOnNewLine(previousNode, format) || synthesizedNodeStartsOnNewLine(nextNode, format);
+                if (nextNode.kind === 11 /* JsxText */) {
+                    // JsxText will be written with its leading whitespace, so don't add more manually.
+                    return 0;
                 }
-                else {
-                    return !ts.rangeEndIsOnSameLineAsRangeStart(previousNode, nextNode, currentSourceFile);
+                else if (!ts.nodeIsSynthesized(previousNode) && !ts.nodeIsSynthesized(nextNode) && previousNode.parent === nextNode.parent) {
+                    if (preserveSourceNewlines) {
+                        return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenRangeEndAndRangeStart(previousNode, nextNode, currentSourceFile, includeComments); });
+                    }
+                    return ts.rangeEndIsOnSameLineAsRangeStart(previousNode, nextNode, currentSourceFile) ? 0 : 1;
+                }
+                else if (synthesizedNodeStartsOnNewLine(previousNode, format) || synthesizedNodeStartsOnNewLine(nextNode, format)) {
+                    return 1;
                 }
             }
-            else {
-                return ts.getStartsOnNewLine(nextNode);
+            else if (ts.getStartsOnNewLine(nextNode)) {
+                return 1;
             }
+            return format & 1 /* MultiLine */ ? 1 : 0;
         }
-        function shouldWriteClosingLineTerminator(parentNode, children, format) {
-            if (format & 1 /* MultiLine */) {
-                return (format & 131072 /* NoTrailingNewLine */) === 0;
-            }
-            else if (format & 2 /* PreserveLines */) {
+        function getClosingLineTerminatorCount(parentNode, children, format) {
+            if (format & 2 /* PreserveLines */ || preserveSourceNewlines) {
                 if (format & 65536 /* PreferNewLine */) {
-                    return true;
+                    return 1;
                 }
-                var lastChild = ts.lastOrUndefined(children);
-                if (lastChild === undefined) {
-                    return !ts.rangeIsOnSingleLine(parentNode, currentSourceFile);
+                var lastChild_1 = ts.lastOrUndefined(children);
+                if (lastChild_1 === undefined) {
+                    return ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
                 }
-                else if (ts.positionIsSynthesized(parentNode.pos) || ts.nodeIsSynthesized(lastChild)) {
-                    return synthesizedNodeStartsOnNewLine(lastChild, format);
+                if (!ts.positionIsSynthesized(parentNode.pos) && !ts.nodeIsSynthesized(lastChild_1) && lastChild_1.parent === parentNode) {
+                    if (preserveSourceNewlines) {
+                        return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenPositionAndNextNonWhitespaceCharacter(lastChild_1.end, currentSourceFile, includeComments); });
+                    }
+                    return ts.rangeEndPositionsAreOnSameLine(parentNode, lastChild_1, currentSourceFile) ? 0 : 1;
                 }
-                else {
-                    return !ts.rangeEndPositionsAreOnSameLine(parentNode, lastChild, currentSourceFile);
+                if (synthesizedNodeStartsOnNewLine(lastChild_1, format)) {
+                    return 1;
                 }
             }
-            else {
-                return false;
+            if (format & 1 /* MultiLine */ && !(format & 131072 /* NoTrailingNewLine */)) {
+                return 1;
             }
+            return 0;
+        }
+        function getEffectiveLines(getLineDifference) {
+            // If 'preserveSourceNewlines' is disabled, we should never call this function
+            // because it could be more expensive than alternative approximations.
+            ts.Debug.assert(!!preserveSourceNewlines);
+            // We start by measuring the line difference from a position to its adjacent comments,
+            // so that this is counted as a one-line difference, not two:
+            //
+            //   node1;
+            //   // NODE2 COMMENT
+            //   node2;
+            var lines = getLineDifference(/*includeComments*/ true);
+            if (lines === 0) {
+                // However, if the line difference considering comments was 0, we might have this:
+                //
+                //   node1; // NODE2 COMMENT
+                //   node2;
+                //
+                // in which case we should be ignoring node2's comment, so this too is counted as
+                // a one-line difference, not zero.
+                return getLineDifference(/*includeComments*/ false);
+            }
+            return lines;
         }
         function synthesizedNodeStartsOnNewLine(node, format) {
             if (ts.nodeIsSynthesized(node)) {
@@ -97163,21 +97403,24 @@ var ts;
             }
             return (format & 65536 /* PreferNewLine */) !== 0;
         }
-        function needsIndentation(parent, node1, node2) {
+        function getLinesBetweenNodes(parent, node1, node2) {
             if (ts.getEmitFlags(parent) & 131072 /* NoIndentation */) {
-                return false;
+                return 0;
             }
             parent = skipSynthesizedParentheses(parent);
             node1 = skipSynthesizedParentheses(node1);
             node2 = skipSynthesizedParentheses(node2);
             // Always use a newline for synthesized code if the synthesizer desires it.
             if (ts.getStartsOnNewLine(node2)) {
-                return true;
+                return 1;
             }
-            return !ts.nodeIsSynthesized(parent)
-                && !ts.nodeIsSynthesized(node1)
-                && !ts.nodeIsSynthesized(node2)
-                && !ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile);
+            if (!ts.nodeIsSynthesized(parent) && !ts.nodeIsSynthesized(node1) && !ts.nodeIsSynthesized(node2)) {
+                if (preserveSourceNewlines) {
+                    return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenRangeEndAndRangeStart(node1, node2, currentSourceFile, includeComments); });
+                }
+                return ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile) ? 0 : 1;
+            }
+            return 0;
         }
         function isEmptyBlock(block) {
             return block.statements.length === 0
@@ -99010,14 +99253,14 @@ var ts;
         var mapFromToProjectReferenceRedirectSource;
         var useSourceOfProjectReferenceRedirect = !!((_a = host.useSourceOfProjectReferenceRedirect) === null || _a === void 0 ? void 0 : _a.call(host)) &&
             !options.disableSourceOfProjectReferenceRedirect;
-        var onProgramCreateComplete = updateHostForUseSourceOfProjectReferenceRedirect({
+        var _b = updateHostForUseSourceOfProjectReferenceRedirect({
             compilerHost: host,
             useSourceOfProjectReferenceRedirect: useSourceOfProjectReferenceRedirect,
             toPath: toPath,
             getResolvedProjectReferences: getResolvedProjectReferences,
             getSourceOfProjectReferenceRedirect: getSourceOfProjectReferenceRedirect,
             forEachResolvedProjectReference: forEachResolvedProjectReference
-        });
+        }), onProgramCreateComplete = _b.onProgramCreateComplete, fileExists = _b.fileExists;
         var shouldCreateNewSourceFile = shouldProgramCreateNewSourceFiles(oldProgram, options);
         // We set `structuralIsReused` to `undefined` because `tryReuseStructureFromOldProgram` calls `tryReuseStructureFromOldProgram` which checks
         // `structuralIsReused`, which would be a TDZ violation if it was not set in advance to `undefined`.
@@ -99038,8 +99281,8 @@ var ts;
                         var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out;
                         if (useSourceOfProjectReferenceRedirect) {
                             if (out || ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) {
-                                for (var _b = 0, _c = parsedRef.commandLine.fileNames; _b < _c.length; _b++) {
-                                    var fileName = _c[_b];
+                                for (var _c = 0, _d = parsedRef.commandLine.fileNames; _c < _d.length; _c++) {
+                                    var fileName = _d[_c];
                                     processSourceFile(fileName, /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
                                 }
                             }
@@ -99049,8 +99292,8 @@ var ts;
                                 processSourceFile(ts.changeExtension(out, ".d.ts"), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
                             }
                             else if (ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) {
-                                for (var _d = 0, _e = parsedRef.commandLine.fileNames; _d < _e.length; _d++) {
-                                    var fileName = _e[_d];
+                                for (var _e = 0, _f = parsedRef.commandLine.fileNames; _e < _f.length; _e++) {
+                                    var fileName = _f[_e];
                                     if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) && !ts.fileExtensionIs(fileName, ".json" /* Json */)) {
                                         processSourceFile(ts.getOutputDeclarationFileName(fileName, parsedRef.commandLine, !host.useCaseSensitiveFileNames()), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
                                     }
@@ -99102,8 +99345,8 @@ var ts;
         // not part of the new program.
         if (oldProgram && host.onReleaseOldSourceFile) {
             var oldSourceFiles = oldProgram.getSourceFiles();
-            for (var _f = 0, oldSourceFiles_1 = oldSourceFiles; _f < oldSourceFiles_1.length; _f++) {
-                var oldSourceFile = oldSourceFiles_1[_f];
+            for (var _g = 0, oldSourceFiles_1 = oldSourceFiles; _g < oldSourceFiles_1.length; _g++) {
+                var oldSourceFile = oldSourceFiles_1[_g];
                 var newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
                 if (shouldCreateNewSourceFile || !newFile ||
                     // old file wasnt redirect but new file is
@@ -99168,6 +99411,7 @@ var ts;
             forEachResolvedProjectReference: forEachResolvedProjectReference,
             isSourceOfProjectReferenceRedirect: isSourceOfProjectReferenceRedirect,
             emitBuildInfo: emitBuildInfo,
+            fileExists: fileExists,
             getProbableSymlinks: getProbableSymlinks,
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
         };
@@ -99611,11 +99855,26 @@ var ts;
             return oldProgram.structureIsReused = 2 /* Completely */;
         }
         function getEmitHost(writeFileCallback) {
-            return __assign(__assign({ getPrependNodes: getPrependNodes,
-                getCanonicalFileName: getCanonicalFileName, getCommonSourceDirectory: program.getCommonSourceDirectory, getCompilerOptions: program.getCompilerOptions, getCurrentDirectory: function () { return currentDirectory; }, getNewLine: function () { return host.getNewLine(); }, getSourceFile: program.getSourceFile, getSourceFileByPath: program.getSourceFileByPath, getSourceFiles: program.getSourceFiles, getLibFileFromReference: program.getLibFileFromReference, isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
+            return {
+                getPrependNodes: getPrependNodes,
+                getCanonicalFileName: getCanonicalFileName,
+                getCommonSourceDirectory: program.getCommonSourceDirectory,
+                getCompilerOptions: program.getCompilerOptions,
+                getCurrentDirectory: function () { return currentDirectory; },
+                getNewLine: function () { return host.getNewLine(); },
+                getSourceFile: program.getSourceFile,
+                getSourceFileByPath: program.getSourceFileByPath,
+                getSourceFiles: program.getSourceFiles,
+                getLibFileFromReference: program.getLibFileFromReference,
+                isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
                 getResolvedProjectReferenceToRedirect: getResolvedProjectReferenceToRedirect,
+                getProjectReferenceRedirect: getProjectReferenceRedirect,
                 isSourceOfProjectReferenceRedirect: isSourceOfProjectReferenceRedirect,
-                getProbableSymlinks: getProbableSymlinks, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, fileExists: function (f) {
+                getProbableSymlinks: getProbableSymlinks,
+                writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }),
+                isEmitBlocked: isEmitBlocked,
+                readFile: function (f) { return host.readFile(f); },
+                fileExists: function (f) {
                     // Use local caches
                     var path = toPath(f);
                     if (getSourceFileByPath(path))
@@ -99624,7 +99883,12 @@ var ts;
                         return false;
                     // Before falling back to the host
                     return host.fileExists(f);
-                } }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {})), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); }, redirectTargetsMap: redirectTargetsMap });
+                },
+                useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
+                getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); },
+                getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); },
+                redirectTargetsMap: redirectTargetsMap,
+            };
         }
         function emitBuildInfo(writeFileCallback) {
             ts.Debug.assert(!options.out && !options.outFile);
@@ -100286,7 +100550,7 @@ var ts;
                 }
                 var sourceFileWithAddedExtension = ts.forEach(supportedExtensions, function (extension) { return getSourceFile(fileName + extension); });
                 if (fail && !sourceFileWithAddedExtension)
-                    fail(ts.Diagnostics.File_0_not_found, fileName + ".ts" /* Ts */);
+                    fail(ts.Diagnostics.Could_not_resolve_the_path_0_with_the_extensions_Colon_1, fileName, "'" + supportedExtensions.join("', '") + "'");
                 return sourceFileWithAddedExtension;
             }
         }
@@ -101290,20 +101554,8 @@ var ts;
         var originalGetDirectories = host.compilerHost.getDirectories;
         var originalRealpath = host.compilerHost.realpath;
         if (!host.useSourceOfProjectReferenceRedirect)
-            return ts.noop;
-        // This implementation of fileExists checks if the file being requested is
-        // .d.ts file for the referenced Project.
-        // If it is it returns true irrespective of whether that file exists on host
-        host.compilerHost.fileExists = function (file) {
-            if (originalFileExists.call(host.compilerHost, file))
-                return true;
-            if (!host.getResolvedProjectReferences())
-                return false;
-            if (!ts.isDeclarationFileName(file))
-                return false;
-            // Project references go to source file instead of .d.ts file
-            return fileOrDirectoryExistsUsingSource(file, /*isFile*/ true);
-        };
+            return { onProgramCreateComplete: ts.noop, fileExists: fileExists };
+        host.compilerHost.fileExists = fileExists;
         if (originalDirectoryExists) {
             // This implementation of directoryExists checks if the directory being requested is
             // directory of .d.ts file for the referenced Project.
@@ -101352,13 +101604,26 @@ var ts;
                     originalRealpath.call(host.compilerHost, s);
             };
         }
-        return onProgramCreateComplete;
+        return { onProgramCreateComplete: onProgramCreateComplete, fileExists: fileExists };
         function onProgramCreateComplete() {
             host.compilerHost.fileExists = originalFileExists;
             host.compilerHost.directoryExists = originalDirectoryExists;
             host.compilerHost.getDirectories = originalGetDirectories;
             // DO not revert realpath as it could be used later
         }
+        // This implementation of fileExists checks if the file being requested is
+        // .d.ts file for the referenced Project.
+        // If it is it returns true irrespective of whether that file exists on host
+        function fileExists(file) {
+            if (originalFileExists.call(host.compilerHost, file))
+                return true;
+            if (!host.getResolvedProjectReferences())
+                return false;
+            if (!ts.isDeclarationFileName(file))
+                return false;
+            // Project references go to source file instead of .d.ts file
+            return fileOrDirectoryExistsUsingSource(file, /*isFile*/ true);
+        }
         function fileExistsIfProjectReferenceDts(file) {
             var source = host.getSourceOfProjectReferenceRedirect(file);
             return source !== undefined ?
@@ -101544,8 +101809,8 @@ var ts;
 (function (ts) {
     function getFileEmitOutput(program, sourceFile, emitOnlyDtsFiles, cancellationToken, customTransformers, forceDtsEmit) {
         var outputFiles = [];
-        var emitResult = program.emit(sourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers, forceDtsEmit);
-        return { outputFiles: outputFiles, emitSkipped: emitResult.emitSkipped, exportedModulesFromDeclarationEmit: emitResult.exportedModulesFromDeclarationEmit };
+        var _a = program.emit(sourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers, forceDtsEmit), emitSkipped = _a.emitSkipped, diagnostics = _a.diagnostics, exportedModulesFromDeclarationEmit = _a.exportedModulesFromDeclarationEmit;
+        return { outputFiles: outputFiles, emitSkipped: emitSkipped, diagnostics: diagnostics, exportedModulesFromDeclarationEmit: exportedModulesFromDeclarationEmit };
         function writeFile(fileName, text, writeByteOrderMark) {
             outputFiles.push({ name: fileName, writeByteOrderMark: writeByteOrderMark, text: text });
         }
@@ -101753,12 +102018,14 @@ var ts;
          * This should be called whenever it is safe to commit the state of the builder
          */
         function updateSignaturesFromCache(state, signatureCache) {
-            signatureCache.forEach(function (signature, path) {
-                state.fileInfos.get(path).signature = signature;
-                state.hasCalledUpdateShapeSignature.set(path, true);
-            });
+            signatureCache.forEach(function (signature, path) { return updateSignatureOfFile(state, signature, path); });
         }
         BuilderState.updateSignaturesFromCache = updateSignaturesFromCache;
+        function updateSignatureOfFile(state, signature, path) {
+            state.fileInfos.get(path).signature = signature;
+            state.hasCalledUpdateShapeSignature.set(path, true);
+        }
+        BuilderState.updateSignatureOfFile = updateSignatureOfFile;
         /**
          * Returns if the shape of the signature has changed since last emit
          */
@@ -103632,39 +103899,39 @@ var ts;
                     ts.getEmitModuleResolutionKind(compilerOptions) !== ts.ModuleResolutionKind.NodeJs || ts.endsWith(oldImportSpecifier, "index") ? 1 /* Index */ : 0 /* Minimal */,
             };
         }
-        function updateModuleSpecifier(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, oldImportSpecifier) {
-            var res = getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, getPreferencesForUpdate(compilerOptions, oldImportSpecifier));
+        function updateModuleSpecifier(compilerOptions, importingSourceFileName, toFileName, host, oldImportSpecifier) {
+            var res = getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, getPreferencesForUpdate(compilerOptions, oldImportSpecifier));
             if (res === oldImportSpecifier)
                 return undefined;
             return res;
         }
         moduleSpecifiers.updateModuleSpecifier = updateModuleSpecifier;
         // Note: importingSourceFile is just for usesJsExtensionOnImports
-        function getModuleSpecifier(compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, files, preferences, redirectTargetsMap) {
+        function getModuleSpecifier(compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, preferences) {
             if (preferences === void 0) { preferences = {}; }
-            return getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, getPreferences(preferences, compilerOptions, importingSourceFile));
+            return getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, getPreferences(preferences, compilerOptions, importingSourceFile));
         }
         moduleSpecifiers.getModuleSpecifier = getModuleSpecifier;
-        function getNodeModulesPackageName(compilerOptions, importingSourceFileName, nodeModulesFileName, host, files, redirectTargetsMap) {
+        function getNodeModulesPackageName(compilerOptions, importingSourceFileName, nodeModulesFileName, host) {
             var info = getInfo(importingSourceFileName, host);
-            var modulePaths = getAllModulePaths(files, importingSourceFileName, nodeModulesFileName, info.getCanonicalFileName, host, redirectTargetsMap);
+            var modulePaths = getAllModulePaths(importingSourceFileName, nodeModulesFileName, host);
             return ts.firstDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions, /*packageNameOnly*/ true); });
         }
         moduleSpecifiers.getNodeModulesPackageName = getNodeModulesPackageName;
-        function getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, preferences) {
+        function getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, preferences) {
             var info = getInfo(importingSourceFileName, host);
-            var modulePaths = getAllModulePaths(files, importingSourceFileName, toFileName, info.getCanonicalFileName, host, redirectTargetsMap);
+            var modulePaths = getAllModulePaths(importingSourceFileName, toFileName, host);
             return ts.firstDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions); }) ||
                 getLocalModuleSpecifier(toFileName, info, compilerOptions, preferences);
         }
         /** Returns an import for each symlink and for the realpath. */
-        function getModuleSpecifiers(moduleSymbol, compilerOptions, importingSourceFile, host, files, userPreferences, redirectTargetsMap) {
+        function getModuleSpecifiers(moduleSymbol, compilerOptions, importingSourceFile, host, userPreferences) {
             var ambient = tryGetModuleNameFromAmbientModule(moduleSymbol);
             if (ambient)
                 return [ambient];
             var info = getInfo(importingSourceFile.path, host);
             var moduleSourceFile = ts.getSourceFileOfNode(moduleSymbol.valueDeclaration || ts.getNonAugmentationDeclaration(moduleSymbol));
-            var modulePaths = getAllModulePaths(files, importingSourceFile.path, moduleSourceFile.originalFileName, info.getCanonicalFileName, host, redirectTargetsMap);
+            var modulePaths = getAllModulePaths(importingSourceFile.path, moduleSourceFile.originalFileName, host);
             var preferences = getPreferences(userPreferences, compilerOptions, importingSourceFile);
             var global = ts.mapDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions); });
             return global.length ? global : modulePaths.map(function (moduleFileName) { return getLocalModuleSpecifier(moduleFileName, info, compilerOptions, preferences); });
@@ -103723,10 +103990,12 @@ var ts;
         function comparePathsByNumberOfDirectorySeparators(a, b) {
             return ts.compareValues(numberOfDirectorySeparators(a), numberOfDirectorySeparators(b));
         }
-        function forEachFileNameOfModule(files, importingFileName, importedFileName, getCanonicalFileName, host, redirectTargetsMap, preferSymlinks, cb) {
-            var redirects = redirectTargetsMap.get(importedFileName);
-            var importedFileNames = redirects ? __spreadArrays(redirects, [importedFileName]) : [importedFileName];
-            var cwd = host.getCurrentDirectory ? host.getCurrentDirectory() : "";
+        function forEachFileNameOfModule(importingFileName, importedFileName, host, preferSymlinks, cb) {
+            var getCanonicalFileName = ts.hostGetCanonicalFileName(host);
+            var cwd = host.getCurrentDirectory();
+            var referenceRedirect = host.isSourceOfProjectReferenceRedirect(importedFileName) ? host.getProjectReferenceRedirect(importedFileName) : undefined;
+            var redirects = host.redirectTargetsMap.get(ts.toPath(importedFileName, cwd, getCanonicalFileName)) || ts.emptyArray;
+            var importedFileNames = __spreadArrays((referenceRedirect ? [referenceRedirect] : ts.emptyArray), [importedFileName], redirects);
             var targets = importedFileNames.map(function (f) { return ts.getNormalizedAbsolutePath(f, cwd); });
             if (!preferSymlinks) {
                 var result_10 = ts.forEach(targets, cb);
@@ -103734,8 +104003,8 @@ var ts;
                     return result_10;
             }
             var links = host.getProbableSymlinks
-                ? host.getProbableSymlinks(files)
-                : ts.discoverProbableSymlinks(files, getCanonicalFileName, cwd);
+                ? host.getProbableSymlinks(host.getSourceFiles())
+                : ts.discoverProbableSymlinks(host.getSourceFiles(), getCanonicalFileName, cwd);
             var compareStrings = (!host.useCaseSensitiveFileNames || host.useCaseSensitiveFileNames()) ? ts.compareStringsCaseSensitive : ts.compareStringsCaseInsensitive;
             var result = ts.forEachEntry(links, function (resolved, path) {
                 if (ts.startsWithDirectory(importingFileName, resolved, getCanonicalFileName)) {
@@ -103760,22 +104029,28 @@ var ts;
          * Looks for existing imports that use symlinks to this module.
          * Symlinks will be returned first so they are preferred over the real path.
          */
-        function getAllModulePaths(files, importingFileName, importedFileName, getCanonicalFileName, host, redirectTargetsMap) {
-            var cwd = host.getCurrentDirectory ? host.getCurrentDirectory() : "";
+        function getAllModulePaths(importingFileName, importedFileName, host) {
+            var cwd = host.getCurrentDirectory();
+            var getCanonicalFileName = ts.hostGetCanonicalFileName(host);
             var allFileNames = ts.createMap();
-            forEachFileNameOfModule(files, importingFileName, importedFileName, getCanonicalFileName, host, redirectTargetsMap, 
+            var importedFileFromNodeModules = false;
+            forEachFileNameOfModule(importingFileName, importedFileName, host, 
             /*preferSymlinks*/ true, function (path) {
                 // dont return value, so we collect everything
                 allFileNames.set(path, getCanonicalFileName(path));
+                importedFileFromNodeModules = importedFileFromNodeModules || ts.pathContainsNodeModules(path);
             });
             // Sort by paths closest to importing file Name directory
             var sortedPaths = [];
-            var _loop_18 = function (directory) {
+            var _loop_19 = function (directory) {
                 var directoryStart = ts.ensureTrailingDirectorySeparator(directory);
                 var pathsInDirectory;
                 allFileNames.forEach(function (canonicalFileName, fileName) {
                     if (ts.startsWith(canonicalFileName, directoryStart)) {
-                        (pathsInDirectory || (pathsInDirectory = [])).push(fileName);
+                        // If the importedFile is from node modules, use only paths in node_modules folder as option
+                        if (!importedFileFromNodeModules || ts.pathContainsNodeModules(fileName)) {
+                            (pathsInDirectory || (pathsInDirectory = [])).push(fileName);
+                        }
                         allFileNames.delete(fileName);
                     }
                 });
@@ -103793,9 +104068,9 @@ var ts;
             };
             var out_directory_1;
             for (var directory = ts.getDirectoryPath(ts.toPath(importingFileName, cwd, getCanonicalFileName)); allFileNames.size !== 0;) {
-                var state_7 = _loop_18(directory);
+                var state_8 = _loop_19(directory);
                 directory = out_directory_1;
-                if (state_7 === "break")
+                if (state_8 === "break")
                     break;
             }
             if (allFileNames.size) {
@@ -108648,14 +108923,27 @@ var ts;
         return !!compilerOptions.module || compilerOptions.target >= 2 /* ES2015 */ || !!compilerOptions.noEmit;
     }
     ts.compilerOptionsIndicateEs6Modules = compilerOptionsIndicateEs6Modules;
-    function hostUsesCaseSensitiveFileNames(host) {
-        return host.useCaseSensitiveFileNames ? host.useCaseSensitiveFileNames() : false;
+    function createModuleSpecifierResolutionHost(program, host) {
+        // Mix in `getProbableSymlinks` from Program when host doesn't have it
+        // in order for non-Project hosts to have a symlinks cache.
+        return {
+            fileExists: function (fileName) { return program.fileExists(fileName); },
+            getCurrentDirectory: function () { return host.getCurrentDirectory(); },
+            readFile: ts.maybeBind(host, host.readFile),
+            useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames),
+            getProbableSymlinks: ts.maybeBind(host, host.getProbableSymlinks) || (function () { return program.getProbableSymlinks(); }),
+            getGlobalTypingsCacheLocation: ts.maybeBind(host, host.getGlobalTypingsCacheLocation),
+            getSourceFiles: function () { return program.getSourceFiles(); },
+            redirectTargetsMap: program.redirectTargetsMap,
+            getProjectReferenceRedirect: function (fileName) { return program.getProjectReferenceRedirect(fileName); },
+            isSourceOfProjectReferenceRedirect: function (fileName) { return program.isSourceOfProjectReferenceRedirect(fileName); },
+        };
     }
-    ts.hostUsesCaseSensitiveFileNames = hostUsesCaseSensitiveFileNames;
-    function hostGetCanonicalFileName(host) {
-        return ts.createGetCanonicalFileName(hostUsesCaseSensitiveFileNames(host));
+    ts.createModuleSpecifierResolutionHost = createModuleSpecifierResolutionHost;
+    function getModuleSpecifierResolverHost(program, host) {
+        return __assign(__assign({}, createModuleSpecifierResolutionHost(program, host)), { getCommonSourceDirectory: function () { return program.getCommonSourceDirectory(); } });
     }
-    ts.hostGetCanonicalFileName = hostGetCanonicalFileName;
+    ts.getModuleSpecifierResolverHost = getModuleSpecifierResolverHost;
     function makeImportIfNecessary(defaultImport, namedImports, moduleSpecifier, quotePreference) {
         return defaultImport || namedImports && namedImports.length ? makeImport(defaultImport, namedImports, moduleSpecifier, quotePreference) : undefined;
     }
@@ -109350,6 +109638,7 @@ var ts;
         return checker.getTypeAtLocation(caseClause.parent.parent.expression);
     }
     ts.getSwitchedType = getSwitchedType;
+    ts.ANONYMOUS = "anonymous function";
     function getTypeNodeIfAccessible(type, enclosingScope, program, host) {
         var checker = program.getTypeChecker();
         var typeIsAccessible = true;
@@ -109361,14 +109650,7 @@ var ts;
             reportInaccessibleThisError: notAccessible,
             reportPrivateInBaseOfClassExpression: notAccessible,
             reportInaccessibleUniqueSymbolError: notAccessible,
-            moduleResolverHost: {
-                readFile: host.readFile,
-                fileExists: host.fileExists,
-                directoryExists: host.directoryExists,
-                getSourceFiles: program.getSourceFiles,
-                getCurrentDirectory: program.getCurrentDirectory,
-                getCommonSourceDirectory: program.getCommonSourceDirectory,
-            }
+            moduleResolverHost: getModuleSpecifierResolverHost(program, host)
         });
         return typeIsAccessible ? res : undefined;
     }
@@ -115696,17 +115978,19 @@ var ts;
                 return exposedByParent ? scope.getSourceFile() : scope; // TODO: GH#18217
             }
             /** Used as a quick check for whether a symbol is used at all in a file (besides its definition). */
-            function isSymbolReferencedInFile(definition, checker, sourceFile) {
-                return eachSymbolReferenceInFile(definition, checker, sourceFile, function () { return true; }) || false;
+            function isSymbolReferencedInFile(definition, checker, sourceFile, searchContainer) {
+                if (searchContainer === void 0) { searchContainer = sourceFile; }
+                return eachSymbolReferenceInFile(definition, checker, sourceFile, function () { return true; }, searchContainer) || false;
             }
             Core.isSymbolReferencedInFile = isSymbolReferencedInFile;
-            function eachSymbolReferenceInFile(definition, checker, sourceFile, cb) {
+            function eachSymbolReferenceInFile(definition, checker, sourceFile, cb, searchContainer) {
+                if (searchContainer === void 0) { searchContainer = sourceFile; }
                 var symbol = ts.isParameterPropertyDeclaration(definition.parent, definition.parent.parent)
                     ? ts.first(checker.getSymbolsOfParameterPropertyDeclaration(definition.parent, definition.text))
                     : checker.getSymbolAtLocation(definition);
                 if (!symbol)
                     return undefined;
-                for (var _i = 0, _a = getPossibleSymbolReferenceNodes(sourceFile, symbol.name); _i < _a.length; _i++) {
+                for (var _i = 0, _a = getPossibleSymbolReferenceNodes(sourceFile, symbol.name, searchContainer); _i < _a.length; _i++) {
                     var token = _a[_i];
                     if (!ts.isIdentifier(token) || token === definition || token.escapedText !== definition.escapedText)
                         continue;
@@ -117095,7 +117379,7 @@ var ts;
                     : getSourceFileToImport(importedModuleSymbol, importLiteral, sourceFile, program, host, oldToNew);
                 // Need an update if the imported file moved, or the importing file moved and was using a relative path.
                 return toImport !== undefined && (toImport.updated || (importingSourceFileMoved && ts.pathIsRelative(importLiteral.text)))
-                    ? ts.moduleSpecifiers.updateModuleSpecifier(program.getCompilerOptions(), newImportFromPath, toImport.newFileName, host, allFiles, program.redirectTargetsMap, importLiteral.text)
+                    ? ts.moduleSpecifiers.updateModuleSpecifier(program.getCompilerOptions(), newImportFromPath, toImport.newFileName, ts.createModuleSpecifierResolutionHost(program, host), importLiteral.text)
                     : undefined;
             });
         };
@@ -117420,7 +117704,7 @@ var ts;
             function getConstructSignatureDefinition() {
                 // Applicable only if we are in a new expression, or we are on a constructor declaration
                 // and in either case the symbol has a construct signature definition, i.e. class
-                if (symbol.flags & 32 /* Class */ && !(symbol.flags & 16 /* Function */) && (ts.isNewExpressionTarget(node) || node.kind === 130 /* ConstructorKeyword */)) {
+                if (symbol.flags & 32 /* Class */ && !(symbol.flags & (16 /* Function */ | 3 /* Variable */)) && (ts.isNewExpressionTarget(node) || node.kind === 130 /* ConstructorKeyword */)) {
                     var cls = ts.find(filteredDeclarations, ts.isClassLike) || ts.Debug.fail("Expected declaration to have at least one class-like declaration");
                     return getSignatureDefinition(cls.members, /*selectConstructors*/ true);
                 }
@@ -123903,8 +124187,8 @@ var ts;
                     },
                     getIndentation: function () { return indentation; },
                     getDelta: getDelta,
-                    recomputeIndentation: function (lineAdded) {
-                        if (node.parent && formatting.SmartIndenter.shouldIndentChildNode(options, node.parent, node, sourceFile)) {
+                    recomputeIndentation: function (lineAdded, parent) {
+                        if (formatting.SmartIndenter.shouldIndentChildNode(options, parent, node, sourceFile)) {
                             indentation += lineAdded ? options.indentSize : -options.indentSize;
                             delta = formatting.SmartIndenter.shouldIndentChildNode(options, node) ? options.indentSize : 0;
                         }
@@ -124238,7 +124522,7 @@ var ts;
                                 // Handle the case where the next line is moved to be the end of this line.
                                 // In this case we don't indent the next line in the next pass.
                                 if (currentParent.getStart(sourceFile) === currentItem.pos) {
-                                    dynamicIndentation.recomputeIndentation(/*lineAddedByFormatting*/ false);
+                                    dynamicIndentation.recomputeIndentation(/*lineAddedByFormatting*/ false, contextNode);
                                 }
                                 break;
                             case 1 /* LineAdded */:
@@ -124246,7 +124530,7 @@ var ts;
                                 // In this case we indent token2 in the next pass but we set
                                 // sameLineIndent flag to notify the indenter that the indentation is within the line.
                                 if (currentParent.getStart(sourceFile) === currentItem.pos) {
-                                    dynamicIndentation.recomputeIndentation(/*lineAddedByFormatting*/ true);
+                                    dynamicIndentation.recomputeIndentation(/*lineAddedByFormatting*/ true, contextNode);
                                 }
                                 break;
                             default:
@@ -125362,9 +125646,18 @@ var ts;
                     suffix: (ts.isLineBreak(sourceFile.text.charCodeAt(pos)) ? "" : this.newLineCharacter) + (blankLineBetween ? this.newLineCharacter : ""),
                 });
             };
+            ChangeTracker.prototype.insertFirstParameter = function (sourceFile, parameters, newParam) {
+                var p0 = ts.firstOrUndefined(parameters);
+                if (p0) {
+                    this.insertNodeBefore(sourceFile, p0, newParam);
+                }
+                else {
+                    this.insertNodeAt(sourceFile, parameters.pos, newParam);
+                }
+            };
             ChangeTracker.prototype.insertNodeBefore = function (sourceFile, before, newNode, blankLineBetween) {
                 if (blankLineBetween === void 0) { blankLineBetween = false; }
-                this.insertNodeAt(sourceFile, getAdjustedStartPosition(sourceFile, before, {}), newNode, this.getOptionsForInsertNodeBefore(before, blankLineBetween));
+                this.insertNodeAt(sourceFile, getAdjustedStartPosition(sourceFile, before, {}), newNode, this.getOptionsForInsertNodeBefore(before, newNode, blankLineBetween));
             };
             ChangeTracker.prototype.insertModifierBefore = function (sourceFile, modifier, before) {
                 var pos = before.getStart(sourceFile);
@@ -125440,7 +125733,7 @@ var ts;
                 var start = (ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile) || ts.first(node.parameters)).getStart(sourceFile);
                 this.insertNodesAt(sourceFile, start, typeParameters, { prefix: "<", suffix: ">" });
             };
-            ChangeTracker.prototype.getOptionsForInsertNodeBefore = function (before, doubleNewlines) {
+            ChangeTracker.prototype.getOptionsForInsertNodeBefore = function (before, inserted, doubleNewlines) {
                 if (ts.isStatement(before) || ts.isClassElement(before)) {
                     return { suffix: doubleNewlines ? this.newLineCharacter + this.newLineCharacter : this.newLineCharacter };
                 }
@@ -125448,7 +125741,7 @@ var ts;
                     return { suffix: ", " };
                 }
                 else if (ts.isParameter(before)) {
-                    return {};
+                    return ts.isParameter(inserted) ? { suffix: ", " } : {};
                 }
                 else if (ts.isStringLiteral(before) && ts.isImportDeclaration(before.parent) || ts.isNamedImports(before)) {
                     return { suffix: ", " };
@@ -125909,7 +126202,7 @@ var ts;
             function getNonformattedText(node, sourceFile, newLineCharacter) {
                 var writer = createWriter(newLineCharacter);
                 var newLine = newLineCharacter === "\n" ? 1 /* LineFeed */ : 0 /* CarriageReturnLineFeed */;
-                ts.createPrinter({ newLine: newLine, neverAsciiEscape: true }, writer).writeNode(4 /* Unspecified */, node, sourceFile, writer);
+                ts.createPrinter({ newLine: newLine, neverAsciiEscape: true, preserveSourceNewlines: true }, writer).writeNode(4 /* Unspecified */, node, sourceFile, writer);
                 return { text: writer.getText(), node: assignPositionsToNode(node) };
             }
             changesToText.getNonformattedText = getNonformattedText;
@@ -126030,8 +126323,8 @@ var ts;
                 writer.writeSymbol(s, sym);
                 setLastNonTriviaPosition(s, /*force*/ false);
             }
-            function writeLine() {
-                writer.writeLine();
+            function writeLine(force) {
+                writer.writeLine(force);
             }
             function increaseIndent() {
                 writer.increaseIndent();
@@ -126241,15 +126534,21 @@ var ts;
                     case 257 /* NamespaceImport */:
                         deleteImportBinding(changes, sourceFile, node);
                         break;
+                    case 26 /* SemicolonToken */:
+                        deleteNode(changes, sourceFile, node, { trailingTriviaOption: TrailingTriviaOption.Exclude });
+                        break;
+                    case 94 /* FunctionKeyword */:
+                        deleteNode(changes, sourceFile, node, { leadingTriviaOption: LeadingTriviaOption.Exclude });
+                        break;
                     default:
                         if (ts.isImportClause(node.parent) && node.parent.name === node) {
                             deleteDefaultImport(changes, sourceFile, node.parent);
                         }
-                        else if (ts.isCallLikeExpression(node.parent)) {
+                        else if (ts.isCallExpression(node.parent) && ts.contains(node.parent.arguments, node)) {
                             deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         }
                         else {
-                            deleteNode(changes, sourceFile, node, node.kind === 26 /* SemicolonToken */ ? { trailingTriviaOption: TrailingTriviaOption.Exclude } : undefined);
+                            deleteNode(changes, sourceFile, node);
                         }
                 }
             }
@@ -126438,7 +126737,7 @@ var ts;
         codefix.eachDiagnostic = eachDiagnostic;
         function getDiagnostics(_a) {
             var program = _a.program, sourceFile = _a.sourceFile, cancellationToken = _a.cancellationToken;
-            return program.getSemanticDiagnostics(sourceFile, cancellationToken).concat(ts.computeSuggestionDiagnostics(sourceFile, program, cancellationToken));
+            return __spreadArrays(program.getSemanticDiagnostics(sourceFile, cancellationToken), program.getSyntacticDiagnostics(sourceFile, cancellationToken), ts.computeSuggestionDiagnostics(sourceFile, program, cancellationToken));
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
@@ -127216,987 +127515,6 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
-(function (ts) {
-    var codefix;
-    (function (codefix) {
-        var fixId = "inferFromUsage";
-        var errorCodes = [
-            // Variable declarations
-            ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code,
-            // Variable uses
-            ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code,
-            // Parameter declarations
-            ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code,
-            ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code,
-            // Get Accessor declarations
-            ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code,
-            ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code,
-            // Set Accessor declarations
-            ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code,
-            // Property declarations
-            ts.Diagnostics.Member_0_implicitly_has_an_1_type.code,
-            //// Suggestions
-            // Variable declarations
-            ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage.code,
-            // Variable uses
-            ts.Diagnostics.Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
-            // Parameter declarations
-            ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
-            ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code,
-            // Get Accessor declarations
-            ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_get_accessor_may_be_inferred_from_usage.code,
-            ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage.code,
-            // Set Accessor declarations
-            ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code,
-            // Property declarations
-            ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
-            // Function expressions and declarations
-            ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code,
-        ];
-        codefix.registerCodeFix({
-            errorCodes: errorCodes,
-            getCodeActions: function (context) {
-                var sourceFile = context.sourceFile, program = context.program, start = context.span.start, errorCode = context.errorCode, cancellationToken = context.cancellationToken, host = context.host, preferences = context.preferences;
-                var token = ts.getTokenAtPosition(sourceFile, start);
-                var declaration;
-                var changes = ts.textChanges.ChangeTracker.with(context, function (changes) { declaration = doChange(changes, sourceFile, token, errorCode, program, cancellationToken, /*markSeen*/ ts.returnTrue, host, preferences); });
-                var name = declaration && ts.getNameOfDeclaration(declaration);
-                return !name || changes.length === 0 ? undefined
-                    : [codefix.createCodeFixAction(fixId, changes, [getDiagnostic(errorCode, token), name.getText(sourceFile)], fixId, ts.Diagnostics.Infer_all_types_from_usage)];
-            },
-            fixIds: [fixId],
-            getAllCodeActions: function (context) {
-                var sourceFile = context.sourceFile, program = context.program, cancellationToken = context.cancellationToken, host = context.host, preferences = context.preferences;
-                var markSeen = ts.nodeSeenTracker();
-                return codefix.codeFixAll(context, errorCodes, function (changes, err) {
-                    doChange(changes, sourceFile, ts.getTokenAtPosition(err.file, err.start), err.code, program, cancellationToken, markSeen, host, preferences);
-                });
-            },
-        });
-        function getDiagnostic(errorCode, token) {
-            switch (errorCode) {
-                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code:
-                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.isSetAccessorDeclaration(ts.getContainingFunction(token)) ? ts.Diagnostics.Infer_type_of_0_from_usage : ts.Diagnostics.Infer_parameter_types_from_usage; // TODO: GH#18217
-                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
-                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Infer_parameter_types_from_usage;
-                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
-                    return ts.Diagnostics.Infer_this_type_of_0_from_usage;
-                default:
-                    return ts.Diagnostics.Infer_type_of_0_from_usage;
-            }
-        }
-        /** Map suggestion code to error code */
-        function mapSuggestionDiagnostic(errorCode) {
-            switch (errorCode) {
-                case ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code;
-                case ts.Diagnostics.Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code;
-                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code;
-                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code;
-                case ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_get_accessor_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code;
-                case ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code;
-                case ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code;
-                case ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Member_0_implicitly_has_an_1_type.code;
-            }
-            return errorCode;
-        }
-        function doChange(changes, sourceFile, token, errorCode, program, cancellationToken, markSeen, host, preferences) {
-            if (!ts.isParameterPropertyModifier(token.kind) && token.kind !== 75 /* Identifier */ && token.kind !== 25 /* DotDotDotToken */ && token.kind !== 104 /* ThisKeyword */) {
-                return undefined;
-            }
-            var parent = token.parent;
-            var importAdder = codefix.createImportAdder(sourceFile, program, preferences, host);
-            errorCode = mapSuggestionDiagnostic(errorCode);
-            switch (errorCode) {
-                // Variable and Property declarations
-                case ts.Diagnostics.Member_0_implicitly_has_an_1_type.code:
-                case ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code:
-                    if ((ts.isVariableDeclaration(parent) && markSeen(parent)) || ts.isPropertyDeclaration(parent) || ts.isPropertySignature(parent)) { // handle bad location
-                        annotateVariableDeclaration(changes, importAdder, sourceFile, parent, program, host, cancellationToken);
-                        importAdder.writeFixes(changes);
-                        return parent;
-                    }
-                    if (ts.isPropertyAccessExpression(parent)) {
-                        var type = inferTypeForVariableFromUsage(parent.name, program, cancellationToken);
-                        var typeNode = ts.getTypeNodeIfAccessible(type, parent, program, host);
-                        if (typeNode) {
-                            // Note that the codefix will never fire with an existing `@type` tag, so there is no need to merge tags
-                            var typeTag = ts.createJSDocTypeTag(ts.createJSDocTypeExpression(typeNode), /*comment*/ "");
-                            addJSDocTags(changes, sourceFile, ts.cast(parent.parent.parent, ts.isExpressionStatement), [typeTag]);
-                        }
-                        importAdder.writeFixes(changes);
-                        return parent;
-                    }
-                    return undefined;
-                case ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code: {
-                    var symbol = program.getTypeChecker().getSymbolAtLocation(token);
-                    if (symbol && symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) && markSeen(symbol.valueDeclaration)) {
-                        annotateVariableDeclaration(changes, importAdder, sourceFile, symbol.valueDeclaration, program, host, cancellationToken);
-                        importAdder.writeFixes(changes);
-                        return symbol.valueDeclaration;
-                    }
-                    return undefined;
-                }
-            }
-            var containingFunction = ts.getContainingFunction(token);
-            if (containingFunction === undefined) {
-                return undefined;
-            }
-            var declaration;
-            switch (errorCode) {
-                // Parameter declarations
-                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code:
-                    if (ts.isSetAccessorDeclaration(containingFunction)) {
-                        annotateSetAccessor(changes, importAdder, sourceFile, containingFunction, program, host, cancellationToken);
-                        declaration = containingFunction;
-                        break;
-                    }
-                // falls through
-                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
-                    if (markSeen(containingFunction)) {
-                        var param = ts.cast(parent, ts.isParameter);
-                        annotateParameters(changes, importAdder, sourceFile, param, containingFunction, program, host, cancellationToken);
-                        declaration = param;
-                    }
-                    break;
-                // Get Accessor declarations
-                case ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code:
-                case ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code:
-                    if (ts.isGetAccessorDeclaration(containingFunction) && ts.isIdentifier(containingFunction.name)) {
-                        annotate(changes, importAdder, sourceFile, containingFunction, inferTypeForVariableFromUsage(containingFunction.name, program, cancellationToken), program, host);
-                        declaration = containingFunction;
-                    }
-                    break;
-                // Set Accessor declarations
-                case ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code:
-                    if (ts.isSetAccessorDeclaration(containingFunction)) {
-                        annotateSetAccessor(changes, importAdder, sourceFile, containingFunction, program, host, cancellationToken);
-                        declaration = containingFunction;
-                    }
-                    break;
-                // Function 'this'
-                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
-                    if (ts.textChanges.isThisTypeAnnotatable(containingFunction) && markSeen(containingFunction)) {
-                        annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken);
-                        declaration = containingFunction;
-                    }
-                    break;
-                default:
-                    return ts.Debug.fail(String(errorCode));
-            }
-            importAdder.writeFixes(changes);
-            return declaration;
-        }
-        function annotateVariableDeclaration(changes, importAdder, sourceFile, declaration, program, host, cancellationToken) {
-            if (ts.isIdentifier(declaration.name)) {
-                annotate(changes, importAdder, sourceFile, declaration, inferTypeForVariableFromUsage(declaration.name, program, cancellationToken), program, host);
-            }
-        }
-        function annotateParameters(changes, importAdder, sourceFile, parameterDeclaration, containingFunction, program, host, cancellationToken) {
-            if (!ts.isIdentifier(parameterDeclaration.name)) {
-                return;
-            }
-            var parameterInferences = inferTypeForParametersFromUsage(containingFunction, sourceFile, program, cancellationToken);
-            ts.Debug.assert(containingFunction.parameters.length === parameterInferences.length, "Parameter count and inference count should match");
-            if (ts.isInJSFile(containingFunction)) {
-                annotateJSDocParameters(changes, sourceFile, parameterInferences, program, host);
-            }
-            else {
-                var needParens = ts.isArrowFunction(containingFunction) && !ts.findChildOfKind(containingFunction, 20 /* OpenParenToken */, sourceFile);
-                if (needParens)
-                    changes.insertNodeBefore(sourceFile, ts.first(containingFunction.parameters), ts.createToken(20 /* OpenParenToken */));
-                for (var _i = 0, parameterInferences_1 = parameterInferences; _i < parameterInferences_1.length; _i++) {
-                    var _a = parameterInferences_1[_i], declaration = _a.declaration, type = _a.type;
-                    if (declaration && !declaration.type && !declaration.initializer) {
-                        annotate(changes, importAdder, sourceFile, declaration, type, program, host);
-                    }
-                }
-                if (needParens)
-                    changes.insertNodeAfter(sourceFile, ts.last(containingFunction.parameters), ts.createToken(21 /* CloseParenToken */));
-            }
-        }
-        function annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken) {
-            var references = getFunctionReferences(containingFunction, sourceFile, program, cancellationToken);
-            if (!references || !references.length) {
-                return;
-            }
-            var thisInference = inferTypeFromReferences(program, references, cancellationToken).thisParameter();
-            var typeNode = ts.getTypeNodeIfAccessible(thisInference, containingFunction, program, host);
-            if (!typeNode) {
-                return;
-            }
-            if (ts.isInJSFile(containingFunction)) {
-                annotateJSDocThis(changes, sourceFile, containingFunction, typeNode);
-            }
-            else {
-                changes.tryInsertThisTypeAnnotation(sourceFile, containingFunction, typeNode);
-            }
-        }
-        function annotateJSDocThis(changes, sourceFile, containingFunction, typeNode) {
-            addJSDocTags(changes, sourceFile, containingFunction, [
-                ts.createJSDocThisTag(ts.createJSDocTypeExpression(typeNode)),
-            ]);
-        }
-        function annotateSetAccessor(changes, importAdder, sourceFile, setAccessorDeclaration, program, host, cancellationToken) {
-            var param = ts.firstOrUndefined(setAccessorDeclaration.parameters);
-            if (param && ts.isIdentifier(setAccessorDeclaration.name) && ts.isIdentifier(param.name)) {
-                var type = inferTypeForVariableFromUsage(setAccessorDeclaration.name, program, cancellationToken);
-                if (type === program.getTypeChecker().getAnyType()) {
-                    type = inferTypeForVariableFromUsage(param.name, program, cancellationToken);
-                }
-                if (ts.isInJSFile(setAccessorDeclaration)) {
-                    annotateJSDocParameters(changes, sourceFile, [{ declaration: param, type: type }], program, host);
-                }
-                else {
-                    annotate(changes, importAdder, sourceFile, param, type, program, host);
-                }
-            }
-        }
-        function annotate(changes, importAdder, sourceFile, declaration, type, program, host) {
-            var typeNode = ts.getTypeNodeIfAccessible(type, declaration, program, host);
-            if (typeNode) {
-                if (ts.isInJSFile(sourceFile) && declaration.kind !== 159 /* PropertySignature */) {
-                    var parent = ts.isVariableDeclaration(declaration) ? ts.tryCast(declaration.parent.parent, ts.isVariableStatement) : declaration;
-                    if (!parent) {
-                        return;
-                    }
-                    var typeExpression = ts.createJSDocTypeExpression(typeNode);
-                    var typeTag = ts.isGetAccessorDeclaration(declaration) ? ts.createJSDocReturnTag(typeExpression, "") : ts.createJSDocTypeTag(typeExpression, "");
-                    addJSDocTags(changes, sourceFile, parent, [typeTag]);
-                }
-                else if (!tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, type, sourceFile, changes, importAdder, ts.getEmitScriptTarget(program.getCompilerOptions()))) {
-                    changes.tryInsertTypeAnnotation(sourceFile, declaration, typeNode);
-                }
-            }
-        }
-        function tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, type, sourceFile, changes, importAdder, scriptTarget) {
-            var importableReference = codefix.tryGetAutoImportableReferenceFromImportTypeNode(typeNode, type, scriptTarget);
-            if (importableReference && changes.tryInsertTypeAnnotation(sourceFile, declaration, importableReference.typeReference)) {
-                ts.forEach(importableReference.symbols, function (s) { return importAdder.addImportFromExportedSymbol(s, /*usageIsTypeOnly*/ true); });
-                return true;
-            }
-            return false;
-        }
-        function annotateJSDocParameters(changes, sourceFile, parameterInferences, program, host) {
-            var signature = parameterInferences.length && parameterInferences[0].declaration.parent;
-            if (!signature) {
-                return;
-            }
-            var paramTags = ts.mapDefined(parameterInferences, function (inference) {
-                var param = inference.declaration;
-                // only infer parameters that have (1) no type and (2) an accessible inferred type
-                if (param.initializer || ts.getJSDocType(param) || !ts.isIdentifier(param.name))
-                    return;
-                var typeNode = inference.type && ts.getTypeNodeIfAccessible(inference.type, param, program, host);
-                var name = ts.getSynthesizedClone(param.name);
-                ts.setEmitFlags(name, 1536 /* NoComments */ | 2048 /* NoNestedComments */);
-                return typeNode && ts.createJSDocParamTag(name, !!inference.isOptional, ts.createJSDocTypeExpression(typeNode), "");
-            });
-            addJSDocTags(changes, sourceFile, signature, paramTags);
-        }
-        function addJSDocTags(changes, sourceFile, parent, newTags) {
-            var comments = ts.mapDefined(parent.jsDoc, function (j) { return j.comment; });
-            var oldTags = ts.flatMapToMutable(parent.jsDoc, function (j) { return j.tags; });
-            var unmergedNewTags = newTags.filter(function (newTag) { return !oldTags || !oldTags.some(function (tag, i) {
-                var merged = tryMergeJsdocTags(tag, newTag);
-                if (merged)
-                    oldTags[i] = merged;
-                return !!merged;
-            }); });
-            var tag = ts.createJSDocComment(comments.join("\n"), ts.createNodeArray(__spreadArrays((oldTags || ts.emptyArray), unmergedNewTags)));
-            var jsDocNode = parent.kind === 203 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
-            jsDocNode.jsDoc = parent.jsDoc;
-            jsDocNode.jsDocCache = parent.jsDocCache;
-            changes.insertJsdocCommentBefore(sourceFile, jsDocNode, tag);
-        }
-        function getJsDocNodeForArrowFunction(signature) {
-            if (signature.parent.kind === 160 /* PropertyDeclaration */) {
-                return signature.parent;
-            }
-            return signature.parent.parent;
-        }
-        function tryMergeJsdocTags(oldTag, newTag) {
-            if (oldTag.kind !== newTag.kind) {
-                return undefined;
-            }
-            switch (oldTag.kind) {
-                case 318 /* JSDocParameterTag */: {
-                    var oldParam = oldTag;
-                    var newParam = newTag;
-                    return ts.isIdentifier(oldParam.name) && ts.isIdentifier(newParam.name) && oldParam.name.escapedText === newParam.name.escapedText
-                        ? ts.createJSDocParamTag(newParam.name, newParam.isBracketed, newParam.typeExpression, oldParam.comment)
-                        : undefined;
-                }
-                case 319 /* JSDocReturnTag */:
-                    return ts.createJSDocReturnTag(newTag.typeExpression, oldTag.comment);
-            }
-        }
-        function getReferences(token, program, cancellationToken) {
-            // Position shouldn't matter since token is not a SourceFile.
-            return ts.mapDefined(ts.FindAllReferences.getReferenceEntriesForNode(-1, token, program, program.getSourceFiles(), cancellationToken), function (entry) {
-                return entry.kind !== 0 /* Span */ ? ts.tryCast(entry.node, ts.isIdentifier) : undefined;
-            });
-        }
-        function inferTypeForVariableFromUsage(token, program, cancellationToken) {
-            var references = getReferences(token, program, cancellationToken);
-            return inferTypeFromReferences(program, references, cancellationToken).single();
-        }
-        function inferTypeForParametersFromUsage(func, sourceFile, program, cancellationToken) {
-            var references = getFunctionReferences(func, sourceFile, program, cancellationToken);
-            return references && inferTypeFromReferences(program, references, cancellationToken).parameters(func) ||
-                func.parameters.map(function (p) { return ({
-                    declaration: p,
-                    type: ts.isIdentifier(p.name) ? inferTypeForVariableFromUsage(p.name, program, cancellationToken) : program.getTypeChecker().getAnyType()
-                }); });
-        }
-        function getFunctionReferences(containingFunction, sourceFile, program, cancellationToken) {
-            var searchToken;
-            switch (containingFunction.kind) {
-                case 163 /* Constructor */:
-                    searchToken = ts.findChildOfKind(containingFunction, 130 /* ConstructorKeyword */, sourceFile);
-                    break;
-                case 203 /* ArrowFunction */:
-                case 202 /* FunctionExpression */:
-                    var parent = containingFunction.parent;
-                    searchToken = ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name) ?
-                        parent.name :
-                        containingFunction.name;
-                    break;
-                case 245 /* FunctionDeclaration */:
-                case 162 /* MethodDeclaration */:
-                    searchToken = containingFunction.name;
-                    break;
-            }
-            if (!searchToken) {
-                return undefined;
-            }
-            return getReferences(searchToken, program, cancellationToken);
-        }
-        function inferTypeFromReferences(program, references, cancellationToken) {
-            var checker = program.getTypeChecker();
-            var builtinConstructors = {
-                string: function () { return checker.getStringType(); },
-                number: function () { return checker.getNumberType(); },
-                Array: function (t) { return checker.createArrayType(t); },
-                Promise: function (t) { return checker.createPromiseType(t); },
-            };
-            var builtins = [
-                checker.getStringType(),
-                checker.getNumberType(),
-                checker.createArrayType(checker.getAnyType()),
-                checker.createPromiseType(checker.getAnyType()),
-            ];
-            return {
-                single: single,
-                parameters: parameters,
-                thisParameter: thisParameter,
-            };
-            function createEmptyUsage() {
-                return {
-                    isNumber: undefined,
-                    isString: undefined,
-                    isNumberOrString: undefined,
-                    candidateTypes: undefined,
-                    properties: undefined,
-                    calls: undefined,
-                    constructs: undefined,
-                    numberIndex: undefined,
-                    stringIndex: undefined,
-                    candidateThisTypes: undefined,
-                    inferredTypes: undefined,
-                };
-            }
-            function combineUsages(usages) {
-                var combinedProperties = ts.createUnderscoreEscapedMap();
-                for (var _i = 0, usages_1 = usages; _i < usages_1.length; _i++) {
-                    var u = usages_1[_i];
-                    if (u.properties) {
-                        u.properties.forEach(function (p, name) {
-                            if (!combinedProperties.has(name)) {
-                                combinedProperties.set(name, []);
-                            }
-                            combinedProperties.get(name).push(p);
-                        });
-                    }
-                }
-                var properties = ts.createUnderscoreEscapedMap();
-                combinedProperties.forEach(function (ps, name) {
-                    properties.set(name, combineUsages(ps));
-                });
-                return {
-                    isNumber: usages.some(function (u) { return u.isNumber; }),
-                    isString: usages.some(function (u) { return u.isString; }),
-                    isNumberOrString: usages.some(function (u) { return u.isNumberOrString; }),
-                    candidateTypes: ts.flatMap(usages, function (u) { return u.candidateTypes; }),
-                    properties: properties,
-                    calls: ts.flatMap(usages, function (u) { return u.calls; }),
-                    constructs: ts.flatMap(usages, function (u) { return u.constructs; }),
-                    numberIndex: ts.forEach(usages, function (u) { return u.numberIndex; }),
-                    stringIndex: ts.forEach(usages, function (u) { return u.stringIndex; }),
-                    candidateThisTypes: ts.flatMap(usages, function (u) { return u.candidateThisTypes; }),
-                    inferredTypes: undefined,
-                };
-            }
-            function single() {
-                return combineTypes(inferTypesFromReferencesSingle(references));
-            }
-            function parameters(declaration) {
-                if (references.length === 0 || !declaration.parameters) {
-                    return undefined;
-                }
-                var usage = createEmptyUsage();
-                for (var _i = 0, references_2 = references; _i < references_2.length; _i++) {
-                    var reference = references_2[_i];
-                    cancellationToken.throwIfCancellationRequested();
-                    calculateUsageOfNode(reference, usage);
-                }
-                var calls = __spreadArrays(usage.constructs || [], usage.calls || []);
-                return declaration.parameters.map(function (parameter, parameterIndex) {
-                    var types = [];
-                    var isRest = ts.isRestParameter(parameter);
-                    var isOptional = false;
-                    for (var _i = 0, calls_1 = calls; _i < calls_1.length; _i++) {
-                        var call = calls_1[_i];
-                        if (call.argumentTypes.length <= parameterIndex) {
-                            isOptional = ts.isInJSFile(declaration);
-                            types.push(checker.getUndefinedType());
-                        }
-                        else if (isRest) {
-                            for (var i = parameterIndex; i < call.argumentTypes.length; i++) {
-                                types.push(checker.getBaseTypeOfLiteralType(call.argumentTypes[i]));
-                            }
-                        }
-                        else {
-                            types.push(checker.getBaseTypeOfLiteralType(call.argumentTypes[parameterIndex]));
-                        }
-                    }
-                    if (ts.isIdentifier(parameter.name)) {
-                        var inferred = inferTypesFromReferencesSingle(getReferences(parameter.name, program, cancellationToken));
-                        types.push.apply(types, (isRest ? ts.mapDefined(inferred, checker.getElementTypeOfArrayType) : inferred));
-                    }
-                    var type = combineTypes(types);
-                    return {
-                        type: isRest ? checker.createArrayType(type) : type,
-                        isOptional: isOptional && !isRest,
-                        declaration: parameter
-                    };
-                });
-            }
-            function thisParameter() {
-                var usage = createEmptyUsage();
-                for (var _i = 0, references_3 = references; _i < references_3.length; _i++) {
-                    var reference = references_3[_i];
-                    cancellationToken.throwIfCancellationRequested();
-                    calculateUsageOfNode(reference, usage);
-                }
-                return combineTypes(usage.candidateThisTypes || ts.emptyArray);
-            }
-            function inferTypesFromReferencesSingle(references) {
-                var usage = createEmptyUsage();
-                for (var _i = 0, references_4 = references; _i < references_4.length; _i++) {
-                    var reference = references_4[_i];
-                    cancellationToken.throwIfCancellationRequested();
-                    calculateUsageOfNode(reference, usage);
-                }
-                return inferTypes(usage);
-            }
-            function calculateUsageOfNode(node, usage) {
-                while (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
-                    node = node.parent;
-                }
-                switch (node.parent.kind) {
-                    case 227 /* ExpressionStatement */:
-                        addCandidateType(usage, checker.getVoidType());
-                        break;
-                    case 209 /* PostfixUnaryExpression */:
-                        usage.isNumber = true;
-                        break;
-                    case 208 /* PrefixUnaryExpression */:
-                        inferTypeFromPrefixUnaryExpression(node.parent, usage);
-                        break;
-                    case 210 /* BinaryExpression */:
-                        inferTypeFromBinaryExpression(node, node.parent, usage);
-                        break;
-                    case 278 /* CaseClause */:
-                    case 279 /* DefaultClause */:
-                        inferTypeFromSwitchStatementLabel(node.parent, usage);
-                        break;
-                    case 197 /* CallExpression */:
-                    case 198 /* NewExpression */:
-                        if (node.parent.expression === node) {
-                            inferTypeFromCallExpression(node.parent, usage);
-                        }
-                        else {
-                            inferTypeFromContextualType(node, usage);
-                        }
-                        break;
-                    case 195 /* PropertyAccessExpression */:
-                        inferTypeFromPropertyAccessExpression(node.parent, usage);
-                        break;
-                    case 196 /* ElementAccessExpression */:
-                        inferTypeFromPropertyElementExpression(node.parent, node, usage);
-                        break;
-                    case 282 /* PropertyAssignment */:
-                    case 283 /* ShorthandPropertyAssignment */:
-                        inferTypeFromPropertyAssignment(node.parent, usage);
-                        break;
-                    case 160 /* PropertyDeclaration */:
-                        inferTypeFromPropertyDeclaration(node.parent, usage);
-                        break;
-                    case 243 /* VariableDeclaration */: {
-                        var _a = node.parent, name = _a.name, initializer = _a.initializer;
-                        if (node === name) {
-                            if (initializer) { // This can happen for `let x = null;` which still has an implicit-any error.
-                                addCandidateType(usage, checker.getTypeAtLocation(initializer));
-                            }
-                            break;
-                        }
-                    }
-                    // falls through
-                    default:
-                        return inferTypeFromContextualType(node, usage);
-                }
-            }
-            function inferTypeFromContextualType(node, usage) {
-                if (ts.isExpressionNode(node)) {
-                    addCandidateType(usage, checker.getContextualType(node));
-                }
-            }
-            function inferTypeFromPrefixUnaryExpression(node, usage) {
-                switch (node.operator) {
-                    case 45 /* PlusPlusToken */:
-                    case 46 /* MinusMinusToken */:
-                    case 40 /* MinusToken */:
-                    case 54 /* TildeToken */:
-                        usage.isNumber = true;
-                        break;
-                    case 39 /* PlusToken */:
-                        usage.isNumberOrString = true;
-                        break;
-                    // case SyntaxKind.ExclamationToken:
-                    // no inferences here;
-                }
-            }
-            function inferTypeFromBinaryExpression(node, parent, usage) {
-                switch (parent.operatorToken.kind) {
-                    // ExponentiationOperator
-                    case 42 /* AsteriskAsteriskToken */:
-                    // MultiplicativeOperator
-                    // falls through
-                    case 41 /* AsteriskToken */:
-                    case 43 /* SlashToken */:
-                    case 44 /* PercentToken */:
-                    // ShiftOperator
-                    // falls through
-                    case 47 /* LessThanLessThanToken */:
-                    case 48 /* GreaterThanGreaterThanToken */:
-                    case 49 /* GreaterThanGreaterThanGreaterThanToken */:
-                    // BitwiseOperator
-                    // falls through
-                    case 50 /* AmpersandToken */:
-                    case 51 /* BarToken */:
-                    case 52 /* CaretToken */:
-                    // CompoundAssignmentOperator
-                    // falls through
-                    case 64 /* MinusEqualsToken */:
-                    case 66 /* AsteriskAsteriskEqualsToken */:
-                    case 65 /* AsteriskEqualsToken */:
-                    case 67 /* SlashEqualsToken */:
-                    case 68 /* PercentEqualsToken */:
-                    case 72 /* AmpersandEqualsToken */:
-                    case 73 /* BarEqualsToken */:
-                    case 74 /* CaretEqualsToken */:
-                    case 69 /* LessThanLessThanEqualsToken */:
-                    case 71 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                    case 70 /* GreaterThanGreaterThanEqualsToken */:
-                    // AdditiveOperator
-                    // falls through
-                    case 40 /* MinusToken */:
-                    // RelationalOperator
-                    // falls through
-                    case 29 /* LessThanToken */:
-                    case 32 /* LessThanEqualsToken */:
-                    case 31 /* GreaterThanToken */:
-                    case 33 /* GreaterThanEqualsToken */:
-                        var operandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
-                        if (operandType.flags & 1056 /* EnumLike */) {
-                            addCandidateType(usage, operandType);
-                        }
-                        else {
-                            usage.isNumber = true;
-                        }
-                        break;
-                    case 63 /* PlusEqualsToken */:
-                    case 39 /* PlusToken */:
-                        var otherOperandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
-                        if (otherOperandType.flags & 1056 /* EnumLike */) {
-                            addCandidateType(usage, otherOperandType);
-                        }
-                        else if (otherOperandType.flags & 296 /* NumberLike */) {
-                            usage.isNumber = true;
-                        }
-                        else if (otherOperandType.flags & 132 /* StringLike */) {
-                            usage.isString = true;
-                        }
-                        else if (otherOperandType.flags & 1 /* Any */) {
-                            // do nothing, maybe we'll learn something elsewhere
-                        }
-                        else {
-                            usage.isNumberOrString = true;
-                        }
-                        break;
-                    //  AssignmentOperators
-                    case 62 /* EqualsToken */:
-                    case 34 /* EqualsEqualsToken */:
-                    case 36 /* EqualsEqualsEqualsToken */:
-                    case 37 /* ExclamationEqualsEqualsToken */:
-                    case 35 /* ExclamationEqualsToken */:
-                        addCandidateType(usage, checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left));
-                        break;
-                    case 97 /* InKeyword */:
-                        if (node === parent.left) {
-                            usage.isString = true;
-                        }
-                        break;
-                    // LogicalOperator Or NullishCoalescing
-                    case 56 /* BarBarToken */:
-                    case 60 /* QuestionQuestionToken */:
-                        if (node === parent.left &&
-                            (node.parent.parent.kind === 243 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
-                            // var x = x || {};
-                            // TODO: use getFalsyflagsOfType
-                            addCandidateType(usage, checker.getTypeAtLocation(parent.right));
-                        }
-                        break;
-                    case 55 /* AmpersandAmpersandToken */:
-                    case 27 /* CommaToken */:
-                    case 98 /* InstanceOfKeyword */:
-                        // nothing to infer here
-                        break;
-                }
-            }
-            function inferTypeFromSwitchStatementLabel(parent, usage) {
-                addCandidateType(usage, checker.getTypeAtLocation(parent.parent.parent.expression));
-            }
-            function inferTypeFromCallExpression(parent, usage) {
-                var call = {
-                    argumentTypes: [],
-                    return_: createEmptyUsage()
-                };
-                if (parent.arguments) {
-                    for (var _i = 0, _a = parent.arguments; _i < _a.length; _i++) {
-                        var argument = _a[_i];
-                        call.argumentTypes.push(checker.getTypeAtLocation(argument));
-                    }
-                }
-                calculateUsageOfNode(parent, call.return_);
-                if (parent.kind === 197 /* CallExpression */) {
-                    (usage.calls || (usage.calls = [])).push(call);
-                }
-                else {
-                    (usage.constructs || (usage.constructs = [])).push(call);
-                }
-            }
-            function inferTypeFromPropertyAccessExpression(parent, usage) {
-                var name = ts.escapeLeadingUnderscores(parent.name.text);
-                if (!usage.properties) {
-                    usage.properties = ts.createUnderscoreEscapedMap();
-                }
-                var propertyUsage = usage.properties.get(name) || createEmptyUsage();
-                calculateUsageOfNode(parent, propertyUsage);
-                usage.properties.set(name, propertyUsage);
-            }
-            function inferTypeFromPropertyElementExpression(parent, node, usage) {
-                if (node === parent.argumentExpression) {
-                    usage.isNumberOrString = true;
-                    return;
-                }
-                else {
-                    var indexType = checker.getTypeAtLocation(parent.argumentExpression);
-                    var indexUsage = createEmptyUsage();
-                    calculateUsageOfNode(parent, indexUsage);
-                    if (indexType.flags & 296 /* NumberLike */) {
-                        usage.numberIndex = indexUsage;
-                    }
-                    else {
-                        usage.stringIndex = indexUsage;
-                    }
-                }
-            }
-            function inferTypeFromPropertyAssignment(assignment, usage) {
-                var nodeWithRealType = ts.isVariableDeclaration(assignment.parent.parent) ?
-                    assignment.parent.parent :
-                    assignment.parent;
-                addCandidateThisType(usage, checker.getTypeAtLocation(nodeWithRealType));
-            }
-            function inferTypeFromPropertyDeclaration(declaration, usage) {
-                addCandidateThisType(usage, checker.getTypeAtLocation(declaration.parent));
-            }
-            function removeLowPriorityInferences(inferences, priorities) {
-                var toRemove = [];
-                for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
-                    var i = inferences_1[_i];
-                    for (var _a = 0, priorities_1 = priorities; _a < priorities_1.length; _a++) {
-                        var _b = priorities_1[_a], high = _b.high, low = _b.low;
-                        if (high(i)) {
-                            ts.Debug.assert(!low(i), "Priority can't have both low and high");
-                            toRemove.push(low);
-                        }
-                    }
-                }
-                return inferences.filter(function (i) { return toRemove.every(function (f) { return !f(i); }); });
-            }
-            function combineFromUsage(usage) {
-                return combineTypes(inferTypes(usage));
-            }
-            function combineTypes(inferences) {
-                if (!inferences.length)
-                    return checker.getAnyType();
-                // 1. string or number individually override string | number
-                // 2. non-any, non-void overrides any or void
-                // 3. non-nullable, non-any, non-void, non-anonymous overrides anonymous types
-                var stringNumber = checker.getUnionType([checker.getStringType(), checker.getNumberType()]);
-                var priorities = [
-                    {
-                        high: function (t) { return t === checker.getStringType() || t === checker.getNumberType(); },
-                        low: function (t) { return t === stringNumber; }
-                    },
-                    {
-                        high: function (t) { return !(t.flags & (1 /* Any */ | 16384 /* Void */)); },
-                        low: function (t) { return !!(t.flags & (1 /* Any */ | 16384 /* Void */)); }
-                    },
-                    {
-                        high: function (t) { return !(t.flags & (98304 /* Nullable */ | 1 /* Any */ | 16384 /* Void */)) && !(ts.getObjectFlags(t) & 16 /* Anonymous */); },
-                        low: function (t) { return !!(ts.getObjectFlags(t) & 16 /* Anonymous */); }
-                    }
-                ];
-                var good = removeLowPriorityInferences(inferences, priorities);
-                var anons = good.filter(function (i) { return ts.getObjectFlags(i) & 16 /* Anonymous */; });
-                if (anons.length) {
-                    good = good.filter(function (i) { return !(ts.getObjectFlags(i) & 16 /* Anonymous */); });
-                    good.push(combineAnonymousTypes(anons));
-                }
-                return checker.getWidenedType(checker.getUnionType(good.map(checker.getBaseTypeOfLiteralType), 2 /* Subtype */));
-            }
-            function combineAnonymousTypes(anons) {
-                if (anons.length === 1) {
-                    return anons[0];
-                }
-                var calls = [];
-                var constructs = [];
-                var stringIndices = [];
-                var numberIndices = [];
-                var stringIndexReadonly = false;
-                var numberIndexReadonly = false;
-                var props = ts.createMultiMap();
-                for (var _i = 0, anons_1 = anons; _i < anons_1.length; _i++) {
-                    var anon = anons_1[_i];
-                    for (var _a = 0, _b = checker.getPropertiesOfType(anon); _a < _b.length; _a++) {
-                        var p = _b[_a];
-                        props.add(p.name, checker.getTypeOfSymbolAtLocation(p, p.valueDeclaration));
-                    }
-                    calls.push.apply(calls, checker.getSignaturesOfType(anon, 0 /* Call */));
-                    constructs.push.apply(constructs, checker.getSignaturesOfType(anon, 1 /* Construct */));
-                    if (anon.stringIndexInfo) {
-                        stringIndices.push(anon.stringIndexInfo.type);
-                        stringIndexReadonly = stringIndexReadonly || anon.stringIndexInfo.isReadonly;
-                    }
-                    if (anon.numberIndexInfo) {
-                        numberIndices.push(anon.numberIndexInfo.type);
-                        numberIndexReadonly = numberIndexReadonly || anon.numberIndexInfo.isReadonly;
-                    }
-                }
-                var members = ts.mapEntries(props, function (name, types) {
-                    var isOptional = types.length < anons.length ? 16777216 /* Optional */ : 0;
-                    var s = checker.createSymbol(4 /* Property */ | isOptional, name);
-                    s.type = checker.getUnionType(types);
-                    return [name, s];
-                });
-                return checker.createAnonymousType(anons[0].symbol, members, calls, constructs, stringIndices.length ? checker.createIndexInfo(checker.getUnionType(stringIndices), stringIndexReadonly) : undefined, numberIndices.length ? checker.createIndexInfo(checker.getUnionType(numberIndices), numberIndexReadonly) : undefined);
-            }
-            function inferTypes(usage) {
-                var types = [];
-                if (usage.isNumber) {
-                    types.push(checker.getNumberType());
-                }
-                if (usage.isString) {
-                    types.push(checker.getStringType());
-                }
-                if (usage.isNumberOrString) {
-                    types.push(checker.getUnionType([checker.getStringType(), checker.getNumberType()]));
-                }
-                if (usage.numberIndex) {
-                    types.push(checker.createArrayType(combineFromUsage(usage.numberIndex)));
-                }
-                if (usage.properties && usage.properties.size
-                    || usage.calls && usage.calls.length
-                    || usage.constructs && usage.constructs.length
-                    || usage.stringIndex) {
-                    types.push(inferStructuralType(usage));
-                }
-                types.push.apply(types, (usage.candidateTypes || []).map(function (t) { return checker.getBaseTypeOfLiteralType(t); }));
-                types.push.apply(types, inferNamedTypesFromProperties(usage));
-                return types;
-            }
-            function inferStructuralType(usage) {
-                var members = ts.createUnderscoreEscapedMap();
-                if (usage.properties) {
-                    usage.properties.forEach(function (u, name) {
-                        var symbol = checker.createSymbol(4 /* Property */, name);
-                        symbol.type = combineFromUsage(u);
-                        members.set(name, symbol);
-                    });
-                }
-                var callSignatures = usage.calls ? [getSignatureFromCalls(usage.calls)] : [];
-                var constructSignatures = usage.constructs ? [getSignatureFromCalls(usage.constructs)] : [];
-                var stringIndexInfo = usage.stringIndex && checker.createIndexInfo(combineFromUsage(usage.stringIndex), /*isReadonly*/ false);
-                return checker.createAnonymousType(/*symbol*/ undefined, members, callSignatures, constructSignatures, stringIndexInfo, /*numberIndexInfo*/ undefined);
-            }
-            function inferNamedTypesFromProperties(usage) {
-                if (!usage.properties || !usage.properties.size)
-                    return [];
-                var types = builtins.filter(function (t) { return allPropertiesAreAssignableToUsage(t, usage); });
-                if (0 < types.length && types.length < 3) {
-                    return types.map(function (t) { return inferInstantiationFromUsage(t, usage); });
-                }
-                return [];
-            }
-            function allPropertiesAreAssignableToUsage(type, usage) {
-                if (!usage.properties)
-                    return false;
-                return !ts.forEachEntry(usage.properties, function (propUsage, name) {
-                    var source = checker.getTypeOfPropertyOfType(type, name);
-                    if (!source) {
-                        return true;
-                    }
-                    if (propUsage.calls) {
-                        var sigs = checker.getSignaturesOfType(source, 0 /* Call */);
-                        return !sigs.length || !checker.isTypeAssignableTo(source, getFunctionFromCalls(propUsage.calls));
-                    }
-                    else {
-                        return !checker.isTypeAssignableTo(source, combineFromUsage(propUsage));
-                    }
-                });
-            }
-            /**
-             * inference is limited to
-             * 1. generic types with a single parameter
-             * 2. inference to/from calls with a single signature
-             */
-            function inferInstantiationFromUsage(type, usage) {
-                if (!(ts.getObjectFlags(type) & 4 /* Reference */) || !usage.properties) {
-                    return type;
-                }
-                var generic = type.target;
-                var singleTypeParameter = ts.singleOrUndefined(generic.typeParameters);
-                if (!singleTypeParameter)
-                    return type;
-                var types = [];
-                usage.properties.forEach(function (propUsage, name) {
-                    var genericPropertyType = checker.getTypeOfPropertyOfType(generic, name);
-                    ts.Debug.assert(!!genericPropertyType, "generic should have all the properties of its reference.");
-                    types.push.apply(types, inferTypeParameters(genericPropertyType, combineFromUsage(propUsage), singleTypeParameter));
-                });
-                return builtinConstructors[type.symbol.escapedName](combineTypes(types));
-            }
-            function inferTypeParameters(genericType, usageType, typeParameter) {
-                if (genericType === typeParameter) {
-                    return [usageType];
-                }
-                else if (genericType.flags & 3145728 /* UnionOrIntersection */) {
-                    return ts.flatMap(genericType.types, function (t) { return inferTypeParameters(t, usageType, typeParameter); });
-                }
-                else if (genericType.flags & 134217728 /* Awaited */) {
-                    return inferTypeParameters(genericType.awaitedType, usageType, typeParameter);
-                }
-                else if (ts.getObjectFlags(genericType) & 4 /* Reference */ && ts.getObjectFlags(usageType) & 4 /* Reference */) {
-                    // this is wrong because we need a reference to the targetType to, so we can check that it's also a reference
-                    var genericArgs = checker.getTypeArguments(genericType);
-                    var usageArgs = checker.getTypeArguments(usageType);
-                    var types = [];
-                    if (genericArgs && usageArgs) {
-                        for (var i = 0; i < genericArgs.length; i++) {
-                            if (usageArgs[i]) {
-                                types.push.apply(types, inferTypeParameters(genericArgs[i], usageArgs[i], typeParameter));
-                            }
-                        }
-                    }
-                    return types;
-                }
-                var genericSigs = checker.getSignaturesOfType(genericType, 0 /* Call */);
-                var usageSigs = checker.getSignaturesOfType(usageType, 0 /* Call */);
-                if (genericSigs.length === 1 && usageSigs.length === 1) {
-                    return inferFromSignatures(genericSigs[0], usageSigs[0], typeParameter);
-                }
-                return [];
-            }
-            function inferFromSignatures(genericSig, usageSig, typeParameter) {
-                var types = [];
-                for (var i = 0; i < genericSig.parameters.length; i++) {
-                    var genericParam = genericSig.parameters[i];
-                    var usageParam = usageSig.parameters[i];
-                    var isRest = genericSig.declaration && ts.isRestParameter(genericSig.declaration.parameters[i]);
-                    if (!usageParam) {
-                        break;
-                    }
-                    var genericParamType = checker.getTypeOfSymbolAtLocation(genericParam, genericParam.valueDeclaration);
-                    var elementType = isRest && checker.getElementTypeOfArrayType(genericParamType);
-                    if (elementType) {
-                        genericParamType = elementType;
-                    }
-                    var targetType = usageParam.type || checker.getTypeOfSymbolAtLocation(usageParam, usageParam.valueDeclaration);
-                    types.push.apply(types, inferTypeParameters(genericParamType, targetType, typeParameter));
-                }
-                var genericReturn = checker.getReturnTypeOfSignature(genericSig);
-                var usageReturn = checker.getReturnTypeOfSignature(usageSig);
-                types.push.apply(types, inferTypeParameters(genericReturn, usageReturn, typeParameter));
-                return types;
-            }
-            function getFunctionFromCalls(calls) {
-                return checker.createAnonymousType(/*symbol*/ undefined, ts.createSymbolTable(), [getSignatureFromCalls(calls)], ts.emptyArray, /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined);
-            }
-            function getSignatureFromCalls(calls) {
-                var parameters = [];
-                var length = Math.max.apply(Math, calls.map(function (c) { return c.argumentTypes.length; }));
-                var _loop_12 = function (i) {
-                    var symbol = checker.createSymbol(1 /* FunctionScopedVariable */, ts.escapeLeadingUnderscores("arg" + i));
-                    symbol.type = combineTypes(calls.map(function (call) { return call.argumentTypes[i] || checker.getUndefinedType(); }));
-                    if (calls.some(function (call) { return call.argumentTypes[i] === undefined; })) {
-                        symbol.flags |= 16777216 /* Optional */;
-                    }
-                    parameters.push(symbol);
-                };
-                for (var i = 0; i < length; i++) {
-                    _loop_12(i);
-                }
-                var returnType = combineFromUsage(combineUsages(calls.map(function (call) { return call.return_; })));
-                // TODO: GH#18217
-                return checker.createSignature(/*declaration*/ undefined, /*typeParameters*/ undefined, /*thisParameter*/ undefined, parameters, returnType, /*typePredicate*/ undefined, length, 0 /* None */);
-            }
-            function addCandidateType(usage, type) {
-                if (type && !(type.flags & 1 /* Any */) && !(type.flags & 131072 /* Never */)) {
-                    (usage.candidateTypes || (usage.candidateTypes = [])).push(type);
-                }
-            }
-            function addCandidateThisType(usage, type) {
-                if (type && !(type.flags & 1 /* Any */) && !(type.flags & 131072 /* Never */)) {
-                    (usage.candidateThisTypes || (usage.candidateThisTypes = [])).push(type);
-                }
-            }
-        }
-    })(codefix = ts.codefix || (ts.codefix = {}));
-})(ts || (ts = {}));
-/* @internal */
-var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -128412,7 +127730,7 @@ var ts;
             }
             // add the async keyword
             changes.insertLastModifierBefore(sourceFile, 126 /* AsyncKeyword */, functionToConvert);
-            var _loop_13 = function (returnStatement) {
+            var _loop_12 = function (returnStatement) {
                 ts.forEachChild(returnStatement, function visit(node) {
                     if (ts.isCallExpression(node)) {
                         var newNodes = transformExpression(node, transformer);
@@ -128425,7 +127743,7 @@ var ts;
             };
             for (var _i = 0, returnStatements_1 = returnStatements; _i < returnStatements_1.length; _i++) {
                 var returnStatement = returnStatements_1[_i];
-                _loop_13(returnStatement);
+                _loop_12(returnStatement);
             }
         }
         function getReturnStatementsWithPromiseHandlers(body) {
@@ -129404,6 +128722,54 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var errorCodes = [ts.Diagnostics.This_import_is_never_used_as_a_value_and_must_use_import_type_because_the_importsNotUsedAsValues_is_set_to_error.code];
+        var fixId = "convertToTypeOnlyImport";
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) {
+                    var importDeclaration = getImportDeclarationForDiagnosticSpan(context.span, context.sourceFile);
+                    fixSingleImportDeclaration(t, importDeclaration, context);
+                });
+                if (changes.length) {
+                    return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Convert_to_type_only_import, fixId, ts.Diagnostics.Convert_all_imports_not_used_as_a_value_to_type_only_imports)];
+                }
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                    var importDeclaration = getImportDeclarationForDiagnosticSpan(diag, context.sourceFile);
+                    fixSingleImportDeclaration(changes, importDeclaration, context);
+                });
+            }
+        });
+        function getImportDeclarationForDiagnosticSpan(span, sourceFile) {
+            return ts.tryCast(ts.getTokenAtPosition(sourceFile, span.start).parent, ts.isImportDeclaration);
+        }
+        function fixSingleImportDeclaration(changes, importDeclaration, context) {
+            if (!(importDeclaration === null || importDeclaration === void 0 ? void 0 : importDeclaration.importClause)) {
+                return;
+            }
+            var importClause = importDeclaration.importClause;
+            // `changes.insertModifierBefore` produces a range that might overlap further changes
+            changes.insertText(context.sourceFile, importDeclaration.getStart() + "import".length, " type");
+            // `import type foo, { Bar }` is not allowed, so move `foo` to new declaration
+            if (importClause.name && importClause.namedBindings) {
+                changes.deleteNodeRangeExcludingEnd(context.sourceFile, importClause.name, importDeclaration.importClause.namedBindings);
+                changes.insertNodeBefore(context.sourceFile, importDeclaration, ts.updateImportDeclaration(importDeclaration, 
+                /*decorators*/ undefined, 
+                /*modifiers*/ undefined, ts.createImportClause(importClause.name, 
+                /*namedBindings*/ undefined, 
+                /*isTypeOnly*/ true), importDeclaration.moduleSpecifier));
+            }
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -129793,7 +129159,7 @@ var ts;
             var allowsImportingSpecifier = createAutoImportFilter(sourceFile, program, host).allowsImportingSpecifier;
             var choicesForEachExportingModule = ts.flatMap(moduleSymbols, function (_a) {
                 var moduleSymbol = _a.moduleSymbol, importKind = _a.importKind, exportedSymbolIsTypeOnly = _a.exportedSymbolIsTypeOnly;
-                return ts.moduleSpecifiers.getModuleSpecifiers(moduleSymbol, compilerOptions, sourceFile, host, program.getSourceFiles(), preferences, program.redirectTargetsMap)
+                return ts.moduleSpecifiers.getModuleSpecifiers(moduleSymbol, compilerOptions, sourceFile, ts.createModuleSpecifierResolutionHost(program, host), preferences)
                     .map(function (moduleSpecifier) {
                     // `position` should only be undefined at a missing jsx namespace, in which case we shouldn't be looking for pure types.
                     return exportedSymbolIsTypeOnly && isJs
@@ -130143,12 +129509,11 @@ var ts;
         }
         function forEachExternalModuleToImportFrom(program, host, from, filterByPackageJson, cb) {
             var filteredCount = 0;
-            var moduleSpecifierResolutionHost = createModuleSpecifierResolutionHost(program, host);
+            var moduleSpecifierResolutionHost = ts.createModuleSpecifierResolutionHost(program, host);
             var packageJson = filterByPackageJson && createAutoImportFilter(from, program, host, moduleSpecifierResolutionHost);
-            var allSourceFiles = program.getSourceFiles();
-            forEachExternalModule(program.getTypeChecker(), allSourceFiles, function (module, sourceFile) {
+            forEachExternalModule(program.getTypeChecker(), program.getSourceFiles(), function (module, sourceFile) {
                 if (sourceFile === undefined) {
-                    if (!packageJson || packageJson.allowsImportingAmbientModule(module, allSourceFiles)) {
+                    if (!packageJson || packageJson.allowsImportingAmbientModule(module)) {
                         cb(module);
                     }
                     else if (packageJson) {
@@ -130158,7 +129523,7 @@ var ts;
                 else if (sourceFile &&
                     sourceFile !== from &&
                     isImportableFile(program, from, sourceFile, moduleSpecifierResolutionHost)) {
-                    if (!packageJson || packageJson.allowsImportingSourceFile(sourceFile, allSourceFiles)) {
+                    if (!packageJson || packageJson.allowsImportingSourceFile(sourceFile)) {
                         cb(module);
                     }
                     else if (packageJson) {
@@ -130187,7 +129552,7 @@ var ts;
             var _a;
             var getCanonicalFileName = ts.hostGetCanonicalFileName(moduleSpecifierResolutionHost);
             var globalTypingsCache = (_a = moduleSpecifierResolutionHost.getGlobalTypingsCacheLocation) === null || _a === void 0 ? void 0 : _a.call(moduleSpecifierResolutionHost);
-            return !!ts.moduleSpecifiers.forEachFileNameOfModule(program.getSourceFiles(), from.fileName, to.fileName, ts.hostGetCanonicalFileName(moduleSpecifierResolutionHost), moduleSpecifierResolutionHost, program.redirectTargetsMap, 
+            return !!ts.moduleSpecifiers.forEachFileNameOfModule(from.fileName, to.fileName, moduleSpecifierResolutionHost, 
             /*preferSymlinks*/ false, function (toPath) {
                 var toFile = program.getSourceFile(toPath);
                 // Determine to import using toPath only if toPath is what we were looking at
@@ -130239,21 +129604,8 @@ var ts;
             return !ts.isStringANonContextualKeyword(res) ? res || "_" : "_" + res;
         }
         codefix.moduleSpecifierToValidIdentifier = moduleSpecifierToValidIdentifier;
-        function createModuleSpecifierResolutionHost(program, host) {
-            // Mix in `getProbablySymlinks` from Program when host doesn't have it
-            // in order for non-Project hosts to have a symlinks cache.
-            return {
-                directoryExists: ts.maybeBind(host, host.directoryExists),
-                fileExists: ts.maybeBind(host, host.fileExists),
-                getCurrentDirectory: ts.maybeBind(host, host.getCurrentDirectory),
-                readFile: ts.maybeBind(host, host.readFile),
-                useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames),
-                getProbableSymlinks: ts.maybeBind(host, host.getProbableSymlinks) || program.getProbableSymlinks,
-                getGlobalTypingsCacheLocation: ts.maybeBind(host, host.getGlobalTypingsCacheLocation),
-            };
-        }
         function createAutoImportFilter(fromFile, program, host, moduleSpecifierResolutionHost) {
-            if (moduleSpecifierResolutionHost === void 0) { moduleSpecifierResolutionHost = createModuleSpecifierResolutionHost(program, host); }
+            if (moduleSpecifierResolutionHost === void 0) { moduleSpecifierResolutionHost = ts.createModuleSpecifierResolutionHost(program, host); }
             var packageJsons = host.getPackageJsonsVisibleToFile && host.getPackageJsonsVisibleToFile(fromFile.fileName) || ts.getPackageJsonsVisibleToFile(fromFile.fileName, host);
             var dependencyGroups = 1 /* Dependencies */ | 2 /* DevDependencies */ | 8 /* OptionalDependencies */;
             var usesNodeCoreModules;
@@ -130268,12 +129620,12 @@ var ts;
                 }
                 return false;
             }
-            function allowsImportingAmbientModule(moduleSymbol, allSourceFiles) {
+            function allowsImportingAmbientModule(moduleSymbol) {
                 if (!packageJsons.length) {
                     return true;
                 }
                 var declaringSourceFile = moduleSymbol.valueDeclaration.getSourceFile();
-                var declaringNodeModuleName = getNodeModulesPackageNameFromFileName(declaringSourceFile.fileName, allSourceFiles);
+                var declaringNodeModuleName = getNodeModulesPackageNameFromFileName(declaringSourceFile.fileName);
                 if (typeof declaringNodeModuleName === "undefined") {
                     return true;
                 }
@@ -130284,11 +129636,11 @@ var ts;
                 return moduleSpecifierIsCoveredByPackageJson(declaringNodeModuleName)
                     || moduleSpecifierIsCoveredByPackageJson(declaredModuleSpecifier);
             }
-            function allowsImportingSourceFile(sourceFile, allSourceFiles) {
+            function allowsImportingSourceFile(sourceFile) {
                 if (!packageJsons.length) {
                     return true;
                 }
-                var moduleSpecifier = getNodeModulesPackageNameFromFileName(sourceFile.fileName, allSourceFiles);
+                var moduleSpecifier = getNodeModulesPackageNameFromFileName(sourceFile.fileName);
                 if (!moduleSpecifier) {
                     return true;
                 }
@@ -130323,11 +129675,11 @@ var ts;
                 }
                 return false;
             }
-            function getNodeModulesPackageNameFromFileName(importedFileName, allSourceFiles) {
+            function getNodeModulesPackageNameFromFileName(importedFileName) {
                 if (!ts.stringContains(importedFileName, "node_modules")) {
                     return undefined;
                 }
-                var specifier = ts.moduleSpecifiers.getNodeModulesPackageName(host.getCompilationSettings(), fromFile.path, importedFileName, moduleSpecifierResolutionHost, allSourceFiles, program.redirectTargetsMap);
+                var specifier = ts.moduleSpecifiers.getNodeModulesPackageName(host.getCompilationSettings(), fromFile.path, importedFileName, moduleSpecifierResolutionHost);
                 if (!specifier) {
                     return undefined;
                 }
@@ -130350,6 +129702,68 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "fixImplicitThis";
+        var errorCodes = [ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, program = context.program, span = context.span;
+                var diagnostic;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) {
+                    diagnostic = doChange(t, sourceFile, span.start, program.getTypeChecker());
+                });
+                return diagnostic ? [codefix.createCodeFixAction(fixId, changes, diagnostic, fixId, ts.Diagnostics.Fix_all_implicit_this_errors)] : ts.emptyArray;
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                doChange(changes, diag.file, diag.start, context.program.getTypeChecker());
+            }); },
+        });
+        function doChange(changes, sourceFile, pos, checker) {
+            var token = ts.getTokenAtPosition(sourceFile, pos);
+            ts.Debug.assert(token.kind === 104 /* ThisKeyword */);
+            var fn = ts.getThisContainer(token, /*includeArrowFunctions*/ false);
+            if (!ts.isFunctionDeclaration(fn) && !ts.isFunctionExpression(fn))
+                return undefined;
+            if (!ts.isSourceFile(ts.getThisContainer(fn, /*includeArrowFunctions*/ false))) { // 'this' is defined outside, convert to arrow function
+                var fnKeyword = ts.Debug.assertDefined(ts.findChildOfKind(fn, 94 /* FunctionKeyword */, sourceFile));
+                var name = fn.name;
+                var body = ts.Debug.assertDefined(fn.body); // Should be defined because the function contained a 'this' expression
+                if (ts.isFunctionExpression(fn)) {
+                    if (name && ts.FindAllReferences.Core.isSymbolReferencedInFile(name, checker, sourceFile, body)) {
+                        // Function expression references itself. To fix we would have to extract it to a const.
+                        return undefined;
+                    }
+                    // `function() {}` --> `() => {}`
+                    changes.delete(sourceFile, fnKeyword);
+                    if (name) {
+                        changes.delete(sourceFile, name);
+                    }
+                    changes.insertText(sourceFile, body.pos, " =>");
+                    return [ts.Diagnostics.Convert_function_expression_0_to_arrow_function, name ? name.text : ts.ANONYMOUS];
+                }
+                else {
+                    // `function f() {}` => `const f = () => {}`
+                    // `name` should be defined because we only do this in inner contexts, and name is only undefined for `export default function() {}`.
+                    changes.replaceNode(sourceFile, fnKeyword, ts.createToken(81 /* ConstKeyword */));
+                    changes.insertText(sourceFile, name.end, " = ");
+                    changes.insertText(sourceFile, body.pos, " =>");
+                    return [ts.Diagnostics.Convert_function_declaration_0_to_arrow_function, name.text];
+                }
+            }
+            // No outer 'this', add a @class tag if in a JS constructor function
+            else if (ts.isSourceFileJS(sourceFile) && ts.isPropertyAccessExpression(token.parent) && ts.isAssignmentExpression(token.parent.parent)) {
+                codefix.addJSDocTags(changes, sourceFile, fn, [ts.createJSDocClassTag()]);
+                return ts.Diagnostics.Add_class_tag;
+            }
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -130508,7 +129922,7 @@ var ts;
                     });
                     typeDeclToMembers.forEach(function (infos, classDeclaration) {
                         var supers = getAllSupers(classDeclaration, checker);
-                        var _loop_14 = function (info) {
+                        var _loop_13 = function (info) {
                             // If some superclass added this property, don't add it again.
                             if (supers.some(function (superClassOrInterface) {
                                 var superInfos = typeDeclToMembers.get(superClassOrInterface);
@@ -130535,7 +129949,7 @@ var ts;
                         };
                         for (var _i = 0, infos_1 = infos; _i < infos_1.length; _i++) {
                             var info = infos_1[_i];
-                            _loop_14(info);
+                            _loop_13(info);
                         }
                     });
                 }));
@@ -131202,21 +130616,27 @@ var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
-        var fixIdHtmlEntity = "invalidJsxCharactersConvertToHtmlEntity";
-        var fixIdExpression = "invalidJsxCharactersConvertToExpression";
-        var errorCodes = [ts.Diagnostics.Unexpected_token_Did_you_mean_or_gt.code, ts.Diagnostics.Unexpected_token_Did_you_mean_or_rbrace.code];
+        var fixIdExpression = "fixInvalidJsxCharacters_expression";
+        var fixIdHtmlEntity = "fixInvalidJsxCharacters_htmlEntity";
+        var errorCodes = [
+            ts.Diagnostics.Unexpected_token_Did_you_mean_or_gt.code,
+            ts.Diagnostics.Unexpected_token_Did_you_mean_or_rbrace.code
+        ];
         codefix.registerCodeFix({
             errorCodes: errorCodes,
+            fixIds: [fixIdExpression, fixIdHtmlEntity],
             getCodeActions: function (context) {
-                var sourceFile = context.sourceFile, span = context.span;
-                var changeToExpression = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, span.start, /* useHtmlEntity */ false); });
-                var changeToHtmlEntity = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, span.start, /* useHtmlEntity */ true); });
+                var sourceFile = context.sourceFile, preferences = context.preferences, span = context.span;
+                var changeToExpression = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, preferences, sourceFile, span.start, /* useHtmlEntity */ false); });
+                var changeToHtmlEntity = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, preferences, sourceFile, span.start, /* useHtmlEntity */ true); });
                 return [
-                    codefix.createCodeFixActionWithoutFixAll(fixIdExpression, changeToExpression, ts.Diagnostics.Wrap_invalid_character_in_an_expression_container),
-                    codefix.createCodeFixAction(fixIdHtmlEntity, changeToHtmlEntity, ts.Diagnostics.Convert_invalid_character_to_its_html_entity_code, fixIdHtmlEntity, ts.Diagnostics.Convert_invalid_character_to_its_html_entity_code),
+                    codefix.createCodeFixAction(fixIdExpression, changeToExpression, ts.Diagnostics.Wrap_invalid_character_in_an_expression_container, fixIdExpression, ts.Diagnostics.Wrap_all_invalid_characters_in_an_expression_container),
+                    codefix.createCodeFixAction(fixIdHtmlEntity, changeToHtmlEntity, ts.Diagnostics.Convert_invalid_character_to_its_html_entity_code, fixIdHtmlEntity, ts.Diagnostics.Convert_all_invalid_characters_to_HTML_entity_code)
                 ];
             },
-            fixIds: [fixIdExpression, fixIdHtmlEntity],
+            getAllCodeActions: function (context) {
+                return codefix.codeFixAll(context, errorCodes, function (changes, diagnostic) { return doChange(changes, context.preferences, diagnostic.file, diagnostic.start, context.fixId === fixIdHtmlEntity); });
+            }
         });
         var htmlEntity = {
             ">": "&gt;",
@@ -131225,15 +130645,13 @@ var ts;
         function isValidCharacter(character) {
             return ts.hasProperty(htmlEntity, character);
         }
-        function doChange(changes, sourceFile, start, useHtmlEntity) {
+        function doChange(changes, preferences, sourceFile, start, useHtmlEntity) {
             var character = sourceFile.getText()[start];
             // sanity check
             if (!isValidCharacter(character)) {
                 return;
             }
-            var replacement = useHtmlEntity
-                ? htmlEntity[character]
-                : "{'" + character + "'}";
+            var replacement = useHtmlEntity ? htmlEntity[character] : "{" + ts.quote(character, preferences) + "}";
             changes.replaceRangeWithText(sourceFile, { pos: start, end: start + 1 }, replacement);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
@@ -131786,6 +131204,989 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "inferFromUsage";
+        var errorCodes = [
+            // Variable declarations
+            ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code,
+            // Variable uses
+            ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code,
+            // Parameter declarations
+            ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code,
+            ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code,
+            // Get Accessor declarations
+            ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code,
+            ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code,
+            // Set Accessor declarations
+            ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code,
+            // Property declarations
+            ts.Diagnostics.Member_0_implicitly_has_an_1_type.code,
+            //// Suggestions
+            // Variable declarations
+            ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage.code,
+            // Variable uses
+            ts.Diagnostics.Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Parameter declarations
+            ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
+            ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Get Accessor declarations
+            ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_get_accessor_may_be_inferred_from_usage.code,
+            ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Set Accessor declarations
+            ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code,
+            // Property declarations
+            ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Function expressions and declarations
+            ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code,
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, program = context.program, start = context.span.start, errorCode = context.errorCode, cancellationToken = context.cancellationToken, host = context.host, preferences = context.preferences;
+                var token = ts.getTokenAtPosition(sourceFile, start);
+                var declaration;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (changes) { declaration = doChange(changes, sourceFile, token, errorCode, program, cancellationToken, /*markSeen*/ ts.returnTrue, host, preferences); });
+                var name = declaration && ts.getNameOfDeclaration(declaration);
+                return !name || changes.length === 0 ? undefined
+                    : [codefix.createCodeFixAction(fixId, changes, [getDiagnostic(errorCode, token), name.getText(sourceFile)], fixId, ts.Diagnostics.Infer_all_types_from_usage)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                var sourceFile = context.sourceFile, program = context.program, cancellationToken = context.cancellationToken, host = context.host, preferences = context.preferences;
+                var markSeen = ts.nodeSeenTracker();
+                return codefix.codeFixAll(context, errorCodes, function (changes, err) {
+                    doChange(changes, sourceFile, ts.getTokenAtPosition(err.file, err.start), err.code, program, cancellationToken, markSeen, host, preferences);
+                });
+            },
+        });
+        function getDiagnostic(errorCode, token) {
+            switch (errorCode) {
+                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code:
+                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.isSetAccessorDeclaration(ts.getContainingFunction(token)) ? ts.Diagnostics.Infer_type_of_0_from_usage : ts.Diagnostics.Infer_parameter_types_from_usage; // TODO: GH#18217
+                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
+                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Infer_parameter_types_from_usage;
+                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
+                    return ts.Diagnostics.Infer_this_type_of_0_from_usage;
+                default:
+                    return ts.Diagnostics.Infer_type_of_0_from_usage;
+            }
+        }
+        /** Map suggestion code to error code */
+        function mapSuggestionDiagnostic(errorCode) {
+            switch (errorCode) {
+                case ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code;
+                case ts.Diagnostics.Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code;
+                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code;
+                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code;
+                case ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_get_accessor_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code;
+                case ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code;
+                case ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code;
+                case ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Member_0_implicitly_has_an_1_type.code;
+            }
+            return errorCode;
+        }
+        function doChange(changes, sourceFile, token, errorCode, program, cancellationToken, markSeen, host, preferences) {
+            if (!ts.isParameterPropertyModifier(token.kind) && token.kind !== 75 /* Identifier */ && token.kind !== 25 /* DotDotDotToken */ && token.kind !== 104 /* ThisKeyword */) {
+                return undefined;
+            }
+            var parent = token.parent;
+            var importAdder = codefix.createImportAdder(sourceFile, program, preferences, host);
+            errorCode = mapSuggestionDiagnostic(errorCode);
+            switch (errorCode) {
+                // Variable and Property declarations
+                case ts.Diagnostics.Member_0_implicitly_has_an_1_type.code:
+                case ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code:
+                    if ((ts.isVariableDeclaration(parent) && markSeen(parent)) || ts.isPropertyDeclaration(parent) || ts.isPropertySignature(parent)) { // handle bad location
+                        annotateVariableDeclaration(changes, importAdder, sourceFile, parent, program, host, cancellationToken);
+                        importAdder.writeFixes(changes);
+                        return parent;
+                    }
+                    if (ts.isPropertyAccessExpression(parent)) {
+                        var type = inferTypeForVariableFromUsage(parent.name, program, cancellationToken);
+                        var typeNode = ts.getTypeNodeIfAccessible(type, parent, program, host);
+                        if (typeNode) {
+                            // Note that the codefix will never fire with an existing `@type` tag, so there is no need to merge tags
+                            var typeTag = ts.createJSDocTypeTag(ts.createJSDocTypeExpression(typeNode), /*comment*/ "");
+                            addJSDocTags(changes, sourceFile, ts.cast(parent.parent.parent, ts.isExpressionStatement), [typeTag]);
+                        }
+                        importAdder.writeFixes(changes);
+                        return parent;
+                    }
+                    return undefined;
+                case ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code: {
+                    var symbol = program.getTypeChecker().getSymbolAtLocation(token);
+                    if (symbol && symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) && markSeen(symbol.valueDeclaration)) {
+                        annotateVariableDeclaration(changes, importAdder, sourceFile, symbol.valueDeclaration, program, host, cancellationToken);
+                        importAdder.writeFixes(changes);
+                        return symbol.valueDeclaration;
+                    }
+                    return undefined;
+                }
+            }
+            var containingFunction = ts.getContainingFunction(token);
+            if (containingFunction === undefined) {
+                return undefined;
+            }
+            var declaration;
+            switch (errorCode) {
+                // Parameter declarations
+                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code:
+                    if (ts.isSetAccessorDeclaration(containingFunction)) {
+                        annotateSetAccessor(changes, importAdder, sourceFile, containingFunction, program, host, cancellationToken);
+                        declaration = containingFunction;
+                        break;
+                    }
+                // falls through
+                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
+                    if (markSeen(containingFunction)) {
+                        var param = ts.cast(parent, ts.isParameter);
+                        annotateParameters(changes, importAdder, sourceFile, param, containingFunction, program, host, cancellationToken);
+                        declaration = param;
+                    }
+                    break;
+                // Get Accessor declarations
+                case ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code:
+                case ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code:
+                    if (ts.isGetAccessorDeclaration(containingFunction) && ts.isIdentifier(containingFunction.name)) {
+                        annotate(changes, importAdder, sourceFile, containingFunction, inferTypeForVariableFromUsage(containingFunction.name, program, cancellationToken), program, host);
+                        declaration = containingFunction;
+                    }
+                    break;
+                // Set Accessor declarations
+                case ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code:
+                    if (ts.isSetAccessorDeclaration(containingFunction)) {
+                        annotateSetAccessor(changes, importAdder, sourceFile, containingFunction, program, host, cancellationToken);
+                        declaration = containingFunction;
+                    }
+                    break;
+                // Function 'this'
+                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
+                    if (ts.textChanges.isThisTypeAnnotatable(containingFunction) && markSeen(containingFunction)) {
+                        annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken);
+                        declaration = containingFunction;
+                    }
+                    break;
+                default:
+                    return ts.Debug.fail(String(errorCode));
+            }
+            importAdder.writeFixes(changes);
+            return declaration;
+        }
+        function annotateVariableDeclaration(changes, importAdder, sourceFile, declaration, program, host, cancellationToken) {
+            if (ts.isIdentifier(declaration.name)) {
+                annotate(changes, importAdder, sourceFile, declaration, inferTypeForVariableFromUsage(declaration.name, program, cancellationToken), program, host);
+            }
+        }
+        function annotateParameters(changes, importAdder, sourceFile, parameterDeclaration, containingFunction, program, host, cancellationToken) {
+            if (!ts.isIdentifier(parameterDeclaration.name)) {
+                return;
+            }
+            var parameterInferences = inferTypeForParametersFromUsage(containingFunction, sourceFile, program, cancellationToken);
+            ts.Debug.assert(containingFunction.parameters.length === parameterInferences.length, "Parameter count and inference count should match");
+            if (ts.isInJSFile(containingFunction)) {
+                annotateJSDocParameters(changes, sourceFile, parameterInferences, program, host);
+            }
+            else {
+                var needParens = ts.isArrowFunction(containingFunction) && !ts.findChildOfKind(containingFunction, 20 /* OpenParenToken */, sourceFile);
+                if (needParens)
+                    changes.insertNodeBefore(sourceFile, ts.first(containingFunction.parameters), ts.createToken(20 /* OpenParenToken */));
+                for (var _i = 0, parameterInferences_1 = parameterInferences; _i < parameterInferences_1.length; _i++) {
+                    var _a = parameterInferences_1[_i], declaration = _a.declaration, type = _a.type;
+                    if (declaration && !declaration.type && !declaration.initializer) {
+                        annotate(changes, importAdder, sourceFile, declaration, type, program, host);
+                    }
+                }
+                if (needParens)
+                    changes.insertNodeAfter(sourceFile, ts.last(containingFunction.parameters), ts.createToken(21 /* CloseParenToken */));
+            }
+        }
+        function annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken) {
+            var references = getFunctionReferences(containingFunction, sourceFile, program, cancellationToken);
+            if (!references || !references.length) {
+                return;
+            }
+            var thisInference = inferTypeFromReferences(program, references, cancellationToken).thisParameter();
+            var typeNode = ts.getTypeNodeIfAccessible(thisInference, containingFunction, program, host);
+            if (!typeNode) {
+                return;
+            }
+            if (ts.isInJSFile(containingFunction)) {
+                annotateJSDocThis(changes, sourceFile, containingFunction, typeNode);
+            }
+            else {
+                changes.tryInsertThisTypeAnnotation(sourceFile, containingFunction, typeNode);
+            }
+        }
+        function annotateJSDocThis(changes, sourceFile, containingFunction, typeNode) {
+            addJSDocTags(changes, sourceFile, containingFunction, [
+                ts.createJSDocThisTag(ts.createJSDocTypeExpression(typeNode)),
+            ]);
+        }
+        function annotateSetAccessor(changes, importAdder, sourceFile, setAccessorDeclaration, program, host, cancellationToken) {
+            var param = ts.firstOrUndefined(setAccessorDeclaration.parameters);
+            if (param && ts.isIdentifier(setAccessorDeclaration.name) && ts.isIdentifier(param.name)) {
+                var type = inferTypeForVariableFromUsage(setAccessorDeclaration.name, program, cancellationToken);
+                if (type === program.getTypeChecker().getAnyType()) {
+                    type = inferTypeForVariableFromUsage(param.name, program, cancellationToken);
+                }
+                if (ts.isInJSFile(setAccessorDeclaration)) {
+                    annotateJSDocParameters(changes, sourceFile, [{ declaration: param, type: type }], program, host);
+                }
+                else {
+                    annotate(changes, importAdder, sourceFile, param, type, program, host);
+                }
+            }
+        }
+        function annotate(changes, importAdder, sourceFile, declaration, type, program, host) {
+            var typeNode = ts.getTypeNodeIfAccessible(type, declaration, program, host);
+            if (typeNode) {
+                if (ts.isInJSFile(sourceFile) && declaration.kind !== 159 /* PropertySignature */) {
+                    var parent = ts.isVariableDeclaration(declaration) ? ts.tryCast(declaration.parent.parent, ts.isVariableStatement) : declaration;
+                    if (!parent) {
+                        return;
+                    }
+                    var typeExpression = ts.createJSDocTypeExpression(typeNode);
+                    var typeTag = ts.isGetAccessorDeclaration(declaration) ? ts.createJSDocReturnTag(typeExpression, "") : ts.createJSDocTypeTag(typeExpression, "");
+                    addJSDocTags(changes, sourceFile, parent, [typeTag]);
+                }
+                else if (!tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, type, sourceFile, changes, importAdder, ts.getEmitScriptTarget(program.getCompilerOptions()))) {
+                    changes.tryInsertTypeAnnotation(sourceFile, declaration, typeNode);
+                }
+            }
+        }
+        function tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, type, sourceFile, changes, importAdder, scriptTarget) {
+            var importableReference = codefix.tryGetAutoImportableReferenceFromImportTypeNode(typeNode, type, scriptTarget);
+            if (importableReference && changes.tryInsertTypeAnnotation(sourceFile, declaration, importableReference.typeReference)) {
+                ts.forEach(importableReference.symbols, function (s) { return importAdder.addImportFromExportedSymbol(s, /*usageIsTypeOnly*/ true); });
+                return true;
+            }
+            return false;
+        }
+        function annotateJSDocParameters(changes, sourceFile, parameterInferences, program, host) {
+            var signature = parameterInferences.length && parameterInferences[0].declaration.parent;
+            if (!signature) {
+                return;
+            }
+            var paramTags = ts.mapDefined(parameterInferences, function (inference) {
+                var param = inference.declaration;
+                // only infer parameters that have (1) no type and (2) an accessible inferred type
+                if (param.initializer || ts.getJSDocType(param) || !ts.isIdentifier(param.name))
+                    return;
+                var typeNode = inference.type && ts.getTypeNodeIfAccessible(inference.type, param, program, host);
+                var name = ts.getSynthesizedClone(param.name);
+                ts.setEmitFlags(name, 1536 /* NoComments */ | 2048 /* NoNestedComments */);
+                return typeNode && ts.createJSDocParamTag(name, !!inference.isOptional, ts.createJSDocTypeExpression(typeNode), "");
+            });
+            addJSDocTags(changes, sourceFile, signature, paramTags);
+        }
+        function addJSDocTags(changes, sourceFile, parent, newTags) {
+            var comments = ts.mapDefined(parent.jsDoc, function (j) { return j.comment; });
+            var oldTags = ts.flatMapToMutable(parent.jsDoc, function (j) { return j.tags; });
+            var unmergedNewTags = newTags.filter(function (newTag) { return !oldTags || !oldTags.some(function (tag, i) {
+                var merged = tryMergeJsdocTags(tag, newTag);
+                if (merged)
+                    oldTags[i] = merged;
+                return !!merged;
+            }); });
+            var tag = ts.createJSDocComment(comments.join("\n"), ts.createNodeArray(__spreadArrays((oldTags || ts.emptyArray), unmergedNewTags)));
+            var jsDocNode = parent.kind === 203 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
+            jsDocNode.jsDoc = parent.jsDoc;
+            jsDocNode.jsDocCache = parent.jsDocCache;
+            changes.insertJsdocCommentBefore(sourceFile, jsDocNode, tag);
+        }
+        codefix.addJSDocTags = addJSDocTags;
+        function getJsDocNodeForArrowFunction(signature) {
+            if (signature.parent.kind === 160 /* PropertyDeclaration */) {
+                return signature.parent;
+            }
+            return signature.parent.parent;
+        }
+        function tryMergeJsdocTags(oldTag, newTag) {
+            if (oldTag.kind !== newTag.kind) {
+                return undefined;
+            }
+            switch (oldTag.kind) {
+                case 318 /* JSDocParameterTag */: {
+                    var oldParam = oldTag;
+                    var newParam = newTag;
+                    return ts.isIdentifier(oldParam.name) && ts.isIdentifier(newParam.name) && oldParam.name.escapedText === newParam.name.escapedText
+                        ? ts.createJSDocParamTag(newParam.name, newParam.isBracketed, newParam.typeExpression, oldParam.comment)
+                        : undefined;
+                }
+                case 319 /* JSDocReturnTag */:
+                    return ts.createJSDocReturnTag(newTag.typeExpression, oldTag.comment);
+            }
+        }
+        function getReferences(token, program, cancellationToken) {
+            // Position shouldn't matter since token is not a SourceFile.
+            return ts.mapDefined(ts.FindAllReferences.getReferenceEntriesForNode(-1, token, program, program.getSourceFiles(), cancellationToken), function (entry) {
+                return entry.kind !== 0 /* Span */ ? ts.tryCast(entry.node, ts.isIdentifier) : undefined;
+            });
+        }
+        function inferTypeForVariableFromUsage(token, program, cancellationToken) {
+            var references = getReferences(token, program, cancellationToken);
+            return inferTypeFromReferences(program, references, cancellationToken).single();
+        }
+        function inferTypeForParametersFromUsage(func, sourceFile, program, cancellationToken) {
+            var references = getFunctionReferences(func, sourceFile, program, cancellationToken);
+            return references && inferTypeFromReferences(program, references, cancellationToken).parameters(func) ||
+                func.parameters.map(function (p) { return ({
+                    declaration: p,
+                    type: ts.isIdentifier(p.name) ? inferTypeForVariableFromUsage(p.name, program, cancellationToken) : program.getTypeChecker().getAnyType()
+                }); });
+        }
+        function getFunctionReferences(containingFunction, sourceFile, program, cancellationToken) {
+            var searchToken;
+            switch (containingFunction.kind) {
+                case 163 /* Constructor */:
+                    searchToken = ts.findChildOfKind(containingFunction, 130 /* ConstructorKeyword */, sourceFile);
+                    break;
+                case 203 /* ArrowFunction */:
+                case 202 /* FunctionExpression */:
+                    var parent = containingFunction.parent;
+                    searchToken = ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name) ?
+                        parent.name :
+                        containingFunction.name;
+                    break;
+                case 245 /* FunctionDeclaration */:
+                case 162 /* MethodDeclaration */:
+                    searchToken = containingFunction.name;
+                    break;
+            }
+            if (!searchToken) {
+                return undefined;
+            }
+            return getReferences(searchToken, program, cancellationToken);
+        }
+        function inferTypeFromReferences(program, references, cancellationToken) {
+            var checker = program.getTypeChecker();
+            var builtinConstructors = {
+                string: function () { return checker.getStringType(); },
+                number: function () { return checker.getNumberType(); },
+                Array: function (t) { return checker.createArrayType(t); },
+                Promise: function (t) { return checker.createPromiseType(t); },
+            };
+            var builtins = [
+                checker.getStringType(),
+                checker.getNumberType(),
+                checker.createArrayType(checker.getAnyType()),
+                checker.createPromiseType(checker.getAnyType()),
+            ];
+            return {
+                single: single,
+                parameters: parameters,
+                thisParameter: thisParameter,
+            };
+            function createEmptyUsage() {
+                return {
+                    isNumber: undefined,
+                    isString: undefined,
+                    isNumberOrString: undefined,
+                    candidateTypes: undefined,
+                    properties: undefined,
+                    calls: undefined,
+                    constructs: undefined,
+                    numberIndex: undefined,
+                    stringIndex: undefined,
+                    candidateThisTypes: undefined,
+                    inferredTypes: undefined,
+                };
+            }
+            function combineUsages(usages) {
+                var combinedProperties = ts.createUnderscoreEscapedMap();
+                for (var _i = 0, usages_1 = usages; _i < usages_1.length; _i++) {
+                    var u = usages_1[_i];
+                    if (u.properties) {
+                        u.properties.forEach(function (p, name) {
+                            if (!combinedProperties.has(name)) {
+                                combinedProperties.set(name, []);
+                            }
+                            combinedProperties.get(name).push(p);
+                        });
+                    }
+                }
+                var properties = ts.createUnderscoreEscapedMap();
+                combinedProperties.forEach(function (ps, name) {
+                    properties.set(name, combineUsages(ps));
+                });
+                return {
+                    isNumber: usages.some(function (u) { return u.isNumber; }),
+                    isString: usages.some(function (u) { return u.isString; }),
+                    isNumberOrString: usages.some(function (u) { return u.isNumberOrString; }),
+                    candidateTypes: ts.flatMap(usages, function (u) { return u.candidateTypes; }),
+                    properties: properties,
+                    calls: ts.flatMap(usages, function (u) { return u.calls; }),
+                    constructs: ts.flatMap(usages, function (u) { return u.constructs; }),
+                    numberIndex: ts.forEach(usages, function (u) { return u.numberIndex; }),
+                    stringIndex: ts.forEach(usages, function (u) { return u.stringIndex; }),
+                    candidateThisTypes: ts.flatMap(usages, function (u) { return u.candidateThisTypes; }),
+                    inferredTypes: undefined,
+                };
+            }
+            function single() {
+                return combineTypes(inferTypesFromReferencesSingle(references));
+            }
+            function parameters(declaration) {
+                if (references.length === 0 || !declaration.parameters) {
+                    return undefined;
+                }
+                var usage = createEmptyUsage();
+                for (var _i = 0, references_2 = references; _i < references_2.length; _i++) {
+                    var reference = references_2[_i];
+                    cancellationToken.throwIfCancellationRequested();
+                    calculateUsageOfNode(reference, usage);
+                }
+                var calls = __spreadArrays(usage.constructs || [], usage.calls || []);
+                return declaration.parameters.map(function (parameter, parameterIndex) {
+                    var types = [];
+                    var isRest = ts.isRestParameter(parameter);
+                    var isOptional = false;
+                    for (var _i = 0, calls_1 = calls; _i < calls_1.length; _i++) {
+                        var call = calls_1[_i];
+                        if (call.argumentTypes.length <= parameterIndex) {
+                            isOptional = ts.isInJSFile(declaration);
+                            types.push(checker.getUndefinedType());
+                        }
+                        else if (isRest) {
+                            for (var i = parameterIndex; i < call.argumentTypes.length; i++) {
+                                types.push(checker.getBaseTypeOfLiteralType(call.argumentTypes[i]));
+                            }
+                        }
+                        else {
+                            types.push(checker.getBaseTypeOfLiteralType(call.argumentTypes[parameterIndex]));
+                        }
+                    }
+                    if (ts.isIdentifier(parameter.name)) {
+                        var inferred = inferTypesFromReferencesSingle(getReferences(parameter.name, program, cancellationToken));
+                        types.push.apply(types, (isRest ? ts.mapDefined(inferred, checker.getElementTypeOfArrayType) : inferred));
+                    }
+                    var type = combineTypes(types);
+                    return {
+                        type: isRest ? checker.createArrayType(type) : type,
+                        isOptional: isOptional && !isRest,
+                        declaration: parameter
+                    };
+                });
+            }
+            function thisParameter() {
+                var usage = createEmptyUsage();
+                for (var _i = 0, references_3 = references; _i < references_3.length; _i++) {
+                    var reference = references_3[_i];
+                    cancellationToken.throwIfCancellationRequested();
+                    calculateUsageOfNode(reference, usage);
+                }
+                return combineTypes(usage.candidateThisTypes || ts.emptyArray);
+            }
+            function inferTypesFromReferencesSingle(references) {
+                var usage = createEmptyUsage();
+                for (var _i = 0, references_4 = references; _i < references_4.length; _i++) {
+                    var reference = references_4[_i];
+                    cancellationToken.throwIfCancellationRequested();
+                    calculateUsageOfNode(reference, usage);
+                }
+                return inferTypes(usage);
+            }
+            function calculateUsageOfNode(node, usage) {
+                while (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
+                    node = node.parent;
+                }
+                switch (node.parent.kind) {
+                    case 227 /* ExpressionStatement */:
+                        addCandidateType(usage, checker.getVoidType());
+                        break;
+                    case 209 /* PostfixUnaryExpression */:
+                        usage.isNumber = true;
+                        break;
+                    case 208 /* PrefixUnaryExpression */:
+                        inferTypeFromPrefixUnaryExpression(node.parent, usage);
+                        break;
+                    case 210 /* BinaryExpression */:
+                        inferTypeFromBinaryExpression(node, node.parent, usage);
+                        break;
+                    case 278 /* CaseClause */:
+                    case 279 /* DefaultClause */:
+                        inferTypeFromSwitchStatementLabel(node.parent, usage);
+                        break;
+                    case 197 /* CallExpression */:
+                    case 198 /* NewExpression */:
+                        if (node.parent.expression === node) {
+                            inferTypeFromCallExpression(node.parent, usage);
+                        }
+                        else {
+                            inferTypeFromContextualType(node, usage);
+                        }
+                        break;
+                    case 195 /* PropertyAccessExpression */:
+                        inferTypeFromPropertyAccessExpression(node.parent, usage);
+                        break;
+                    case 196 /* ElementAccessExpression */:
+                        inferTypeFromPropertyElementExpression(node.parent, node, usage);
+                        break;
+                    case 282 /* PropertyAssignment */:
+                    case 283 /* ShorthandPropertyAssignment */:
+                        inferTypeFromPropertyAssignment(node.parent, usage);
+                        break;
+                    case 160 /* PropertyDeclaration */:
+                        inferTypeFromPropertyDeclaration(node.parent, usage);
+                        break;
+                    case 243 /* VariableDeclaration */: {
+                        var _a = node.parent, name = _a.name, initializer = _a.initializer;
+                        if (node === name) {
+                            if (initializer) { // This can happen for `let x = null;` which still has an implicit-any error.
+                                addCandidateType(usage, checker.getTypeAtLocation(initializer));
+                            }
+                            break;
+                        }
+                    }
+                    // falls through
+                    default:
+                        return inferTypeFromContextualType(node, usage);
+                }
+            }
+            function inferTypeFromContextualType(node, usage) {
+                if (ts.isExpressionNode(node)) {
+                    addCandidateType(usage, checker.getContextualType(node));
+                }
+            }
+            function inferTypeFromPrefixUnaryExpression(node, usage) {
+                switch (node.operator) {
+                    case 45 /* PlusPlusToken */:
+                    case 46 /* MinusMinusToken */:
+                    case 40 /* MinusToken */:
+                    case 54 /* TildeToken */:
+                        usage.isNumber = true;
+                        break;
+                    case 39 /* PlusToken */:
+                        usage.isNumberOrString = true;
+                        break;
+                    // case SyntaxKind.ExclamationToken:
+                    // no inferences here;
+                }
+            }
+            function inferTypeFromBinaryExpression(node, parent, usage) {
+                switch (parent.operatorToken.kind) {
+                    // ExponentiationOperator
+                    case 42 /* AsteriskAsteriskToken */:
+                    // MultiplicativeOperator
+                    // falls through
+                    case 41 /* AsteriskToken */:
+                    case 43 /* SlashToken */:
+                    case 44 /* PercentToken */:
+                    // ShiftOperator
+                    // falls through
+                    case 47 /* LessThanLessThanToken */:
+                    case 48 /* GreaterThanGreaterThanToken */:
+                    case 49 /* GreaterThanGreaterThanGreaterThanToken */:
+                    // BitwiseOperator
+                    // falls through
+                    case 50 /* AmpersandToken */:
+                    case 51 /* BarToken */:
+                    case 52 /* CaretToken */:
+                    // CompoundAssignmentOperator
+                    // falls through
+                    case 64 /* MinusEqualsToken */:
+                    case 66 /* AsteriskAsteriskEqualsToken */:
+                    case 65 /* AsteriskEqualsToken */:
+                    case 67 /* SlashEqualsToken */:
+                    case 68 /* PercentEqualsToken */:
+                    case 72 /* AmpersandEqualsToken */:
+                    case 73 /* BarEqualsToken */:
+                    case 74 /* CaretEqualsToken */:
+                    case 69 /* LessThanLessThanEqualsToken */:
+                    case 71 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 70 /* GreaterThanGreaterThanEqualsToken */:
+                    // AdditiveOperator
+                    // falls through
+                    case 40 /* MinusToken */:
+                    // RelationalOperator
+                    // falls through
+                    case 29 /* LessThanToken */:
+                    case 32 /* LessThanEqualsToken */:
+                    case 31 /* GreaterThanToken */:
+                    case 33 /* GreaterThanEqualsToken */:
+                        var operandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
+                        if (operandType.flags & 1056 /* EnumLike */) {
+                            addCandidateType(usage, operandType);
+                        }
+                        else {
+                            usage.isNumber = true;
+                        }
+                        break;
+                    case 63 /* PlusEqualsToken */:
+                    case 39 /* PlusToken */:
+                        var otherOperandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
+                        if (otherOperandType.flags & 1056 /* EnumLike */) {
+                            addCandidateType(usage, otherOperandType);
+                        }
+                        else if (otherOperandType.flags & 296 /* NumberLike */) {
+                            usage.isNumber = true;
+                        }
+                        else if (otherOperandType.flags & 132 /* StringLike */) {
+                            usage.isString = true;
+                        }
+                        else if (otherOperandType.flags & 1 /* Any */) {
+                            // do nothing, maybe we'll learn something elsewhere
+                        }
+                        else {
+                            usage.isNumberOrString = true;
+                        }
+                        break;
+                    //  AssignmentOperators
+                    case 62 /* EqualsToken */:
+                    case 34 /* EqualsEqualsToken */:
+                    case 36 /* EqualsEqualsEqualsToken */:
+                    case 37 /* ExclamationEqualsEqualsToken */:
+                    case 35 /* ExclamationEqualsToken */:
+                        addCandidateType(usage, checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left));
+                        break;
+                    case 97 /* InKeyword */:
+                        if (node === parent.left) {
+                            usage.isString = true;
+                        }
+                        break;
+                    // LogicalOperator Or NullishCoalescing
+                    case 56 /* BarBarToken */:
+                    case 60 /* QuestionQuestionToken */:
+                        if (node === parent.left &&
+                            (node.parent.parent.kind === 243 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
+                            // var x = x || {};
+                            // TODO: use getFalsyflagsOfType
+                            addCandidateType(usage, checker.getTypeAtLocation(parent.right));
+                        }
+                        break;
+                    case 55 /* AmpersandAmpersandToken */:
+                    case 27 /* CommaToken */:
+                    case 98 /* InstanceOfKeyword */:
+                        // nothing to infer here
+                        break;
+                }
+            }
+            function inferTypeFromSwitchStatementLabel(parent, usage) {
+                addCandidateType(usage, checker.getTypeAtLocation(parent.parent.parent.expression));
+            }
+            function inferTypeFromCallExpression(parent, usage) {
+                var call = {
+                    argumentTypes: [],
+                    return_: createEmptyUsage()
+                };
+                if (parent.arguments) {
+                    for (var _i = 0, _a = parent.arguments; _i < _a.length; _i++) {
+                        var argument = _a[_i];
+                        call.argumentTypes.push(checker.getTypeAtLocation(argument));
+                    }
+                }
+                calculateUsageOfNode(parent, call.return_);
+                if (parent.kind === 197 /* CallExpression */) {
+                    (usage.calls || (usage.calls = [])).push(call);
+                }
+                else {
+                    (usage.constructs || (usage.constructs = [])).push(call);
+                }
+            }
+            function inferTypeFromPropertyAccessExpression(parent, usage) {
+                var name = ts.escapeLeadingUnderscores(parent.name.text);
+                if (!usage.properties) {
+                    usage.properties = ts.createUnderscoreEscapedMap();
+                }
+                var propertyUsage = usage.properties.get(name) || createEmptyUsage();
+                calculateUsageOfNode(parent, propertyUsage);
+                usage.properties.set(name, propertyUsage);
+            }
+            function inferTypeFromPropertyElementExpression(parent, node, usage) {
+                if (node === parent.argumentExpression) {
+                    usage.isNumberOrString = true;
+                    return;
+                }
+                else {
+                    var indexType = checker.getTypeAtLocation(parent.argumentExpression);
+                    var indexUsage = createEmptyUsage();
+                    calculateUsageOfNode(parent, indexUsage);
+                    if (indexType.flags & 296 /* NumberLike */) {
+                        usage.numberIndex = indexUsage;
+                    }
+                    else {
+                        usage.stringIndex = indexUsage;
+                    }
+                }
+            }
+            function inferTypeFromPropertyAssignment(assignment, usage) {
+                var nodeWithRealType = ts.isVariableDeclaration(assignment.parent.parent) ?
+                    assignment.parent.parent :
+                    assignment.parent;
+                addCandidateThisType(usage, checker.getTypeAtLocation(nodeWithRealType));
+            }
+            function inferTypeFromPropertyDeclaration(declaration, usage) {
+                addCandidateThisType(usage, checker.getTypeAtLocation(declaration.parent));
+            }
+            function removeLowPriorityInferences(inferences, priorities) {
+                var toRemove = [];
+                for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
+                    var i = inferences_1[_i];
+                    for (var _a = 0, priorities_1 = priorities; _a < priorities_1.length; _a++) {
+                        var _b = priorities_1[_a], high = _b.high, low = _b.low;
+                        if (high(i)) {
+                            ts.Debug.assert(!low(i), "Priority can't have both low and high");
+                            toRemove.push(low);
+                        }
+                    }
+                }
+                return inferences.filter(function (i) { return toRemove.every(function (f) { return !f(i); }); });
+            }
+            function combineFromUsage(usage) {
+                return combineTypes(inferTypes(usage));
+            }
+            function combineTypes(inferences) {
+                if (!inferences.length)
+                    return checker.getAnyType();
+                // 1. string or number individually override string | number
+                // 2. non-any, non-void overrides any or void
+                // 3. non-nullable, non-any, non-void, non-anonymous overrides anonymous types
+                var stringNumber = checker.getUnionType([checker.getStringType(), checker.getNumberType()]);
+                var priorities = [
+                    {
+                        high: function (t) { return t === checker.getStringType() || t === checker.getNumberType(); },
+                        low: function (t) { return t === stringNumber; }
+                    },
+                    {
+                        high: function (t) { return !(t.flags & (1 /* Any */ | 16384 /* Void */)); },
+                        low: function (t) { return !!(t.flags & (1 /* Any */ | 16384 /* Void */)); }
+                    },
+                    {
+                        high: function (t) { return !(t.flags & (98304 /* Nullable */ | 1 /* Any */ | 16384 /* Void */)) && !(ts.getObjectFlags(t) & 16 /* Anonymous */); },
+                        low: function (t) { return !!(ts.getObjectFlags(t) & 16 /* Anonymous */); }
+                    }
+                ];
+                var good = removeLowPriorityInferences(inferences, priorities);
+                var anons = good.filter(function (i) { return ts.getObjectFlags(i) & 16 /* Anonymous */; });
+                if (anons.length) {
+                    good = good.filter(function (i) { return !(ts.getObjectFlags(i) & 16 /* Anonymous */); });
+                    good.push(combineAnonymousTypes(anons));
+                }
+                return checker.getWidenedType(checker.getUnionType(good.map(checker.getBaseTypeOfLiteralType), 2 /* Subtype */));
+            }
+            function combineAnonymousTypes(anons) {
+                if (anons.length === 1) {
+                    return anons[0];
+                }
+                var calls = [];
+                var constructs = [];
+                var stringIndices = [];
+                var numberIndices = [];
+                var stringIndexReadonly = false;
+                var numberIndexReadonly = false;
+                var props = ts.createMultiMap();
+                for (var _i = 0, anons_1 = anons; _i < anons_1.length; _i++) {
+                    var anon = anons_1[_i];
+                    for (var _a = 0, _b = checker.getPropertiesOfType(anon); _a < _b.length; _a++) {
+                        var p = _b[_a];
+                        props.add(p.name, checker.getTypeOfSymbolAtLocation(p, p.valueDeclaration));
+                    }
+                    calls.push.apply(calls, checker.getSignaturesOfType(anon, 0 /* Call */));
+                    constructs.push.apply(constructs, checker.getSignaturesOfType(anon, 1 /* Construct */));
+                    if (anon.stringIndexInfo) {
+                        stringIndices.push(anon.stringIndexInfo.type);
+                        stringIndexReadonly = stringIndexReadonly || anon.stringIndexInfo.isReadonly;
+                    }
+                    if (anon.numberIndexInfo) {
+                        numberIndices.push(anon.numberIndexInfo.type);
+                        numberIndexReadonly = numberIndexReadonly || anon.numberIndexInfo.isReadonly;
+                    }
+                }
+                var members = ts.mapEntries(props, function (name, types) {
+                    var isOptional = types.length < anons.length ? 16777216 /* Optional */ : 0;
+                    var s = checker.createSymbol(4 /* Property */ | isOptional, name);
+                    s.type = checker.getUnionType(types);
+                    return [name, s];
+                });
+                return checker.createAnonymousType(anons[0].symbol, members, calls, constructs, stringIndices.length ? checker.createIndexInfo(checker.getUnionType(stringIndices), stringIndexReadonly) : undefined, numberIndices.length ? checker.createIndexInfo(checker.getUnionType(numberIndices), numberIndexReadonly) : undefined);
+            }
+            function inferTypes(usage) {
+                var types = [];
+                if (usage.isNumber) {
+                    types.push(checker.getNumberType());
+                }
+                if (usage.isString) {
+                    types.push(checker.getStringType());
+                }
+                if (usage.isNumberOrString) {
+                    types.push(checker.getUnionType([checker.getStringType(), checker.getNumberType()]));
+                }
+                if (usage.numberIndex) {
+                    types.push(checker.createArrayType(combineFromUsage(usage.numberIndex)));
+                }
+                if (usage.properties && usage.properties.size
+                    || usage.calls && usage.calls.length
+                    || usage.constructs && usage.constructs.length
+                    || usage.stringIndex) {
+                    types.push(inferStructuralType(usage));
+                }
+                types.push.apply(types, (usage.candidateTypes || []).map(function (t) { return checker.getBaseTypeOfLiteralType(t); }));
+                types.push.apply(types, inferNamedTypesFromProperties(usage));
+                return types;
+            }
+            function inferStructuralType(usage) {
+                var members = ts.createUnderscoreEscapedMap();
+                if (usage.properties) {
+                    usage.properties.forEach(function (u, name) {
+                        var symbol = checker.createSymbol(4 /* Property */, name);
+                        symbol.type = combineFromUsage(u);
+                        members.set(name, symbol);
+                    });
+                }
+                var callSignatures = usage.calls ? [getSignatureFromCalls(usage.calls)] : [];
+                var constructSignatures = usage.constructs ? [getSignatureFromCalls(usage.constructs)] : [];
+                var stringIndexInfo = usage.stringIndex && checker.createIndexInfo(combineFromUsage(usage.stringIndex), /*isReadonly*/ false);
+                return checker.createAnonymousType(/*symbol*/ undefined, members, callSignatures, constructSignatures, stringIndexInfo, /*numberIndexInfo*/ undefined);
+            }
+            function inferNamedTypesFromProperties(usage) {
+                if (!usage.properties || !usage.properties.size)
+                    return [];
+                var types = builtins.filter(function (t) { return allPropertiesAreAssignableToUsage(t, usage); });
+                if (0 < types.length && types.length < 3) {
+                    return types.map(function (t) { return inferInstantiationFromUsage(t, usage); });
+                }
+                return [];
+            }
+            function allPropertiesAreAssignableToUsage(type, usage) {
+                if (!usage.properties)
+                    return false;
+                return !ts.forEachEntry(usage.properties, function (propUsage, name) {
+                    var source = checker.getTypeOfPropertyOfType(type, name);
+                    if (!source) {
+                        return true;
+                    }
+                    if (propUsage.calls) {
+                        var sigs = checker.getSignaturesOfType(source, 0 /* Call */);
+                        return !sigs.length || !checker.isTypeAssignableTo(source, getFunctionFromCalls(propUsage.calls));
+                    }
+                    else {
+                        return !checker.isTypeAssignableTo(source, combineFromUsage(propUsage));
+                    }
+                });
+            }
+            /**
+             * inference is limited to
+             * 1. generic types with a single parameter
+             * 2. inference to/from calls with a single signature
+             */
+            function inferInstantiationFromUsage(type, usage) {
+                if (!(ts.getObjectFlags(type) & 4 /* Reference */) || !usage.properties) {
+                    return type;
+                }
+                var generic = type.target;
+                var singleTypeParameter = ts.singleOrUndefined(generic.typeParameters);
+                if (!singleTypeParameter)
+                    return type;
+                var types = [];
+                usage.properties.forEach(function (propUsage, name) {
+                    var genericPropertyType = checker.getTypeOfPropertyOfType(generic, name);
+                    ts.Debug.assert(!!genericPropertyType, "generic should have all the properties of its reference.");
+                    types.push.apply(types, inferTypeParameters(genericPropertyType, combineFromUsage(propUsage), singleTypeParameter));
+                });
+                return builtinConstructors[type.symbol.escapedName](combineTypes(types));
+            }
+            function inferTypeParameters(genericType, usageType, typeParameter) {
+                if (genericType === typeParameter) {
+                    return [usageType];
+                }
+                else if (genericType.flags & 3145728 /* UnionOrIntersection */) {
+                    return ts.flatMap(genericType.types, function (t) { return inferTypeParameters(t, usageType, typeParameter); });
+                }
+                else if (genericType.flags & 134217728 /* Awaited */) {
+                    return inferTypeParameters(genericType.awaitedType, usageType, typeParameter);
+                }
+                else if (ts.getObjectFlags(genericType) & 4 /* Reference */ && ts.getObjectFlags(usageType) & 4 /* Reference */) {
+                    // this is wrong because we need a reference to the targetType to, so we can check that it's also a reference
+                    var genericArgs = checker.getTypeArguments(genericType);
+                    var usageArgs = checker.getTypeArguments(usageType);
+                    var types = [];
+                    if (genericArgs && usageArgs) {
+                        for (var i = 0; i < genericArgs.length; i++) {
+                            if (usageArgs[i]) {
+                                types.push.apply(types, inferTypeParameters(genericArgs[i], usageArgs[i], typeParameter));
+                            }
+                        }
+                    }
+                    return types;
+                }
+                var genericSigs = checker.getSignaturesOfType(genericType, 0 /* Call */);
+                var usageSigs = checker.getSignaturesOfType(usageType, 0 /* Call */);
+                // allow for multiple overloads of `then`.
+                if (genericSigs.length === 1 && usageSigs.length === 1) {
+                    return inferFromSignatures(genericSigs[0], usageSigs[0], typeParameter);
+                }
+                return [];
+            }
+            function inferFromSignatures(genericSig, usageSig, typeParameter) {
+                var types = [];
+                for (var i = 0; i < genericSig.parameters.length; i++) {
+                    var genericParam = genericSig.parameters[i];
+                    var usageParam = usageSig.parameters[i];
+                    var isRest = genericSig.declaration && ts.isRestParameter(genericSig.declaration.parameters[i]);
+                    if (!usageParam) {
+                        break;
+                    }
+                    var genericParamType = checker.getTypeOfSymbolAtLocation(genericParam, genericParam.valueDeclaration);
+                    var elementType = isRest && checker.getElementTypeOfArrayType(genericParamType);
+                    if (elementType) {
+                        genericParamType = elementType;
+                    }
+                    var targetType = usageParam.type || checker.getTypeOfSymbolAtLocation(usageParam, usageParam.valueDeclaration);
+                    types.push.apply(types, inferTypeParameters(genericParamType, targetType, typeParameter));
+                }
+                var genericReturn = checker.getReturnTypeOfSignature(genericSig);
+                var usageReturn = checker.getReturnTypeOfSignature(usageSig);
+                types.push.apply(types, inferTypeParameters(genericReturn, usageReturn, typeParameter));
+                return types;
+            }
+            function getFunctionFromCalls(calls) {
+                return checker.createAnonymousType(/*symbol*/ undefined, ts.createSymbolTable(), [getSignatureFromCalls(calls)], ts.emptyArray, /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined);
+            }
+            function getSignatureFromCalls(calls) {
+                var parameters = [];
+                var length = Math.max.apply(Math, calls.map(function (c) { return c.argumentTypes.length; }));
+                var _loop_14 = function (i) {
+                    var symbol = checker.createSymbol(1 /* FunctionScopedVariable */, ts.escapeLeadingUnderscores("arg" + i));
+                    symbol.type = combineTypes(calls.map(function (call) { return call.argumentTypes[i] || checker.getUndefinedType(); }));
+                    if (calls.some(function (call) { return call.argumentTypes[i] === undefined; })) {
+                        symbol.flags |= 16777216 /* Optional */;
+                    }
+                    parameters.push(symbol);
+                };
+                for (var i = 0; i < length; i++) {
+                    _loop_14(i);
+                }
+                var returnType = combineFromUsage(combineUsages(calls.map(function (call) { return call.return_; })));
+                // TODO: GH#18217
+                return checker.createSignature(/*declaration*/ undefined, /*typeParameters*/ undefined, /*thisParameter*/ undefined, parameters, returnType, /*typePredicate*/ undefined, length, 0 /* None */);
+            }
+            function addCandidateType(usage, type) {
+                if (type && !(type.flags & 1 /* Any */) && !(type.flags & 131072 /* Never */)) {
+                    (usage.candidateTypes || (usage.candidateTypes = [])).push(type);
+                }
+            }
+            function addCandidateThisType(usage, type) {
+                if (type && !(type.flags & 1 /* Any */) && !(type.flags & 131072 /* Never */)) {
+                    (usage.candidateThisTypes || (usage.candidateThisTypes = [])).push(type);
+                }
+            }
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -131856,21 +132257,10 @@ var ts;
             }
         }
         codefix.createMissingMemberNodes = createMissingMemberNodes;
-        function getModuleSpecifierResolverHost(context) {
-            return {
-                directoryExists: context.host.directoryExists ? function (d) { return context.host.directoryExists(d); } : undefined,
-                fileExists: context.host.fileExists ? function (f) { return context.host.fileExists(f); } : undefined,
-                getCurrentDirectory: context.host.getCurrentDirectory ? function () { return context.host.getCurrentDirectory(); } : undefined,
-                readFile: context.host.readFile ? function (f) { return context.host.readFile(f); } : undefined,
-                useCaseSensitiveFileNames: context.host.useCaseSensitiveFileNames ? function () { return context.host.useCaseSensitiveFileNames(); } : undefined,
-                getSourceFiles: function () { return context.program.getSourceFiles(); },
-                getCommonSourceDirectory: function () { return context.program.getCommonSourceDirectory(); },
-            };
-        }
         function getNoopSymbolTrackerWithResolver(context) {
             return {
                 trackSymbol: ts.noop,
-                moduleResolverHost: getModuleSpecifierResolverHost(context),
+                moduleResolverHost: ts.getModuleSpecifierResolverHost(context.program, context.host),
             };
         }
         codefix.getNoopSymbolTrackerWithResolver = getNoopSymbolTrackerWithResolver;
@@ -133656,7 +134046,7 @@ var ts;
                     case 245 /* FunctionDeclaration */:
                         return scope.name
                             ? "function '" + scope.name.text + "'"
-                            : "anonymous function";
+                            : ts.ANONYMOUS;
                     case 203 /* ArrowFunction */:
                         return "arrow function";
                     case 162 /* MethodDeclaration */:
@@ -134785,7 +135175,7 @@ var ts;
             var newTypeNode = ts.createTypeAliasDeclaration(
             /* decorators */ undefined, 
             /* modifiers */ undefined, name, typeParameters.map(function (id) { return ts.updateTypeParameterDeclaration(id, id.name, id.constraint, /* defaultType */ undefined); }), selection);
-            changes.insertNodeBefore(file, firstStatement, newTypeNode, /* blankLineBetween */ true);
+            changes.insertNodeBefore(file, firstStatement, ts.ignoreSourceNewlines(newTypeNode), /* blankLineBetween */ true);
             changes.replaceNode(file, selection, ts.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })));
         }
         function doInterfaceChange(changes, file, name, info) {
@@ -134794,7 +135184,7 @@ var ts;
             /* decorators */ undefined, 
             /* modifiers */ undefined, name, typeParameters, 
             /* heritageClauses */ undefined, typeElements);
-            changes.insertNodeBefore(file, firstStatement, newTypeNode, /* blankLineBetween */ true);
+            changes.insertNodeBefore(file, firstStatement, ts.ignoreSourceNewlines(newTypeNode), /* blankLineBetween */ true);
             changes.replaceNode(file, selection, ts.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })));
         }
         function doTypedefChange(changes, file, name, info) {
@@ -139565,7 +139955,10 @@ var ts;
         /// Emit
         LanguageServiceShimObject.prototype.getEmitOutput = function (fileName) {
             var _this = this;
-            return this.forwardJSONCall("getEmitOutput('" + fileName + "')", function () { return _this.languageService.getEmitOutput(fileName); });
+            return this.forwardJSONCall("getEmitOutput('" + fileName + "')", function () {
+                var _a = _this.languageService.getEmitOutput(fileName), diagnostics = _a.diagnostics, rest = __rest(_a, ["diagnostics"]);
+                return __assign(__assign({}, rest), { diagnostics: _this.realizeDiagnostics(diagnostics) });
+            });
         };
         LanguageServiceShimObject.prototype.getEmitOutputObject = function (fileName) {
             var _this = this;
@@ -141314,17 +141707,25 @@ var ts;
              */
             Project.prototype.emitFile = function (scriptInfo, writeFile) {
                 if (!this.languageServiceEnabled || !this.shouldEmitFile(scriptInfo)) {
-                    return false;
+                    return { emitSkipped: true, diagnostics: server.emptyArray };
                 }
-                var _a = this.getLanguageService(/*ensureSynchronized*/ false).getEmitOutput(scriptInfo.fileName), emitSkipped = _a.emitSkipped, outputFiles = _a.outputFiles;
+                var _a = this.getLanguageService().getEmitOutput(scriptInfo.fileName), emitSkipped = _a.emitSkipped, diagnostics = _a.diagnostics, outputFiles = _a.outputFiles;
                 if (!emitSkipped) {
                     for (var _i = 0, outputFiles_1 = outputFiles; _i < outputFiles_1.length; _i++) {
                         var outputFile = outputFiles_1[_i];
                         var outputFileAbsoluteFileName = ts.getNormalizedAbsolutePath(outputFile.name, this.currentDirectory);
                         writeFile(outputFileAbsoluteFileName, outputFile.text, outputFile.writeByteOrderMark);
                     }
+                    // Update the signature
+                    if (this.builderState && ts.getEmitDeclarations(this.compilerOptions)) {
+                        var dtsFiles = outputFiles.filter(function (f) { return ts.fileExtensionIs(f.name, ".d.ts" /* Dts */); });
+                        if (dtsFiles.length === 1) {
+                            var sourceFile = this.program.getSourceFile(scriptInfo.fileName);
+                            ts.BuilderState.updateSignatureOfFile(this.builderState, this.projectService.host.createHash(dtsFiles[0].text), sourceFile.resolvedPath);
+                        }
+                    }
                 }
-                return !emitSkipped;
+                return { emitSkipped: emitSkipped, diagnostics: diagnostics };
             };
             Project.prototype.enableLanguageService = function () {
                 if (this.languageServiceEnabled || this.projectService.syntaxOnly) {
@@ -144992,6 +145393,13 @@ var ts;
                 // At this point if file is part of any any configured or external project, then it would be present in the containing projects
                 // So if it still doesnt have any containing projects, it needs to be part of inferred project
                 if (info.isOrphan()) {
+                    // Even though this info did not belong to any of the configured projects, send the config file diag
+                    if (ts.isArray(retainProjects)) {
+                        retainProjects.forEach(function (project) { return _this.sendConfigFileDiagEvent(project, info.fileName); });
+                    }
+                    else if (retainProjects) {
+                        this.sendConfigFileDiagEvent(retainProjects, info.fileName);
+                    }
                     ts.Debug.assert(this.openFiles.has(info.path));
                     this.assignOrphanScriptInfoToInferredProject(info, this.openFiles.get(info.path));
                 }
@@ -145720,7 +146128,7 @@ var ts;
         function convertToLocation(lineAndCharacter) {
             return { line: lineAndCharacter.line + 1, offset: lineAndCharacter.character + 1 };
         }
-        function formatConfigFileDiag(diag, includeFileName) {
+        function formatDiagnosticToProtocol(diag, includeFileName) {
             var start = (diag.file && convertToLocation(ts.getLineAndCharacterOfPosition(diag.file, diag.start))); // TODO: GH#18217
             var end = (diag.file && convertToLocation(ts.getLineAndCharacterOfPosition(diag.file, diag.start + diag.length))); // TODO: GH#18217
             var text = ts.flattenDiagnosticMessageText(diag.messageText, "\n");
@@ -146497,7 +146905,7 @@ var ts;
                         break;
                     case server.ConfigFileDiagEvent:
                         var _c = event.data, triggerFile = _c.triggerFile, configFile = _c.configFileName, diagnostics = _c.diagnostics;
-                        var bakedDiags = ts.map(diagnostics, function (diagnostic) { return formatConfigFileDiag(diagnostic, /*includeFileName*/ true); });
+                        var bakedDiags = ts.map(diagnostics, function (diagnostic) { return formatDiagnosticToProtocol(diagnostic, /*includeFileName*/ true); });
                         this.event({
                             triggerFile: triggerFile,
                             configFile: configFile,
@@ -146761,7 +147169,7 @@ var ts;
                 var diagnosticsForConfigFile = ts.filter(ts.concatenate(projectErrors, optionsErrors), function (diagnostic) { return !!diagnostic.file && diagnostic.file.fileName === configFile; });
                 return includeLinePosition ?
                     this.convertToDiagnosticsWithLinePositionFromDiagnosticFile(diagnosticsForConfigFile) :
-                    ts.map(diagnosticsForConfigFile, function (diagnostic) { return formatConfigFileDiag(diagnostic, /*includeFileName*/ false); });
+                    ts.map(diagnosticsForConfigFile, function (diagnostic) { return formatDiagnosticToProtocol(diagnostic, /*includeFileName*/ false); });
             };
             Session.prototype.convertToDiagnosticsWithLinePositionFromDiagnosticFile = function (diagnostics) {
                 var _this = this;
@@ -146771,8 +147179,10 @@ var ts;
                     length: d.length,
                     category: ts.diagnosticCategoryName(d),
                     code: d.code,
+                    source: d.source,
                     startLocation: (d.file && convertToLocation(ts.getLineAndCharacterOfPosition(d.file, d.start))),
                     endLocation: (d.file && convertToLocation(ts.getLineAndCharacterOfPosition(d.file, d.start + d.length))),
+                    reportsUnnecessary: d.reportsUnnecessary,
                     relatedInformation: ts.map(d.relatedInformation, formatRelatedInformation)
                 }); });
             };
@@ -146848,9 +147258,14 @@ var ts;
             };
             Session.prototype.getEmitOutput = function (args) {
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
-                return project.shouldEmitFile(project.getScriptInfo(file)) ?
-                    project.getLanguageService().getEmitOutput(file) :
-                    { emitSkipped: true, outputFiles: [] };
+                if (!project.shouldEmitFile(project.getScriptInfo(file))) {
+                    return { emitSkipped: true, outputFiles: [], diagnostics: [] };
+                }
+                var result = project.getLanguageService().getEmitOutput(file);
+                return args.richResponse ? __assign(__assign({}, result), { diagnostics: args.includeLinePosition ?
+                        this.convertToDiagnosticsWithLinePositionFromDiagnosticFile(result.diagnostics) :
+                        result.diagnostics.map(function (d) { return formatDiagnosticToProtocol(d, /*includeFileName*/ true); }) }) :
+                    result;
             };
             Session.prototype.mapDefinitionInfo = function (definitions, project) {
                 var _this = this;
@@ -147356,10 +147771,18 @@ var ts;
                     server.Errors.ThrowNoProject();
                 }
                 if (!project.languageServiceEnabled) {
-                    return false;
+                    return args.richResponse ? { emitSkipped: true, diagnostics: [] } : false;
                 }
                 var scriptInfo = project.getScriptInfo(file);
-                return project.emitFile(scriptInfo, function (path, data, writeByteOrderMark) { return _this.host.writeFile(path, data, writeByteOrderMark); });
+                var _b = project.emitFile(scriptInfo, function (path, data, writeByteOrderMark) { return _this.host.writeFile(path, data, writeByteOrderMark); }), emitSkipped = _b.emitSkipped, diagnostics = _b.diagnostics;
+                return args.richResponse ?
+                    {
+                        emitSkipped: emitSkipped,
+                        diagnostics: args.includeLinePosition ?
+                            this.convertToDiagnosticsWithLinePositionFromDiagnosticFile(diagnostics) :
+                            diagnostics.map(function (d) { return formatDiagnosticToProtocol(d, /*includeFileName*/ true); })
+                    } :
+                    !emitSkipped;
             };
             Session.prototype.getSignatureHelpItems = function (args, simplifiedResult) {
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts
index 9353a249515..d5b00fa19de 100644
--- a/lib/typescript.d.ts
+++ b/lib/typescript.d.ts
@@ -1925,7 +1925,7 @@ declare namespace ts {
         /** @throws OperationCanceledException if isCancellationRequested is true */
         throwIfCancellationRequested(): void;
     }
-    export interface Program extends ScriptReferenceHost, ModuleSpecifierResolutionHost {
+    export interface Program extends ScriptReferenceHost {
         getCurrentDirectory(): string;
         /**
          * Get a list of root file names that were passed to a 'createProgram'
@@ -3187,11 +3187,6 @@ declare namespace ts {
         directoryExists?(directoryName: string): boolean;
         getCurrentDirectory?(): string;
     }
-    export interface ModuleSpecifierResolutionHost extends GetEffectiveTypeRootsHost {
-        useCaseSensitiveFileNames?(): boolean;
-        fileExists?(path: string): boolean;
-        readFile?(path: string): string | undefined;
-    }
     export interface TextSpan {
         start: number;
         length: number;
@@ -5107,7 +5102,7 @@ declare namespace ts {
         fileName: Path;
         packageName: string;
     }
-    interface LanguageServiceHost extends ModuleSpecifierResolutionHost {
+    interface LanguageServiceHost extends GetEffectiveTypeRootsHost {
         getCompilationSettings(): CompilerOptions;
         getNewLine?(): string;
         getProjectVersion?(): string;
@@ -5123,6 +5118,7 @@ declare namespace ts {
         log?(s: string): void;
         trace?(s: string): void;
         error?(s: string): void;
+        useCaseSensitiveFileNames?(): boolean;
         readDirectory?(path: string, extensions?: readonly string[], exclude?: readonly string[], include?: readonly string[], depth?: number): string[];
         readFile?(path: string, encoding?: string): string | undefined;
         realpath?(path: string): string;
diff --git a/lib/typescript.js b/lib/typescript.js
index 7a4b6c9d8d8..53f59f11cad 100644
--- a/lib/typescript.js
+++ b/lib/typescript.js
@@ -244,7 +244,7 @@ var ts;
     // If changing the text in this section, be sure to test `configurePrerelease` too.
     ts.versionMajorMinor = "3.9";
     /** The version of the TypeScript compiler release */
-    ts.version = ts.versionMajorMinor + ".0-dev";
+    ts.version = ts.versionMajorMinor + ".0-beta";
     /**
      * Returns the native Map implementation if it is available and compatible (i.e. supports iteration).
      */
@@ -4595,6 +4595,7 @@ var ts;
         EmitFlags[EmitFlags["NoAsciiEscaping"] = 16777216] = "NoAsciiEscaping";
         /*@internal*/ EmitFlags[EmitFlags["TypeScriptClassWrapper"] = 33554432] = "TypeScriptClassWrapper";
         /*@internal*/ EmitFlags[EmitFlags["NeverApplyImportHelper"] = 67108864] = "NeverApplyImportHelper";
+        /*@internal*/ EmitFlags[EmitFlags["IgnoreSourceNewlines"] = 134217728] = "IgnoreSourceNewlines";
     })(EmitFlags = ts.EmitFlags || (ts.EmitFlags = {}));
     /**
      * Used by the checker, this enum keeps track of external emit helpers that should be type
@@ -7172,6 +7173,7 @@ var ts;
         Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: diag(2395, ts.DiagnosticCategory.Error, "Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local_2395", "Individual declarations in merged declaration '{0}' must be all exported or all local."),
         Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: diag(2396, ts.DiagnosticCategory.Error, "Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters_2396", "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters."),
         Declaration_name_conflicts_with_built_in_global_identifier_0: diag(2397, ts.DiagnosticCategory.Error, "Declaration_name_conflicts_with_built_in_global_identifier_0_2397", "Declaration name conflicts with built-in global identifier '{0}'."),
+        constructor_cannot_be_used_as_a_parameter_property_name: diag(2398, ts.DiagnosticCategory.Error, "constructor_cannot_be_used_as_a_parameter_property_name_2398", "'constructor' cannot be used as a parameter property name."),
         Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: diag(2399, ts.DiagnosticCategory.Error, "Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference_2399", "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference."),
         Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: diag(2400, ts.DiagnosticCategory.Error, "Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference_2400", "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference."),
         Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: diag(2401, ts.DiagnosticCategory.Error, "Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference_2401", "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference."),
@@ -7506,6 +7508,7 @@ var ts;
         _0_needs_an_explicit_type_annotation: diag(2782, ts.DiagnosticCategory.Message, "_0_needs_an_explicit_type_annotation_2782", "'{0}' needs an explicit type annotation."),
         _0_is_specified_more_than_once_so_this_usage_will_be_overwritten: diag(2783, ts.DiagnosticCategory.Error, "_0_is_specified_more_than_once_so_this_usage_will_be_overwritten_2783", "'{0}' is specified more than once, so this usage will be overwritten."),
         get_and_set_accessors_cannot_declare_this_parameters: diag(2784, ts.DiagnosticCategory.Error, "get_and_set_accessors_cannot_declare_this_parameters_2784", "'get' and 'set' accessors cannot declare 'this' parameters."),
+        This_spread_always_overwrites_this_property: diag(2785, ts.DiagnosticCategory.Error, "This_spread_always_overwrites_this_property_2785", "This spread always overwrites this property."),
         Import_declaration_0_is_using_private_name_1: diag(4000, ts.DiagnosticCategory.Error, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -7857,6 +7860,7 @@ var ts;
         Synchronously_call_callbacks_and_update_the_state_of_directory_watchers_on_platforms_that_don_t_support_recursive_watching_natively: diag(6228, ts.DiagnosticCategory.Message, "Synchronously_call_callbacks_and_update_the_state_of_directory_watchers_on_platforms_that_don_t_supp_6228", "Synchronously call callbacks and update the state of directory watchers on platforms that don't support recursive watching natively."),
         Tag_0_expects_at_least_1_arguments_but_the_JSX_factory_2_provides_at_most_3: diag(6229, ts.DiagnosticCategory.Error, "Tag_0_expects_at_least_1_arguments_but_the_JSX_factory_2_provides_at_most_3_6229", "Tag '{0}' expects at least '{1}' arguments, but the JSX factory '{2}' provides at most '{3}'."),
         Option_0_can_only_be_specified_in_tsconfig_json_file_or_set_to_false_or_null_on_command_line: diag(6230, ts.DiagnosticCategory.Error, "Option_0_can_only_be_specified_in_tsconfig_json_file_or_set_to_false_or_null_on_command_line_6230", "Option '{0}' can only be specified in 'tsconfig.json' file or set to 'false' or 'null' on command line."),
+        Could_not_resolve_the_path_0_with_the_extensions_Colon_1: diag(6231, ts.DiagnosticCategory.Error, "Could_not_resolve_the_path_0_with_the_extensions_Colon_1_6231", "Could not resolve the path '{0}' with the extensions: {1}."),
         Projects_to_reference: diag(6300, ts.DiagnosticCategory.Message, "Projects_to_reference_6300", "Projects to reference"),
         Enable_project_compilation: diag(6302, ts.DiagnosticCategory.Message, "Enable_project_compilation_6302", "Enable project compilation"),
         Composite_projects_may_not_disable_declaration_emit: diag(6304, ts.DiagnosticCategory.Error, "Composite_projects_may_not_disable_declaration_emit_6304", "Composite projects may not disable declaration emit."),
@@ -8153,7 +8157,15 @@ var ts;
         Set_the_target_option_in_your_configuration_file_to_0: diag(95098, ts.DiagnosticCategory.Message, "Set_the_target_option_in_your_configuration_file_to_0_95098", "Set the 'target' option in your configuration file to '{0}'"),
         Set_the_module_option_in_your_configuration_file_to_0: diag(95099, ts.DiagnosticCategory.Message, "Set_the_module_option_in_your_configuration_file_to_0_95099", "Set the 'module' option in your configuration file to '{0}'"),
         Convert_invalid_character_to_its_html_entity_code: diag(95100, ts.DiagnosticCategory.Message, "Convert_invalid_character_to_its_html_entity_code_95100", "Convert invalid character to its html entity code"),
-        Wrap_invalid_character_in_an_expression_container: diag(95101, ts.DiagnosticCategory.Message, "Wrap_invalid_character_in_an_expression_container_95101", "Wrap invalid character in an expression container"),
+        Convert_all_invalid_characters_to_HTML_entity_code: diag(95101, ts.DiagnosticCategory.Message, "Convert_all_invalid_characters_to_HTML_entity_code_95101", "Convert all invalid characters to HTML entity code"),
+        Add_class_tag: diag(95102, ts.DiagnosticCategory.Message, "Add_class_tag_95102", "Add '@class' tag"),
+        Add_this_tag: diag(95103, ts.DiagnosticCategory.Message, "Add_this_tag_95103", "Add '@this' tag"),
+        Add_this_parameter: diag(95104, ts.DiagnosticCategory.Message, "Add_this_parameter_95104", "Add 'this' parameter."),
+        Convert_function_expression_0_to_arrow_function: diag(95105, ts.DiagnosticCategory.Message, "Convert_function_expression_0_to_arrow_function_95105", "Convert function expression '{0}' to arrow function"),
+        Convert_function_declaration_0_to_arrow_function: diag(95106, ts.DiagnosticCategory.Message, "Convert_function_declaration_0_to_arrow_function_95106", "Convert function declaration '{0}' to arrow function"),
+        Fix_all_implicit_this_errors: diag(95107, ts.DiagnosticCategory.Message, "Fix_all_implicit_this_errors_95107", "Fix all implicit-'this' errors"),
+        Wrap_invalid_character_in_an_expression_container: diag(95108, ts.DiagnosticCategory.Message, "Wrap_invalid_character_in_an_expression_container_95108", "Wrap invalid character in an expression container"),
+        Wrap_all_invalid_characters_in_an_expression_container: diag(95109, ts.DiagnosticCategory.Message, "Wrap_all_invalid_characters_in_an_expression_container_95109", "Wrap all invalid characters in an expression container"),
         No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, ts.DiagnosticCategory.Error, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
         Classes_may_not_have_a_field_named_constructor: diag(18006, ts.DiagnosticCategory.Error, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
         JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, ts.DiagnosticCategory.Error, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
@@ -8455,11 +8467,20 @@ var ts;
     }
     ts.getLineStarts = getLineStarts;
     /* @internal */
+    function computeLineAndCharacterOfPosition(lineStarts, position) {
+        var lineNumber = computeLineOfPosition(lineStarts, position);
+        return {
+            line: lineNumber,
+            character: position - lineStarts[lineNumber]
+        };
+    }
+    ts.computeLineAndCharacterOfPosition = computeLineAndCharacterOfPosition;
     /**
+     * @internal
      * We assume the first line starts at position 0 and 'position' is non-negative.
      */
-    function computeLineAndCharacterOfPosition(lineStarts, position) {
-        var lineNumber = ts.binarySearch(lineStarts, position, ts.identity, ts.compareValues);
+    function computeLineOfPosition(lineStarts, position, lowerBound) {
+        var lineNumber = ts.binarySearch(lineStarts, position, ts.identity, ts.compareValues, lowerBound);
         if (lineNumber < 0) {
             // If the actual position was not found,
             // the binary search returns the 2's-complement of the next line start
@@ -8471,12 +8492,22 @@ var ts;
             lineNumber = ~lineNumber - 1;
             ts.Debug.assert(lineNumber !== -1, "position cannot precede the beginning of the file");
         }
-        return {
-            line: lineNumber,
-            character: position - lineStarts[lineNumber]
-        };
+        return lineNumber;
     }
-    ts.computeLineAndCharacterOfPosition = computeLineAndCharacterOfPosition;
+    ts.computeLineOfPosition = computeLineOfPosition;
+    /** @internal */
+    function getLinesBetweenPositions(sourceFile, pos1, pos2) {
+        if (pos1 === pos2)
+            return 0;
+        var lineStarts = getLineStarts(sourceFile);
+        var lower = Math.min(pos1, pos2);
+        var isNegative = lower === pos2;
+        var upper = isNegative ? pos1 : pos2;
+        var lowerLine = computeLineOfPosition(lineStarts, lower);
+        var upperLine = computeLineOfPosition(lineStarts, upper, lowerLine);
+        return isNegative ? lowerLine - upperLine : upperLine - lowerLine;
+    }
+    ts.getLinesBetweenPositions = getLinesBetweenPositions;
     function getLineAndCharacterOfPosition(sourceFile, position) {
         return computeLineAndCharacterOfPosition(getLineStarts(sourceFile), position);
     }
@@ -12848,6 +12879,7 @@ var ts;
     ts.emptyUnderscoreEscapedMap = ts.emptyMap;
     ts.externalHelpersModuleNameText = "tslib";
     ts.defaultMaximumTruncationLength = 160;
+    ts.noTruncationMaximumTruncationLength = 1000000;
     function getDeclarationOfKind(symbol, kind) {
         var declarations = symbol.declarations;
         if (declarations) {
@@ -13301,7 +13333,7 @@ var ts;
             return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos, /*stopAfterLineBreak*/ false, /*stopAtComments*/ true);
         }
         if (includeJsDoc && ts.hasJSDocNodes(node)) {
-            return getTokenPosOfNode(node.jsDoc[0]);
+            return getTokenPosOfNode(node.jsDoc[0], sourceFile);
         }
         // For a syntax list, it is possible that one of its children has JSDocComment nodes, while
         // the syntax list itself considers them as normal trivia. Therefore if we simply skip
@@ -16261,8 +16293,8 @@ var ts;
                 write(s);
             }
         }
-        function writeLine() {
-            if (!lineStart) {
+        function writeLine(force) {
+            if (!lineStart || force) {
                 output += newLine;
                 lineCount++;
                 linePos = output.length;
@@ -16373,6 +16405,14 @@ var ts;
             } });
     }
     ts.getTrailingSemicolonDeferringWriter = getTrailingSemicolonDeferringWriter;
+    function hostUsesCaseSensitiveFileNames(host) {
+        return host.useCaseSensitiveFileNames ? host.useCaseSensitiveFileNames() : false;
+    }
+    ts.hostUsesCaseSensitiveFileNames = hostUsesCaseSensitiveFileNames;
+    function hostGetCanonicalFileName(host) {
+        return ts.createGetCanonicalFileName(hostUsesCaseSensitiveFileNames(host));
+    }
+    ts.hostGetCanonicalFileName = hostGetCanonicalFileName;
     function getResolvedExternalModuleName(host, file, referenceFile) {
         return file.moduleName || getExternalModuleNameFromPath(host, file.fileName, referenceFile && referenceFile.fileName);
     }
@@ -16493,12 +16533,13 @@ var ts;
         }
     }
     ts.writeFileEnsuringDirectories = writeFileEnsuringDirectories;
-    function getLineOfLocalPosition(currentSourceFile, pos) {
-        return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line;
+    function getLineOfLocalPosition(sourceFile, pos) {
+        var lineStarts = ts.getLineStarts(sourceFile);
+        return ts.computeLineOfPosition(lineStarts, pos);
     }
     ts.getLineOfLocalPosition = getLineOfLocalPosition;
     function getLineOfLocalPositionFromLineMap(lineMap, pos) {
-        return ts.computeLineAndCharacterOfPosition(lineMap, pos).line;
+        return ts.computeLineOfPosition(lineMap, pos);
     }
     ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
     function getFirstConstructorWithBody(node) {
@@ -17269,7 +17310,7 @@ var ts;
     }
     ts.rangeIsOnSingleLine = rangeIsOnSingleLine;
     function rangeStartPositionsAreOnSameLine(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), getStartPositionOfRange(range2, sourceFile), sourceFile);
+        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile, /*includeComments*/ false), getStartPositionOfRange(range2, sourceFile, /*includeComments*/ false), sourceFile);
     }
     ts.rangeStartPositionsAreOnSameLine = rangeStartPositionsAreOnSameLine;
     function rangeEndPositionsAreOnSameLine(range1, range2, sourceFile) {
@@ -17277,26 +17318,52 @@ var ts;
     }
     ts.rangeEndPositionsAreOnSameLine = rangeEndPositionsAreOnSameLine;
     function rangeStartIsOnSameLineAsRangeEnd(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), range2.end, sourceFile);
+        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile, /*includeComments*/ false), range2.end, sourceFile);
     }
     ts.rangeStartIsOnSameLineAsRangeEnd = rangeStartIsOnSameLineAsRangeEnd;
     function rangeEndIsOnSameLineAsRangeStart(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile), sourceFile);
+        return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile, /*includeComments*/ false), sourceFile);
     }
     ts.rangeEndIsOnSameLineAsRangeStart = rangeEndIsOnSameLineAsRangeStart;
+    function getLinesBetweenRangeEndAndRangeStart(range1, range2, sourceFile, includeSecondRangeComments) {
+        var range2Start = getStartPositionOfRange(range2, sourceFile, includeSecondRangeComments);
+        return ts.getLinesBetweenPositions(sourceFile, range1.end, range2Start);
+    }
+    ts.getLinesBetweenRangeEndAndRangeStart = getLinesBetweenRangeEndAndRangeStart;
+    function getLinesBetweenRangeEndPositions(range1, range2, sourceFile) {
+        return ts.getLinesBetweenPositions(sourceFile, range1.end, range2.end);
+    }
+    ts.getLinesBetweenRangeEndPositions = getLinesBetweenRangeEndPositions;
     function isNodeArrayMultiLine(list, sourceFile) {
         return !positionsAreOnSameLine(list.pos, list.end, sourceFile);
     }
     ts.isNodeArrayMultiLine = isNodeArrayMultiLine;
     function positionsAreOnSameLine(pos1, pos2, sourceFile) {
-        return pos1 === pos2 ||
-            getLineOfLocalPosition(sourceFile, pos1) === getLineOfLocalPosition(sourceFile, pos2);
+        return ts.getLinesBetweenPositions(sourceFile, pos1, pos2) === 0;
     }
     ts.positionsAreOnSameLine = positionsAreOnSameLine;
-    function getStartPositionOfRange(range, sourceFile) {
-        return positionIsSynthesized(range.pos) ? -1 : ts.skipTrivia(sourceFile.text, range.pos);
+    function getStartPositionOfRange(range, sourceFile, includeComments) {
+        return positionIsSynthesized(range.pos) ? -1 : ts.skipTrivia(sourceFile.text, range.pos, /*stopAfterLineBreak*/ false, includeComments);
     }
     ts.getStartPositionOfRange = getStartPositionOfRange;
+    function getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter(pos, sourceFile, includeComments) {
+        var startPos = ts.skipTrivia(sourceFile.text, pos, /*stopAfterLineBreak*/ false, includeComments);
+        var prevPos = getPreviousNonWhitespacePosition(startPos, sourceFile);
+        return ts.getLinesBetweenPositions(sourceFile, prevPos || 0, startPos);
+    }
+    ts.getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter = getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter;
+    function getLinesBetweenPositionAndNextNonWhitespaceCharacter(pos, sourceFile, includeComments) {
+        var nextPos = ts.skipTrivia(sourceFile.text, pos, /*stopAfterLineBreak*/ false, includeComments);
+        return ts.getLinesBetweenPositions(sourceFile, pos, nextPos);
+    }
+    ts.getLinesBetweenPositionAndNextNonWhitespaceCharacter = getLinesBetweenPositionAndNextNonWhitespaceCharacter;
+    function getPreviousNonWhitespacePosition(pos, sourceFile) {
+        while (pos-- > 0) {
+            if (!ts.isWhiteSpaceLike(sourceFile.text.charCodeAt(pos))) {
+                return pos;
+            }
+        }
+    }
     /**
      * Determines whether a name was originally the declaration name of an enum or namespace
      * declaration.
@@ -22806,7 +22873,11 @@ var ts;
                         parseErrorAtRange(openingTag, ts.Diagnostics.JSX_fragment_has_no_corresponding_closing_tag);
                     }
                     else {
-                        parseErrorAtRange(openingTag.tagName, ts.Diagnostics.JSX_element_0_has_no_corresponding_closing_tag, ts.getTextOfNodeFromSourceText(sourceText, openingTag.tagName));
+                        // We want the error span to cover only 'Foo.Bar' in < Foo.Bar >
+                        // or to cover only 'Foo' in < Foo >
+                        var tag = openingTag.tagName;
+                        var start = ts.skipTrivia(sourceText, tag.pos);
+                        parseErrorAt(start, tag.end, ts.Diagnostics.JSX_element_0_has_no_corresponding_closing_tag, ts.getTextOfNodeFromSourceText(sourceText, openingTag.tagName));
                     }
                     return undefined;
                 case 30 /* LessThanSlashToken */:
@@ -35841,7 +35912,7 @@ var ts;
                 return true;
             }
             if (isUsedInFunctionOrInstanceProperty(usage, declaration, container)) {
-                if (compilerOptions.target === 99 /* ESNext */ && !!compilerOptions.useDefineForClassFields) {
+                if (compilerOptions.target === 99 /* ESNext */ && !!compilerOptions.useDefineForClassFields && ts.getContainingClass(declaration)) {
                     return (ts.isPropertyDeclaration(declaration) || ts.isParameterPropertyDeclaration(declaration, declaration.parent)) &&
                         !isPropertyImmediatelyReferencedWithinDeclaration(declaration, usage, /*stopAtAnyPropertyDeclaration*/ true);
                 }
@@ -37352,7 +37423,7 @@ var ts;
             return getPackagesSet().has(ts.getTypesPackageName(packageName));
         }
         function resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias) {
-            if (moduleSymbol) {
+            if (moduleSymbol === null || moduleSymbol === void 0 ? void 0 : moduleSymbol.exports) {
                 var exportEquals = resolveSymbol(moduleSymbol.exports.get("export=" /* ExportEquals */), dontResolveAlias);
                 var exported = getCommonJsExportEquals(getMergedSymbol(exportEquals), getMergedSymbol(moduleSymbol));
                 return getMergedSymbol(exported) || moduleSymbol;
@@ -38182,7 +38253,7 @@ var ts;
             var sourceFile = enclosingDeclaration && ts.getSourceFileOfNode(enclosingDeclaration);
             printer.writeNode(4 /* Unspecified */, typeNode, /*sourceFile*/ sourceFile, writer);
             var result = writer.getText();
-            var maxLength = noTruncation ? undefined : ts.defaultMaximumTruncationLength * 2;
+            var maxLength = noTruncation ? ts.noTruncationMaximumTruncationLength * 2 : ts.defaultMaximumTruncationLength * 2;
             if (maxLength && result && result.length >= maxLength) {
                 return result.substr(0, maxLength - "...".length) + "...";
             }
@@ -38243,9 +38314,13 @@ var ts;
                     tracker: tracker && tracker.trackSymbol ? tracker : { trackSymbol: ts.noop, moduleResolverHost: flags & 134217728 /* DoNotIncludeSymbolChain */ ? {
                             getCommonSourceDirectory: host.getCommonSourceDirectory ? function () { return host.getCommonSourceDirectory(); } : function () { return ""; },
                             getSourceFiles: function () { return host.getSourceFiles(); },
-                            getCurrentDirectory: ts.maybeBind(host, host.getCurrentDirectory),
+                            getCurrentDirectory: function () { return host.getCurrentDirectory(); },
                             getProbableSymlinks: ts.maybeBind(host, host.getProbableSymlinks),
-                            useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames)
+                            useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames),
+                            redirectTargetsMap: host.redirectTargetsMap,
+                            getProjectReferenceRedirect: function (fileName) { return host.getProjectReferenceRedirect(fileName); },
+                            isSourceOfProjectReferenceRedirect: function (fileName) { return host.isSourceOfProjectReferenceRedirect(fileName); },
+                            fileExists: function (fileName) { return host.fileExists(fileName); },
                         } : undefined },
                     encounteredError: false,
                     visitedTypes: undefined,
@@ -38259,7 +38334,7 @@ var ts;
             function checkTruncationLength(context) {
                 if (context.truncating)
                     return context.truncating;
-                return context.truncating = !(context.flags & 1 /* NoTruncation */) && context.approximateLength > ts.defaultMaximumTruncationLength;
+                return context.truncating = context.approximateLength > ((context.flags & 1 /* NoTruncation */) ? ts.noTruncationMaximumTruncationLength : ts.defaultMaximumTruncationLength);
             }
             function typeToTypeNodeHelper(type, context) {
                 if (cancellationToken && cancellationToken.throwIfCancellationRequested) {
@@ -39145,7 +39220,7 @@ var ts;
                     // specifier preference
                     var moduleResolverHost = context.tracker.moduleResolverHost;
                     var specifierCompilerOptions = isBundle_1 ? __assign(__assign({}, compilerOptions), { baseUrl: moduleResolverHost.getCommonSourceDirectory() }) : compilerOptions;
-                    specifier = ts.first(ts.moduleSpecifiers.getModuleSpecifiers(symbol, specifierCompilerOptions, contextFile, moduleResolverHost, host.getSourceFiles(), { importModuleSpecifierPreference: isBundle_1 ? "non-relative" : "relative" }, host.redirectTargetsMap));
+                    specifier = ts.first(ts.moduleSpecifiers.getModuleSpecifiers(symbol, specifierCompilerOptions, contextFile, moduleResolverHost, { importModuleSpecifierPreference: isBundle_1 ? "non-relative" : "relative" }));
                     links.specifierCache = links.specifierCache || ts.createMap();
                     links.specifierCache.set(contextFile.path, specifier);
                 }
@@ -40336,7 +40411,7 @@ var ts;
                                     var getCanonicalFileName = ts.createGetCanonicalFileName(!!host.useCaseSensitiveFileNames);
                                     var resolverHost = {
                                         getCanonicalFileName: getCanonicalFileName,
-                                        getCurrentDirectory: context.tracker.moduleResolverHost.getCurrentDirectory ? function () { return context.tracker.moduleResolverHost.getCurrentDirectory(); } : function () { return ""; },
+                                        getCurrentDirectory: function () { return context.tracker.moduleResolverHost.getCurrentDirectory(); },
                                         getCommonSourceDirectory: function () { return context.tracker.moduleResolverHost.getCommonSourceDirectory(); }
                                     };
                                     var newName = ts.getResolvedExternalModuleName(resolverHost, targetFile);
@@ -41081,7 +41156,7 @@ var ts;
                 // [Symbol.iterator] or next). This may be because we accessed properties from anyType,
                 // or it may have led to an error inside getElementTypeOfIterable.
                 var forOfStatement = declaration.parent.parent;
-                return checkRightHandSideOfForOf(forOfStatement.expression, forOfStatement.awaitModifier) || anyType;
+                return checkRightHandSideOfForOf(forOfStatement) || anyType;
             }
             if (ts.isBindingPattern(declaration.parent)) {
                 return getTypeForBindingElement(declaration);
@@ -44293,7 +44368,10 @@ var ts;
             return true;
         }
         function getSignatureOfTypeTag(node) {
-            var typeTag = ts.isInJSFile(node) ? ts.getJSDocTypeTag(node) : undefined;
+            // should be attached to a function declaration or expression
+            if (!(ts.isInJSFile(node) && ts.isFunctionLikeDeclaration(node)))
+                return undefined;
+            var typeTag = ts.getJSDocTypeTag(node);
             var signature = typeTag && typeTag.typeExpression && getSingleCallSignature(getTypeFromTypeNode(typeTag.typeExpression));
             return signature && getErasedSignature(signature);
         }
@@ -46307,65 +46385,89 @@ var ts;
             return type;
         }
         function getConditionalType(root, mapper) {
-            var checkType = instantiateType(root.checkType, mapper);
-            var extendsType = instantiateType(root.extendsType, mapper);
-            if (checkType === wildcardType || extendsType === wildcardType) {
-                return wildcardType;
+            var result;
+            var extraTypes;
+            var _loop_11 = function () {
+                var checkType = instantiateType(root.checkType, mapper);
+                var checkTypeInstantiable = isGenericObjectType(checkType) || isGenericIndexType(checkType);
+                var extendsType = instantiateType(root.extendsType, mapper);
+                if (checkType === wildcardType || extendsType === wildcardType) {
+                    return { value: wildcardType };
+                }
+                var combinedMapper = void 0;
+                if (root.inferTypeParameters) {
+                    var context = createInferenceContext(root.inferTypeParameters, /*signature*/ undefined, 0 /* None */);
+                    // We skip inference of the possible `infer` types unles the `extendsType` _is_ an infer type
+                    // if it was, it's trivial to say that extendsType = checkType, however such a pattern is used to
+                    // "reset" the type being build up during constraint calculation and avoid making an apparently "infinite" constraint
+                    // so in those cases we refain from performing inference and retain the uninfered type parameter
+                    if (!checkTypeInstantiable || !ts.some(root.inferTypeParameters, function (t) { return t === extendsType; })) {
+                        // We don't want inferences from constraints as they may cause us to eagerly resolve the
+                        // conditional type instead of deferring resolution. Also, we always want strict function
+                        // types rules (i.e. proper contravariance) for inferences.
+                        inferTypes(context.inferences, checkType, extendsType, 128 /* NoConstraints */ | 256 /* AlwaysStrict */);
+                    }
+                    combinedMapper = mergeTypeMappers(mapper, context.mapper);
+                }
+                // Instantiate the extends type including inferences for 'infer T' type parameters
+                var inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
+                // We attempt to resolve the conditional type only when the check and extends types are non-generic
+                if (!checkTypeInstantiable && !isGenericObjectType(inferredExtendsType) && !isGenericIndexType(inferredExtendsType)) {
+                    // Return falseType for a definitely false extends check. We check an instantiations of the two
+                    // types with type parameters mapped to the wildcard type, the most permissive instantiations
+                    // possible (the wildcard type is assignable to and from all types). If those are not related,
+                    // then no instantiations will be and we can just return the false branch type.
+                    if (!(inferredExtendsType.flags & 3 /* AnyOrUnknown */) && (checkType.flags & 1 /* Any */ || !isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType)))) {
+                        // Return union of trueType and falseType for 'any' since it matches anything
+                        if (checkType.flags & 1 /* Any */) {
+                            (extraTypes || (extraTypes = [])).push(instantiateTypeWithoutDepthIncrease(root.trueType, combinedMapper || mapper));
+                        }
+                        // If falseType is an immediately nested conditional type that isn't distributive or has an
+                        // identical checkType, switch to that type and loop.
+                        var falseType_1 = root.falseType;
+                        if (falseType_1.flags & 16777216 /* Conditional */) {
+                            var newRoot = falseType_1.root;
+                            if (newRoot.node.parent === root.node && (!newRoot.isDistributive || newRoot.checkType === root.checkType)) {
+                                root = newRoot;
+                                return "continue";
+                            }
+                        }
+                        result = instantiateTypeWithoutDepthIncrease(falseType_1, mapper);
+                        return "break";
+                    }
+                    // Return trueType for a definitely true extends check. We check instantiations of the two
+                    // types with type parameters mapped to their restrictive form, i.e. a form of the type parameter
+                    // that has no constraint. This ensures that, for example, the type
+                    //   type Foo<T extends { x: any }> = T extends { x: string } ? string : number
+                    // doesn't immediately resolve to 'string' instead of being deferred.
+                    if (inferredExtendsType.flags & 3 /* AnyOrUnknown */ || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(inferredExtendsType))) {
+                        result = instantiateTypeWithoutDepthIncrease(root.trueType, combinedMapper || mapper);
+                        return "break";
+                    }
+                }
+                // Return a deferred type for a check that is neither definitely true nor definitely false
+                var erasedCheckType = getActualTypeVariable(checkType);
+                result = createType(16777216 /* Conditional */);
+                result.root = root;
+                result.checkType = erasedCheckType;
+                result.extendsType = extendsType;
+                result.mapper = mapper;
+                result.combinedMapper = combinedMapper;
+                result.aliasSymbol = root.aliasSymbol;
+                result.aliasTypeArguments = instantiateTypes(root.aliasTypeArguments, mapper); // TODO: GH#18217
+                return "break";
+            };
+            // We loop here for an immediately nested conditional type in the false position, effectively treating
+            // types of the form 'A extends B ? X : C extends D ? Y : E extends F ? Z : ...' as a single construct for
+            // purposes of resolution. This means such types aren't subject to the instatiation depth limiter.
+            while (true) {
+                var state_4 = _loop_11();
+                if (typeof state_4 === "object")
+                    return state_4.value;
+                if (state_4 === "break")
+                    break;
             }
-            var checkTypeInstantiable = isGenericObjectType(checkType) || isGenericIndexType(checkType);
-            var combinedMapper;
-            if (root.inferTypeParameters) {
-                var context = createInferenceContext(root.inferTypeParameters, /*signature*/ undefined, 0 /* None */);
-                // We skip inference of the possible `infer` types unles the `extendsType` _is_ an infer type
-                // if it was, it's trivial to say that extendsType = checkType, however such a pattern is used to
-                // "reset" the type being build up during constraint calculation and avoid making an apparently "infinite" constraint
-                // so in those cases we refain from performing inference and retain the uninfered type parameter
-                if (!checkTypeInstantiable || !ts.some(root.inferTypeParameters, function (t) { return t === extendsType; })) {
-                    // We don't want inferences from constraints as they may cause us to eagerly resolve the
-                    // conditional type instead of deferring resolution. Also, we always want strict function
-                    // types rules (i.e. proper contravariance) for inferences.
-                    inferTypes(context.inferences, checkType, extendsType, 128 /* NoConstraints */ | 256 /* AlwaysStrict */);
-                }
-                combinedMapper = mergeTypeMappers(mapper, context.mapper);
-            }
-            // Instantiate the extends type including inferences for 'infer T' type parameters
-            var inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
-            // We attempt to resolve the conditional type only when the check and extends types are non-generic
-            if (!checkTypeInstantiable && !isGenericObjectType(inferredExtendsType) && !isGenericIndexType(inferredExtendsType)) {
-                if (inferredExtendsType.flags & 3 /* AnyOrUnknown */) {
-                    return instantiateType(root.trueType, combinedMapper || mapper);
-                }
-                // Return union of trueType and falseType for 'any' since it matches anything
-                if (checkType.flags & 1 /* Any */) {
-                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), instantiateType(root.falseType, mapper)]);
-                }
-                // Return falseType for a definitely false extends check. We check an instantiations of the two
-                // types with type parameters mapped to the wildcard type, the most permissive instantiations
-                // possible (the wildcard type is assignable to and from all types). If those are not related,
-                // then no instantiations will be and we can just return the false branch type.
-                if (!isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType))) {
-                    return instantiateType(root.falseType, mapper);
-                }
-                // Return trueType for a definitely true extends check. We check instantiations of the two
-                // types with type parameters mapped to their restrictive form, i.e. a form of the type parameter
-                // that has no constraint. This ensures that, for example, the type
-                //   type Foo<T extends { x: any }> = T extends { x: string } ? string : number
-                // doesn't immediately resolve to 'string' instead of being deferred.
-                if (isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(inferredExtendsType))) {
-                    return instantiateType(root.trueType, combinedMapper || mapper);
-                }
-            }
-            // Return a deferred type for a check that is neither definitely true nor definitely false
-            var erasedCheckType = getActualTypeVariable(checkType);
-            var result = createType(16777216 /* Conditional */);
-            result.root = root;
-            result.checkType = erasedCheckType;
-            result.extendsType = extendsType;
-            result.mapper = mapper;
-            result.combinedMapper = combinedMapper;
-            result.aliasSymbol = root.aliasSymbol;
-            result.aliasTypeArguments = instantiateTypes(root.aliasTypeArguments, mapper); // TODO: GH#18217
-            return result;
+            return extraTypes ? getUnionType(ts.append(extraTypes, result)) : result;
         }
         function getTrueTypeFromConditionalType(type) {
             return type.resolvedTrueType || (type.resolvedTrueType = instantiateType(type.root.trueType, type.mapper));
@@ -47253,6 +47355,16 @@ var ts;
             instantiationDepth--;
             return result;
         }
+        /**
+         * This can be used to avoid the penalty on instantiation depth for types which result from immediate
+         * simplification. It essentially removes the depth increase done in `instantiateType`.
+         */
+        function instantiateTypeWithoutDepthIncrease(type, mapper) {
+            instantiationDepth--;
+            var result = instantiateType(type, mapper);
+            instantiationDepth++;
+            return result;
+        }
         function instantiateTypeWorker(type, mapper) {
             var _a;
             var flags = type.flags;
@@ -48738,7 +48850,7 @@ var ts;
                     reducedTarget = findMatchingDiscriminantType(source, target, isRelatedTo) || filterPrimitivesIfContainsNonPrimitive(target);
                     checkTypes = reducedTarget.flags & 1048576 /* Union */ ? reducedTarget.types : [reducedTarget];
                 }
-                var _loop_11 = function (prop) {
+                var _loop_12 = function (prop) {
                     if (shouldCheckAsExcessProperty(prop, source.symbol) && !isIgnoredJsxProperty(source, prop)) {
                         if (!isKnownProperty(reducedTarget, prop.escapedName, isComparingJsxAttributes)) {
                             if (reportErrors) {
@@ -48794,9 +48906,9 @@ var ts;
                 };
                 for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    var state_4 = _loop_11(prop);
-                    if (typeof state_4 === "object")
-                        return state_4.value;
+                    var state_5 = _loop_12(prop);
+                    if (typeof state_5 === "object")
+                        return state_5.value;
                 }
                 return false;
             }
@@ -49232,6 +49344,8 @@ var ts;
                         }
                     }
                     else {
+                        // conditionals aren't related to one another via distributive constraint as it is much too inaccurate and allows way
+                        // more assignments than are desirable (since it maps the source check type to its constraint, it loses information)
                         var distributiveConstraint = getConstraintOfDistributiveConditionalType(source);
                         if (distributiveConstraint) {
                             if (result = isRelatedTo(distributiveConstraint, target, reportErrors)) {
@@ -49239,12 +49353,14 @@ var ts;
                                 return result;
                             }
                         }
-                        var defaultConstraint = getDefaultConstraintOfConditionalType(source);
-                        if (defaultConstraint) {
-                            if (result = isRelatedTo(defaultConstraint, target, reportErrors)) {
-                                resetErrorInfo(saveErrorInfo);
-                                return result;
-                            }
+                    }
+                    // conditionals _can_ be related to one another via normal constraint, as, eg, `A extends B ? O : never` should be assignable to `O`
+                    // when `O` is a conditional (`never` is trivially aissgnable to `O`, as is `O`!).
+                    var defaultConstraint = getDefaultConstraintOfConditionalType(source);
+                    if (defaultConstraint) {
+                        if (result = isRelatedTo(defaultConstraint, target, reportErrors)) {
+                            resetErrorInfo(saveErrorInfo);
+                            return result;
                         }
                     }
                 }
@@ -49473,11 +49589,11 @@ var ts;
                 // constituents of 'target'. If any combination does not have a match then 'source' is not relatable.
                 var discriminantCombinations = ts.cartesianProduct(sourceDiscriminantTypes);
                 var matchingTypes = [];
-                var _loop_12 = function (combination) {
+                var _loop_13 = function (combination) {
                     var hasMatch = false;
                     outer: for (var _i = 0, _a = target.types; _i < _a.length; _i++) {
                         var type = _a[_i];
-                        var _loop_13 = function (i) {
+                        var _loop_14 = function (i) {
                             var sourceProperty = sourcePropertiesFiltered[i];
                             var targetProperty = getPropertyOfType(type, sourceProperty.escapedName);
                             if (!targetProperty)
@@ -49493,8 +49609,8 @@ var ts;
                             }
                         };
                         for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
-                            var state_6 = _loop_13(i);
-                            switch (state_6) {
+                            var state_7 = _loop_14(i);
+                            switch (state_7) {
                                 case "continue-outer": continue outer;
                             }
                         }
@@ -49507,9 +49623,9 @@ var ts;
                 };
                 for (var _a = 0, discriminantCombinations_1 = discriminantCombinations; _a < discriminantCombinations_1.length; _a++) {
                     var combination = discriminantCombinations_1[_a];
-                    var state_5 = _loop_12(combination);
-                    if (typeof state_5 === "object")
-                        return state_5.value;
+                    var state_6 = _loop_13(combination);
+                    if (typeof state_6 === "object")
+                        return state_6.value;
                 }
                 // Compare the remaining non-discriminant properties of each match.
                 var result = -1 /* True */;
@@ -50094,7 +50210,7 @@ var ts;
                 // The emptyArray singleton is used to signal a recursive invocation.
                 cache.variances = ts.emptyArray;
                 variances = [];
-                var _loop_14 = function (tp) {
+                var _loop_15 = function (tp) {
                     var unmeasurable = false;
                     var unreliable = false;
                     var oldHandler = outofbandVarianceMarkerHandler;
@@ -50124,7 +50240,7 @@ var ts;
                 };
                 for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
                     var tp = typeParameters_1[_i];
-                    _loop_14(tp);
+                    _loop_15(tp);
                 }
                 cache.variances = variances;
             }
@@ -51232,7 +51348,7 @@ var ts;
         function inferTypes(inferences, originalSource, originalTarget, priority, contravariant) {
             if (priority === void 0) { priority = 0; }
             if (contravariant === void 0) { contravariant = false; }
-            var symbolStack;
+            var symbolOrTypeStack;
             var visited;
             var bivariant = false;
             var propagationType;
@@ -51411,8 +51527,8 @@ var ts;
                     priority = savePriority;
                 }
                 else if (target.flags & 134217728 /* Awaited */) {
-                    var targetTypes = [target.awaitedType, createPromiseLikeType(target.awaitedType)];
-                    inferToMultipleTypes(source, targetTypes, target.flags);
+                    inferFromTypes(source, target.awaitedType);
+                    inferFromTypes(source, createPromiseLikeType(target.awaitedType));
                 }
                 else if (target.flags & 3145728 /* UnionOrIntersection */) {
                     inferToMultipleTypes(source, target.types, target.flags);
@@ -51539,10 +51655,34 @@ var ts;
                 }
                 return typeVariable;
             }
+            function isPromiseForType(promiseType, promisedType) {
+                var _a;
+                return isThenableType(promiseType) && unwrapAwaitedType((_a = getPromisedTypeOfPromise(promiseType)) !== null && _a !== void 0 ? _a : errorType) === promisedType;
+            }
             function inferToMultipleTypes(source, targets, targetFlags) {
                 var typeVariableCount = 0;
                 if (targetFlags & 1048576 /* Union */) {
                     var nakedTypeVariable = void 0;
+                    for (var _i = 0, targets_2 = targets; _i < targets_2.length; _i++) {
+                        var t = targets_2[_i];
+                        if (getInferenceInfoForType(t)) {
+                            nakedTypeVariable = t;
+                            typeVariableCount++;
+                        }
+                    }
+                    // To better support backwards compatibility with the new `awaited` type, we detect a target
+                    // union of exactly `T | PromiseLike<T>` (for any compatible `PromiseLike`). When encountered,
+                    // we infer from source to the type parameter `T`, where each type of source is mapped to extract
+                    // the promised type of any promise (e.g., `string | Promise<number>` becomes `string | number`).
+                    if (typeVariableCount === 1 && targets.length === 2) {
+                        for (var _a = 0, targets_3 = targets; _a < targets_3.length; _a++) {
+                            var t = targets_3[_a];
+                            if (!getInferenceInfoForType(t) && isPromiseForType(t, nakedTypeVariable)) {
+                                inferFromTypes(mapType(source, function (s) { var _a; return (_a = getPromisedTypeOfPromise(s)) !== null && _a !== void 0 ? _a : s; }), nakedTypeVariable);
+                                return;
+                            }
+                        }
+                    }
                     var sources = source.flags & 1048576 /* Union */ ? source.types : [source];
                     var matched_1 = new Array(sources.length);
                     var inferenceCircularity = false;
@@ -51550,13 +51690,9 @@ var ts;
                     // track whether inferences were made from that particular type to some target with
                     // equal priority (i.e. of equal quality) to what we would infer for a naked type
                     // parameter.
-                    for (var _i = 0, targets_2 = targets; _i < targets_2.length; _i++) {
-                        var t = targets_2[_i];
-                        if (getInferenceInfoForType(t)) {
-                            nakedTypeVariable = t;
-                            typeVariableCount++;
-                        }
-                        else {
+                    for (var _b = 0, targets_4 = targets; _b < targets_4.length; _b++) {
+                        var t = targets_4[_b];
+                        if (!getInferenceInfoForType(t)) {
                             for (var i = 0; i < sources.length; i++) {
                                 var saveInferencePriority = inferencePriority;
                                 inferencePriority = 512 /* MaxValue */;
@@ -51594,8 +51730,8 @@ var ts;
                     // We infer from types that are not naked type variables first so that inferences we
                     // make from nested naked type variables and given slightly higher priority by virtue
                     // of being first in the candidates array.
-                    for (var _a = 0, targets_3 = targets; _a < targets_3.length; _a++) {
-                        var t = targets_3[_a];
+                    for (var _c = 0, targets_5 = targets; _c < targets_5.length; _c++) {
+                        var t = targets_5[_c];
                         if (getInferenceInfoForType(t)) {
                             typeVariableCount++;
                         }
@@ -51609,8 +51745,8 @@ var ts;
                 // we want to infer string for T, not Promise<string> | string. For intersection types
                 // we only infer to single naked type variables.
                 if (targetFlags & 2097152 /* Intersection */ ? typeVariableCount === 1 : typeVariableCount > 0) {
-                    for (var _b = 0, targets_4 = targets; _b < targets_4.length; _b++) {
-                        var t = targets_4[_b];
+                    for (var _d = 0, targets_6 = targets; _d < targets_6.length; _d++) {
+                        var t = targets_6[_d];
                         if (getInferenceInfoForType(t)) {
                             inferWithPriority(source, t, 1 /* NakedTypeVariable */);
                         }
@@ -51675,15 +51811,15 @@ var ts;
                 // its symbol with the instance side which would lead to false positives.
                 var isNonConstructorObject = target.flags & 524288 /* Object */ &&
                     !(ts.getObjectFlags(target) & 16 /* Anonymous */ && target.symbol && target.symbol.flags & 32 /* Class */);
-                var symbol = isNonConstructorObject ? target.symbol : undefined;
-                if (symbol) {
-                    if (ts.contains(symbolStack, symbol)) {
+                var symbolOrType = isNonConstructorObject ? isTupleType(target) ? target.target : target.symbol : undefined;
+                if (symbolOrType) {
+                    if (ts.contains(symbolOrTypeStack, symbolOrType)) {
                         inferencePriority = -1 /* Circularity */;
                         return;
                     }
-                    (symbolStack || (symbolStack = [])).push(symbol);
+                    (symbolOrTypeStack || (symbolOrTypeStack = [])).push(symbolOrType);
                     inferFromObjectTypesWorker(source, target);
-                    symbolStack.pop();
+                    symbolOrTypeStack.pop();
                 }
                 else {
                     inferFromObjectTypesWorker(source, target);
@@ -52012,6 +52148,12 @@ var ts;
             }
             return false;
         }
+        // Given a source x, check if target matches x or is an && operation with an operand that matches x.
+        function containsTruthyCheck(source, target) {
+            return isMatchingReference(source, target) ||
+                (target.kind === 210 /* BinaryExpression */ && target.operatorToken.kind === 55 /* AmpersandAmpersandToken */ &&
+                    (containsTruthyCheck(source, target.left) || containsTruthyCheck(source, target.right)));
+        }
         function getAccessedPropertyName(access) {
             return access.kind === 195 /* PropertyAccessExpression */ ? access.name.escapedText :
                 ts.isStringOrNumericLiteralLike(access.argumentExpression) ? ts.escapeLeadingUnderscores(access.argumentExpression.text) :
@@ -52258,7 +52400,7 @@ var ts;
                 case 232 /* ForInStatement */:
                     return stringType;
                 case 233 /* ForOfStatement */:
-                    return checkRightHandSideOfForOf(parent.expression, parent.awaitModifier) || errorType;
+                    return checkRightHandSideOfForOf(parent) || errorType;
                 case 210 /* BinaryExpression */:
                     return getAssignedTypeOfBinaryExpression(parent);
                 case 204 /* DeleteExpression */:
@@ -52299,7 +52441,7 @@ var ts;
                 return stringType;
             }
             if (node.parent.parent.kind === 233 /* ForOfStatement */) {
-                return checkRightHandSideOfForOf(node.parent.parent.expression, node.parent.parent.awaitModifier) || errorType;
+                return checkRightHandSideOfForOf(node.parent.parent) || errorType;
             }
             return errorType;
         }
@@ -52531,20 +52673,29 @@ var ts;
             return isLengthPushOrUnshift || isElementAssignment;
         }
         function isDeclarationWithExplicitTypeAnnotation(declaration) {
-            return !!(declaration && (declaration.kind === 243 /* VariableDeclaration */ || declaration.kind === 157 /* Parameter */ ||
+            return (declaration.kind === 243 /* VariableDeclaration */ || declaration.kind === 157 /* Parameter */ ||
                 declaration.kind === 160 /* PropertyDeclaration */ || declaration.kind === 159 /* PropertySignature */) &&
-                ts.getEffectiveTypeAnnotationNode(declaration));
+                !!ts.getEffectiveTypeAnnotationNode(declaration);
         }
         function getExplicitTypeOfSymbol(symbol, diagnostic) {
             if (symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 512 /* ValueModule */)) {
                 return getTypeOfSymbol(symbol);
             }
             if (symbol.flags & (3 /* Variable */ | 4 /* Property */)) {
-                if (isDeclarationWithExplicitTypeAnnotation(symbol.valueDeclaration)) {
-                    return getTypeOfSymbol(symbol);
-                }
-                if (diagnostic && symbol.valueDeclaration) {
-                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(symbol.valueDeclaration, ts.Diagnostics._0_needs_an_explicit_type_annotation, symbolToString(symbol)));
+                var declaration = symbol.valueDeclaration;
+                if (declaration) {
+                    if (isDeclarationWithExplicitTypeAnnotation(declaration)) {
+                        return getTypeOfSymbol(symbol);
+                    }
+                    if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 233 /* ForOfStatement */) {
+                        var expressionType = getTypeOfDottedName(declaration.parent.parent.expression, /*diagnostic*/ undefined);
+                        if (expressionType) {
+                            return getForOfIterationType(declaration.parent.parent, expressionType);
+                        }
+                    }
+                    if (diagnostic) {
+                        ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(declaration, ts.Diagnostics._0_needs_an_explicit_type_annotation, symbolToString(symbol)));
+                    }
                 }
             }
         }
@@ -53309,14 +53460,22 @@ var ts;
                 if (type.flags & 1 /* Any */ && literal.text === "function") {
                     return type;
                 }
+                if (assumeTrue && type.flags & 2 /* Unknown */ && literal.text === "object") {
+                    // The pattern x && typeof x === 'object', where x is of type unknown, narrows x to type object. We don't
+                    // need to check for the reverse typeof x === 'object' && x since that already narrows correctly.
+                    if (typeOfExpr.parent.parent.kind === 210 /* BinaryExpression */) {
+                        var expr = typeOfExpr.parent.parent;
+                        if (expr.operatorToken.kind === 55 /* AmpersandAmpersandToken */ && expr.right === typeOfExpr.parent && containsTruthyCheck(reference, expr.left)) {
+                            return nonPrimitiveType;
+                        }
+                    }
+                    return getUnionType([nonPrimitiveType, nullType]);
+                }
                 var facts = assumeTrue ?
                     typeofEQFacts.get(literal.text) || 128 /* TypeofEQHostObject */ :
                     typeofNEFacts.get(literal.text) || 32768 /* TypeofNEHostObject */;
                 return getTypeWithFacts(assumeTrue ? mapType(type, narrowTypeForTypeof) : type, facts);
                 function narrowTypeForTypeof(type) {
-                    if (type.flags & 2 /* Unknown */ && literal.text === "object") {
-                        return getUnionType([nonPrimitiveType, nullType]);
-                    }
                     // 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.
@@ -53591,7 +53750,10 @@ var ts;
                         }
                         if (strictNullChecks && assumeTrue && optionalChainContainsReference(predicateArgument, reference) &&
                             !(getTypeFacts(predicate.type) & 65536 /* EQUndefined */)) {
-                            return getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
+                            type = getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
+                        }
+                        if (isMatchingReferenceDiscriminant(predicateArgument, declaredType)) {
+                            return narrowTypeByDiscriminant(type, predicateArgument, function (t) { return getNarrowedType(t, predicate.type, assumeTrue, isTypeSubtypeOf); });
                         }
                     }
                 }
@@ -55473,8 +55635,8 @@ var ts;
             var inDestructuringPattern = ts.isAssignmentTarget(node);
             // Grammar checking
             checkGrammarObjectLiteralExpression(node, inDestructuringPattern);
-            var propertiesTable;
-            var allPropertiesTable = ts.createSymbolTable();
+            var allPropertiesTable = strictNullChecks ? ts.createSymbolTable() : undefined;
+            var propertiesTable = ts.createSymbolTable();
             var propertiesArray = [];
             var spread = emptyObjectType;
             var contextualType = getApparentTypeOfContextualType(node);
@@ -55489,7 +55651,6 @@ var ts;
             var patternWithComputedProperties = false;
             var hasComputedStringProperty = false;
             var hasComputedNumberProperty = false;
-            propertiesTable = ts.createSymbolTable();
             var offset = 0;
             for (var i = 0; i < node.properties.length; i++) {
                 var memberDecl = node.properties[i];
@@ -55548,7 +55709,7 @@ var ts;
                     prop.type = type;
                     prop.target = member;
                     member = prop;
-                    allPropertiesTable.set(prop.escapedName, prop);
+                    allPropertiesTable === null || allPropertiesTable === void 0 ? void 0 : allPropertiesTable.set(prop.escapedName, prop);
                 }
                 else if (memberDecl.kind === 284 /* SpreadAssignment */) {
                     if (languageVersion < 2 /* ES2015 */) {
@@ -55566,15 +55727,8 @@ var ts;
                         error(memberDecl, ts.Diagnostics.Spread_types_may_only_be_created_from_object_types);
                         return errorType;
                     }
-                    for (var _i = 0, _a = getPropertiesOfType(type); _i < _a.length; _i++) {
-                        var right = _a[_i];
-                        var rightType = getTypeOfSymbol(right);
-                        var left = allPropertiesTable.get(right.escapedName);
-                        if (strictNullChecks &&
-                            left &&
-                            !maybeTypeOfKind(rightType, 98304 /* Nullable */)) {
-                            error(left.valueDeclaration, ts.Diagnostics._0_is_specified_more_than_once_so_this_usage_will_be_overwritten, ts.unescapeLeadingUnderscores(left.escapedName));
-                        }
+                    if (allPropertiesTable) {
+                        checkSpreadPropOverrides(type, allPropertiesTable, memberDecl);
                     }
                     spread = getSpreadType(spread, type, node.symbol, objectFlags, inConstContext);
                     offset = i + 1;
@@ -55612,8 +55766,8 @@ var ts;
             // If the object literal is spread into another object literal, skip this step and let the top-level object
             // literal handle it instead.
             if (contextualTypeHasPattern && node.parent.kind !== 284 /* SpreadAssignment */) {
-                for (var _b = 0, _c = getPropertiesOfType(contextualType); _b < _c.length; _b++) {
-                    var prop = _c[_b];
+                for (var _i = 0, _a = getPropertiesOfType(contextualType); _i < _a.length; _i++) {
+                    var prop = _a[_i];
                     if (!propertiesTable.get(prop.escapedName) && !getPropertyOfType(spread, prop.escapedName)) {
                         if (!(prop.flags & 16777216 /* Optional */)) {
                             error(prop.valueDeclaration || prop.bindingElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
@@ -55726,6 +55880,7 @@ var ts;
          */
         function createJsxAttributesTypeFromAttributesProperty(openingLikeElement, checkMode) {
             var attributes = openingLikeElement.attributes;
+            var allAttributesTable = strictNullChecks ? ts.createSymbolTable() : undefined;
             var attributesTable = ts.createSymbolTable();
             var spread = emptyJsxObjectType;
             var hasSpreadAnyType = false;
@@ -55748,6 +55903,7 @@ var ts;
                     attributeSymbol.type = exprType;
                     attributeSymbol.target = member;
                     attributesTable.set(attributeSymbol.escapedName, attributeSymbol);
+                    allAttributesTable === null || allAttributesTable === void 0 ? void 0 : allAttributesTable.set(attributeSymbol.escapedName, attributeSymbol);
                     if (attributeDecl.name.escapedText === jsxChildrenPropertyName) {
                         explicitlySpecifyChildrenAttribute = true;
                     }
@@ -55764,6 +55920,9 @@ var ts;
                     }
                     if (isValidSpreadType(exprType)) {
                         spread = getSpreadType(spread, exprType, attributes.symbol, objectFlags, /*readonly*/ false);
+                        if (allAttributesTable) {
+                            checkSpreadPropOverrides(exprType, allAttributesTable, attributeDecl);
+                        }
                     }
                     else {
                         typeToIntersect = typeToIntersect ? getIntersectionType([typeToIntersect, exprType]) : exprType;
@@ -55839,6 +55998,16 @@ var ts;
             }
             return childrenTypes;
         }
+        function checkSpreadPropOverrides(type, props, spread) {
+            for (var _i = 0, _a = getPropertiesOfType(type); _i < _a.length; _i++) {
+                var right = _a[_i];
+                var left = props.get(right.escapedName);
+                if (left && !maybeTypeOfKind(getTypeOfSymbol(right), 98304 /* Nullable */)) {
+                    var diagnostic = error(left.valueDeclaration, ts.Diagnostics._0_is_specified_more_than_once_so_this_usage_will_be_overwritten, ts.unescapeLeadingUnderscores(left.escapedName));
+                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(spread, ts.Diagnostics.This_spread_always_overwrites_this_property));
+                }
+            }
+        }
         /**
          * Check attributes property of opening-like element. This function is called during chooseOverload to get call signature of a JSX opening-like element.
          * (See "checkApplicableSignatureForJsxOpeningLikeElement" for how the function is used)
@@ -57750,7 +57919,7 @@ var ts;
                         var min_3 = Number.MAX_VALUE;
                         var minIndex = 0;
                         var i_1 = 0;
-                        var _loop_15 = function (c) {
+                        var _loop_16 = function (c) {
                             var chain_2 = function () { return ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Overload_0_of_1_2_gave_the_following_error, i_1 + 1, candidates.length, signatureToString(c)); };
                             var diags_2 = getSignatureApplicabilityError(node, args, c, assignableRelation, 0 /* Normal */, /*reportErrors*/ true, chain_2);
                             if (diags_2) {
@@ -57768,7 +57937,7 @@ var ts;
                         };
                         for (var _a = 0, candidatesForArgumentError_1 = candidatesForArgumentError; _a < candidatesForArgumentError_1.length; _a++) {
                             var c = candidatesForArgumentError_1[_a];
-                            _loop_15(c);
+                            _loop_16(c);
                         }
                         var diags_3 = max > 1 ? allDiagnostics[minIndex] : ts.flatten(allDiagnostics);
                         ts.Debug.assert(diags_3.length > 0, "No errors reported for 3 or fewer overload signatures");
@@ -57902,7 +58071,7 @@ var ts;
             }
             var _a = ts.minAndMax(candidates, getNumNonRestParameters), minArgumentCount = _a.min, maxNonRestParam = _a.max;
             var parameters = [];
-            var _loop_16 = function (i) {
+            var _loop_17 = function (i) {
                 var symbols = ts.mapDefined(candidates, function (s) { return signatureHasRestParameter(s) ?
                     i < s.parameters.length - 1 ? s.parameters[i] : ts.last(s.parameters) :
                     i < s.parameters.length ? s.parameters[i] : undefined; });
@@ -57910,7 +58079,7 @@ var ts;
                 parameters.push(createCombinedSymbolFromTypes(symbols, ts.mapDefined(candidates, function (candidate) { return tryGetTypeAtPosition(candidate, i); })));
             };
             for (var i = 0; i < maxNonRestParam; i++) {
-                _loop_16(i);
+                _loop_17(i);
             }
             var restParameterSymbols = ts.mapDefined(candidates, function (c) { return signatureHasRestParameter(c) ? ts.last(c.parameters) : undefined; });
             var flags = 0 /* None */;
@@ -59016,7 +59185,7 @@ var ts;
             var globalPromiseType = getGlobalPromiseType(/*reportErrors*/ true);
             if (globalPromiseType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || unknownType;
+                promisedType = unwrapAwaitedType(getAwaitedType(promisedType) || unknownType);
                 return createTypeReference(globalPromiseType, [promisedType]);
             }
             return unknownType;
@@ -59026,7 +59195,7 @@ var ts;
             var globalPromiseLikeType = getGlobalPromiseLikeType(/*reportErrors*/ true);
             if (globalPromiseLikeType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || unknownType;
+                promisedType = unwrapAwaitedType(getAwaitedType(promisedType) || unknownType);
                 return createTypeReference(globalPromiseLikeType, [promisedType]);
             }
             return unknownType;
@@ -61081,6 +61250,9 @@ var ts;
                 if (!(func.kind === 163 /* Constructor */ && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
+                if (func.kind === 163 /* Constructor */ && ts.isIdentifier(node.name) && node.name.escapedText === "constructor") {
+                    error(node.name, ts.Diagnostics.constructor_cannot_be_used_as_a_parameter_property_name);
+                }
             }
             if (node.questionToken && ts.isBindingPattern(node.name) && func.body) {
                 error(node, ts.Diagnostics.A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature);
@@ -62200,6 +62372,9 @@ var ts;
          *   - The type has no base constraint,
          *   - OR The base constraint of the type is `any`, `unknown`, `object`, or the empty object `{}`,
          *   - OR The base constraint has a callable `then` member.
+         * This behavior is not entirely sound, as a `T extends { x: any }` could be instantiated with a
+         * subtype that has a callable `then`, however this is unlikely in practice and this slightly more unsound
+         * behavior is much more developer friendly.
          */
         function isGenericAwaitableType(type) {
             if (isGenericObjectType(type)) {
@@ -63560,7 +63735,7 @@ var ts;
             }
             else {
                 var varExpr = node.initializer;
-                var iteratedType = checkRightHandSideOfForOf(node.expression, node.awaitModifier);
+                var iteratedType = checkRightHandSideOfForOf(node);
                 // There may be a destructuring assignment on the left side
                 if (varExpr.kind === 193 /* ArrayLiteralExpression */ || varExpr.kind === 194 /* ObjectLiteralExpression */) {
                     // iteratedType may be undefined. In this case, we still want to check the structure of
@@ -63637,10 +63812,12 @@ var ts;
                 checkVariableDeclaration(decl);
             }
         }
-        function checkRightHandSideOfForOf(rhsExpression, awaitModifier) {
-            var expressionType = checkNonNullExpression(rhsExpression);
-            var use = awaitModifier ? 15 /* ForAwaitOf */ : 13 /* ForOf */;
-            return checkIteratedTypeOrElementType(use, expressionType, undefinedType, rhsExpression);
+        function checkRightHandSideOfForOf(statement) {
+            return getForOfIterationType(statement, checkNonNullExpression(statement.expression));
+        }
+        function getForOfIterationType(statement, expressionType) {
+            var use = statement.awaitModifier ? 15 /* ForAwaitOf */ : 13 /* ForOf */;
+            return checkIteratedTypeOrElementType(use, expressionType, undefinedType, statement.expression);
         }
         function checkIteratedTypeOrElementType(use, inputType, sentType, errorNode) {
             if (isTypeAny(inputType)) {
@@ -64760,7 +64937,7 @@ var ts;
         function issueMemberSpecificError(node, typeWithThis, baseWithThis, broadDiag) {
             // iterate over all implemented properties and issue errors on each one which isn't compatible, rather than the class as a whole, if possible
             var issuedMemberError = false;
-            var _loop_17 = function (member) {
+            var _loop_18 = function (member) {
                 if (ts.hasStaticModifier(member)) {
                     return "continue";
                 }
@@ -64779,7 +64956,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_17(member);
+                _loop_18(member);
             }
             if (!issuedMemberError) {
                 // check again with diagnostics to generate a less-specific error
@@ -66676,7 +66853,7 @@ var ts;
             //     for ( { a } of elems) {
             //     }
             if (expr.parent.kind === 233 /* ForOfStatement */) {
-                var iteratedType = checkRightHandSideOfForOf(expr.parent.expression, expr.parent.awaitModifier);
+                var iteratedType = checkRightHandSideOfForOf(expr.parent);
                 return checkDestructuringAssignment(expr, iteratedType || errorType);
             }
             // If this is from "for" initializer
@@ -71294,6 +71471,11 @@ var ts;
     }
     ts.createJSDocParamTag = createJSDocParamTag;
     /* @internal */
+    function createJSDocClassTag() {
+        return createJSDocTag(311 /* JSDocClassTag */, "class");
+    }
+    ts.createJSDocClassTag = createJSDocClassTag;
+    /* @internal */
     function createJSDocComment(comment, tags) {
         var node = createSynthesizedNode(304 /* JSDocComment */);
         node.comment = comment;
@@ -72312,6 +72494,12 @@ var ts;
         return node;
     }
     ts.moveSyntheticComments = moveSyntheticComments;
+    /** @internal */
+    function ignoreSourceNewlines(node) {
+        getOrCreateEmitNode(node).flags |= 134217728 /* IgnoreSourceNewlines */;
+        return node;
+    }
+    ts.ignoreSourceNewlines = ignoreSourceNewlines;
     /**
      * Gets the constant value to emit for an expression.
      */
@@ -91922,8 +92110,8 @@ var ts;
                         declFileName = paths.declarationFilePath || paths.jsFilePath || file.fileName;
                     }
                     if (declFileName) {
-                        var specifier = ts.moduleSpecifiers.getModuleSpecifier(__assign(__assign({}, options), { baseUrl: options.baseUrl && ts.toPath(options.baseUrl, host.getCurrentDirectory(), host.getCanonicalFileName) }), currentSourceFile, ts.toPath(outputFilePath, host.getCurrentDirectory(), host.getCanonicalFileName), ts.toPath(declFileName, host.getCurrentDirectory(), host.getCanonicalFileName), host, host.getSourceFiles(), 
-                        /*preferences*/ undefined, host.redirectTargetsMap);
+                        var specifier = ts.moduleSpecifiers.getModuleSpecifier(__assign(__assign({}, options), { baseUrl: options.baseUrl && ts.toPath(options.baseUrl, host.getCurrentDirectory(), host.getCanonicalFileName) }), currentSourceFile, ts.toPath(outputFilePath, host.getCurrentDirectory(), host.getCanonicalFileName), ts.toPath(declFileName, host.getCurrentDirectory(), host.getCanonicalFileName), host, 
+                        /*preferences*/ undefined);
                         if (!ts.pathIsRelative(specifier)) {
                             // If some compiler option/symlink/whatever allows access to the file containing the ambient module declaration
                             // via a non-relative name, emit a type reference directive to that non-relative name, rather than
@@ -91938,7 +92126,7 @@ var ts;
                         }
                         // omit references to files from node_modules (npm may disambiguate module
                         // references when installing this package, making the path is unreliable).
-                        if (ts.startsWith(fileName, "node_modules/") || fileName.indexOf("/node_modules/") !== -1) {
+                        if (ts.startsWith(fileName, "node_modules/") || ts.pathContainsNodeModules(fileName)) {
                             return;
                         }
                         references.push({ pos: -1, end: -1, fileName: fileName });
@@ -93977,6 +94165,7 @@ var ts;
             getLibFileFromReference: ts.notImplemented,
             isSourceFileFromExternalLibrary: ts.returnFalse,
             getResolvedProjectReferenceToRedirect: ts.returnUndefined,
+            getProjectReferenceRedirect: ts.returnUndefined,
             isSourceOfProjectReferenceRedirect: ts.returnFalse,
             writeFile: function (name, text, writeByteOrderMark) {
                 switch (name) {
@@ -94016,7 +94205,6 @@ var ts;
             isEmitBlocked: ts.returnFalse,
             readFile: function (f) { return host.readFile(f); },
             fileExists: function (f) { return host.fileExists(f); },
-            directoryExists: host.directoryExists && (function (f) { return host.directoryExists(f); }),
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
             getProgramBuildInfo: ts.returnUndefined,
             getSourceFileFromReference: ts.returnUndefined,
@@ -94051,6 +94239,7 @@ var ts;
         var tempFlags; // TempFlags for the current name generation scope.
         var reservedNamesStack; // Stack of TempFlags reserved in enclosing name generation scopes.
         var reservedNames; // TempFlags to reserve in nested name generation scopes.
+        var preserveSourceNewlines = printerOptions.preserveSourceNewlines; // Can be overridden inside nodes with the `IgnoreSourceNewlines` emit flag.
         var writer;
         var ownWriter; // Reusable `EmitTextWriter` for basic printing.
         var write = writeBase;
@@ -94333,14 +94522,19 @@ var ts;
         function pipelineEmit(emitHint, node) {
             var savedLastNode = lastNode;
             var savedLastSubstitution = lastSubstitution;
+            var savedPreserveSourceNewlines = preserveSourceNewlines;
             lastNode = node;
             lastSubstitution = undefined;
+            if (preserveSourceNewlines && !!(ts.getEmitFlags(node) & 134217728 /* IgnoreSourceNewlines */)) {
+                preserveSourceNewlines = false;
+            }
             var pipelinePhase = getPipelinePhase(0 /* Notification */, emitHint, node);
             pipelinePhase(emitHint, node);
             ts.Debug.assert(lastNode === node);
             var substitute = lastSubstitution;
             lastNode = savedLastNode;
             lastSubstitution = savedLastSubstitution;
+            preserveSourceNewlines = savedPreserveSourceNewlines;
             return substitute || node;
         }
         function getPipelinePhase(phase, emitHint, node) {
@@ -95327,9 +95521,9 @@ var ts;
         function emitPropertyAccessExpression(node) {
             var expression = ts.cast(emitExpression(node.expression), ts.isExpression);
             var token = node.questionDotToken || ts.createNode(24 /* DotToken */, node.expression.end, node.name.pos);
-            var indentBeforeDot = needsIndentation(node, node.expression, token);
-            var indentAfterDot = needsIndentation(node, token, node.name);
-            increaseIndentIf(indentBeforeDot, /*writeSpaceIfNotIndenting*/ false);
+            var linesBeforeDot = getLinesBetweenNodes(node, node.expression, token);
+            var linesAfterDot = getLinesBetweenNodes(node, token, node.name);
+            writeLinesAndIndent(linesBeforeDot, /*writeSpaceIfNotIndenting*/ false);
             var shouldEmitDotDot = token.kind !== 28 /* QuestionDotToken */ &&
                 mayNeedDotDotForPropertyAccess(expression) &&
                 !writer.hasTrailingComment() &&
@@ -95343,9 +95537,9 @@ var ts;
             else {
                 emitTokenWithComment(token.kind, node.expression.end, writePunctuation, node);
             }
-            increaseIndentIf(indentAfterDot, /*writeSpaceIfNotIndenting*/ false);
+            writeLinesAndIndent(linesAfterDot, /*writeSpaceIfNotIndenting*/ false);
             emit(node.name);
-            decreaseIndentIf(indentBeforeDot, indentAfterDot);
+            decreaseIndentIf(linesBeforeDot, linesAfterDot);
         }
         // 1..toString is a valid property access, emit a dot after the literal
         // Also emit a dot if expression is a integer const enum value - it will appear in generated code as numeric literal
@@ -95400,7 +95594,16 @@ var ts;
         }
         function emitParenthesizedExpression(node) {
             var openParenPos = emitTokenWithComment(20 /* OpenParenToken */, node.pos, writePunctuation, node);
+            var leadingNewlines = preserveSourceNewlines && getLeadingLineTerminatorCount(node, [node.expression], 0 /* None */);
+            if (leadingNewlines) {
+                writeLinesAndIndent(leadingNewlines, /*writeLinesIfNotIndenting*/ false);
+            }
             emitExpression(node.expression);
+            var trailingNewlines = preserveSourceNewlines && getClosingLineTerminatorCount(node, [node.expression], 0 /* None */);
+            if (trailingNewlines) {
+                writeLine(trailingNewlines);
+            }
+            decreaseIndentIf(leadingNewlines);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression ? node.expression.end : openParenPos, writePunctuation, node);
         }
         function emitFunctionExpression(node) {
@@ -95492,20 +95695,20 @@ var ts;
                     }
                     case 1 /* EmitRight */: {
                         var isCommaOperator = node.operatorToken.kind !== 27 /* CommaToken */;
-                        var indentBeforeOperator = needsIndentation(node, node.left, node.operatorToken);
-                        var indentAfterOperator = needsIndentation(node, node.operatorToken, node.right);
-                        increaseIndentIf(indentBeforeOperator, isCommaOperator);
+                        var linesBeforeOperator = getLinesBetweenNodes(node, node.left, node.operatorToken);
+                        var linesAfterOperator = getLinesBetweenNodes(node, node.operatorToken, node.right);
+                        writeLinesAndIndent(linesBeforeOperator, isCommaOperator);
                         emitLeadingCommentsOfPosition(node.operatorToken.pos);
                         writeTokenNode(node.operatorToken, node.operatorToken.kind === 97 /* InKeyword */ ? writeKeyword : writeOperator);
                         emitTrailingCommentsOfPosition(node.operatorToken.end, /*prefixSpace*/ true); // Binary operators should have a space before the comment starts
-                        increaseIndentIf(indentAfterOperator, /*writeSpaceIfNotIndenting*/ true);
+                        writeLinesAndIndent(linesAfterOperator, /*writeSpaceIfNotIndenting*/ true);
                         maybePipelineEmitExpression(node.right);
                         break;
                     }
                     case 2 /* FinishEmit */: {
-                        var indentBeforeOperator = needsIndentation(node, node.left, node.operatorToken);
-                        var indentAfterOperator = needsIndentation(node, node.operatorToken, node.right);
-                        decreaseIndentIf(indentBeforeOperator, indentAfterOperator);
+                        var linesBeforeOperator = getLinesBetweenNodes(node, node.left, node.operatorToken);
+                        var linesAfterOperator = getLinesBetweenNodes(node, node.operatorToken, node.right);
+                        decreaseIndentIf(linesBeforeOperator, linesAfterOperator);
                         stackIndex--;
                         break;
                     }
@@ -95541,21 +95744,21 @@ var ts;
             }
         }
         function emitConditionalExpression(node) {
-            var indentBeforeQuestion = needsIndentation(node, node.condition, node.questionToken);
-            var indentAfterQuestion = needsIndentation(node, node.questionToken, node.whenTrue);
-            var indentBeforeColon = needsIndentation(node, node.whenTrue, node.colonToken);
-            var indentAfterColon = needsIndentation(node, node.colonToken, node.whenFalse);
+            var linesBeforeQuestion = getLinesBetweenNodes(node, node.condition, node.questionToken);
+            var linesAfterQuestion = getLinesBetweenNodes(node, node.questionToken, node.whenTrue);
+            var linesBeforeColon = getLinesBetweenNodes(node, node.whenTrue, node.colonToken);
+            var linesAfterColon = getLinesBetweenNodes(node, node.colonToken, node.whenFalse);
             emitExpression(node.condition);
-            increaseIndentIf(indentBeforeQuestion, /*writeSpaceIfNotIndenting*/ true);
+            writeLinesAndIndent(linesBeforeQuestion, /*writeSpaceIfNotIndenting*/ true);
             emit(node.questionToken);
-            increaseIndentIf(indentAfterQuestion, /*writeSpaceIfNotIndenting*/ true);
+            writeLinesAndIndent(linesAfterQuestion, /*writeSpaceIfNotIndenting*/ true);
             emitExpression(node.whenTrue);
-            decreaseIndentIf(indentBeforeQuestion, indentAfterQuestion);
-            increaseIndentIf(indentBeforeColon, /*writeSpaceIfNotIndenting*/ true);
+            decreaseIndentIf(linesBeforeQuestion, linesAfterQuestion);
+            writeLinesAndIndent(linesBeforeColon, /*writeSpaceIfNotIndenting*/ true);
             emit(node.colonToken);
-            increaseIndentIf(indentAfterColon, /*writeSpaceIfNotIndenting*/ true);
+            writeLinesAndIndent(linesAfterColon, /*writeSpaceIfNotIndenting*/ true);
             emitExpression(node.whenFalse);
-            decreaseIndentIf(indentBeforeColon, indentAfterColon);
+            decreaseIndentIf(linesBeforeColon, linesAfterColon);
         }
         function emitTemplateExpression(node) {
             emit(node.head);
@@ -95896,14 +96099,14 @@ var ts;
             if (!ts.nodeIsSynthesized(body) && !ts.rangeIsOnSingleLine(body, currentSourceFile)) {
                 return false;
             }
-            if (shouldWriteLeadingLineTerminator(body, body.statements, 2 /* PreserveLines */)
-                || shouldWriteClosingLineTerminator(body, body.statements, 2 /* PreserveLines */)) {
+            if (getLeadingLineTerminatorCount(body, body.statements, 2 /* PreserveLines */)
+                || getClosingLineTerminatorCount(body, body.statements, 2 /* PreserveLines */)) {
                 return false;
             }
             var previousStatement;
             for (var _a = 0, _b = body.statements; _a < _b.length; _a++) {
                 var statement = _b[_a];
-                if (shouldWriteSeparatingLineTerminator(previousStatement, statement, 2 /* PreserveLines */)) {
+                if (getSeparatingLineTerminatorCount(previousStatement, statement, 2 /* PreserveLines */) > 0) {
                     return false;
                 }
                 previousStatement = statement;
@@ -96865,7 +97068,7 @@ var ts;
             }
             if (isEmpty) {
                 // Write a line terminator if the parent node was multi-line
-                if (format & 1 /* MultiLine */) {
+                if (format & 1 /* MultiLine */ && !(preserveSourceNewlines && ts.rangeIsOnSingleLine(parentNode, currentSourceFile))) {
                     writeLine();
                 }
                 else if (format & 256 /* SpaceBetweenBraces */ && !(format & 524288 /* NoSpaceIfEmpty */)) {
@@ -96876,8 +97079,9 @@ var ts;
                 // Write the opening line terminator or leading whitespace.
                 var mayEmitInterveningComments = (format & 262144 /* NoInterveningComments */) === 0;
                 var shouldEmitInterveningComments = mayEmitInterveningComments;
-                if (shouldWriteLeadingLineTerminator(parentNode, children, format)) { // TODO: GH#18217
-                    writeLine();
+                var leadingLineTerminatorCount = getLeadingLineTerminatorCount(parentNode, children, format); // TODO: GH#18217
+                if (leadingLineTerminatorCount) {
+                    writeLine(leadingLineTerminatorCount);
                     shouldEmitInterveningComments = false;
                 }
                 else if (format & 256 /* SpaceBetweenBraces */) {
@@ -96912,14 +97116,15 @@ var ts;
                         writeDelimiter(format);
                         recordBundleFileInternalSectionEnd(previousSourceFileTextKind);
                         // Write either a line terminator or whitespace to separate the elements.
-                        if (shouldWriteSeparatingLineTerminator(previousSibling, child, format)) {
+                        var separatingLineTerminatorCount = getSeparatingLineTerminatorCount(previousSibling, child, format);
+                        if (separatingLineTerminatorCount > 0) {
                             // If a synthesized node in a single-line list starts on a new
                             // line, we should increase the indent.
                             if ((format & (3 /* LinesMask */ | 128 /* Indented */)) === 0 /* SingleLine */) {
                                 increaseIndent();
                                 shouldDecreaseIndentAfterEmit = true;
                             }
-                            writeLine();
+                            writeLine(separatingLineTerminatorCount);
                             shouldEmitInterveningComments = false;
                         }
                         else if (previousSibling && format & 512 /* SpaceBetweenSiblings */) {
@@ -96964,8 +97169,9 @@ var ts;
                 }
                 recordBundleFileInternalSectionEnd(previousSourceFileTextKind);
                 // Write the closing line terminator or closing whitespace.
-                if (shouldWriteClosingLineTerminator(parentNode, children, format)) {
-                    writeLine();
+                var closingLineTerminatorCount = getClosingLineTerminatorCount(parentNode, children, format);
+                if (closingLineTerminatorCount) {
+                    writeLine(closingLineTerminatorCount);
                 }
                 else if (format & 256 /* SpaceBetweenBraces */) {
                     writeSpace();
@@ -97019,8 +97225,11 @@ var ts;
         function writeProperty(s) {
             writer.writeProperty(s);
         }
-        function writeLine() {
-            writer.writeLine();
+        function writeLine(count) {
+            if (count === void 0) { count = 1; }
+            for (var i = 0; i < count; i++) {
+                writer.writeLine(i > 0);
+            }
         }
         function increaseIndent() {
             writer.increaseIndent();
@@ -97067,10 +97276,10 @@ var ts;
                 }
             }
         }
-        function increaseIndentIf(value, writeSpaceIfNotIndenting) {
-            if (value) {
+        function writeLinesAndIndent(lineCount, writeSpaceIfNotIndenting) {
+            if (lineCount) {
                 increaseIndent();
-                writeLine();
+                writeLine(lineCount);
             }
             else if (writeSpaceIfNotIndenting) {
                 writeSpace();
@@ -97088,70 +97297,101 @@ var ts;
                 decreaseIndent();
             }
         }
-        function shouldWriteLeadingLineTerminator(parentNode, children, format) {
-            if (format & 1 /* MultiLine */) {
-                return true;
-            }
-            if (format & 2 /* PreserveLines */) {
+        function getLeadingLineTerminatorCount(parentNode, children, format) {
+            if (format & 2 /* PreserveLines */ || preserveSourceNewlines) {
                 if (format & 65536 /* PreferNewLine */) {
-                    return true;
+                    return 1;
                 }
-                var firstChild = children[0];
-                if (firstChild === undefined) {
-                    return !ts.rangeIsOnSingleLine(parentNode, currentSourceFile);
+                var firstChild_1 = children[0];
+                if (firstChild_1 === undefined) {
+                    return ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
                 }
-                else if (ts.positionIsSynthesized(parentNode.pos) || ts.nodeIsSynthesized(firstChild)) {
-                    return synthesizedNodeStartsOnNewLine(firstChild, format);
+                if (firstChild_1.kind === 11 /* JsxText */) {
+                    // JsxText will be written with its leading whitespace, so don't add more manually.
+                    return 0;
                 }
-                else {
-                    return !ts.rangeStartPositionsAreOnSameLine(parentNode, firstChild, currentSourceFile);
+                if (!ts.positionIsSynthesized(parentNode.pos) && !ts.nodeIsSynthesized(firstChild_1) && firstChild_1.parent === parentNode) {
+                    if (preserveSourceNewlines) {
+                        return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter(firstChild_1.pos, currentSourceFile, includeComments); });
+                    }
+                    return ts.rangeStartPositionsAreOnSameLine(parentNode, firstChild_1, currentSourceFile) ? 0 : 1;
+                }
+                if (synthesizedNodeStartsOnNewLine(firstChild_1, format)) {
+                    return 1;
                 }
             }
-            else {
-                return false;
-            }
+            return format & 1 /* MultiLine */ ? 1 : 0;
         }
-        function shouldWriteSeparatingLineTerminator(previousNode, nextNode, format) {
-            if (format & 1 /* MultiLine */) {
-                return true;
-            }
-            else if (format & 2 /* PreserveLines */) {
+        function getSeparatingLineTerminatorCount(previousNode, nextNode, format) {
+            if (format & 2 /* PreserveLines */ || preserveSourceNewlines) {
                 if (previousNode === undefined || nextNode === undefined) {
-                    return false;
+                    return 0;
                 }
-                else if (ts.nodeIsSynthesized(previousNode) || ts.nodeIsSynthesized(nextNode)) {
-                    return synthesizedNodeStartsOnNewLine(previousNode, format) || synthesizedNodeStartsOnNewLine(nextNode, format);
+                if (nextNode.kind === 11 /* JsxText */) {
+                    // JsxText will be written with its leading whitespace, so don't add more manually.
+                    return 0;
                 }
-                else {
-                    return !ts.rangeEndIsOnSameLineAsRangeStart(previousNode, nextNode, currentSourceFile);
+                else if (!ts.nodeIsSynthesized(previousNode) && !ts.nodeIsSynthesized(nextNode) && previousNode.parent === nextNode.parent) {
+                    if (preserveSourceNewlines) {
+                        return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenRangeEndAndRangeStart(previousNode, nextNode, currentSourceFile, includeComments); });
+                    }
+                    return ts.rangeEndIsOnSameLineAsRangeStart(previousNode, nextNode, currentSourceFile) ? 0 : 1;
+                }
+                else if (synthesizedNodeStartsOnNewLine(previousNode, format) || synthesizedNodeStartsOnNewLine(nextNode, format)) {
+                    return 1;
                 }
             }
-            else {
-                return ts.getStartsOnNewLine(nextNode);
+            else if (ts.getStartsOnNewLine(nextNode)) {
+                return 1;
             }
+            return format & 1 /* MultiLine */ ? 1 : 0;
         }
-        function shouldWriteClosingLineTerminator(parentNode, children, format) {
-            if (format & 1 /* MultiLine */) {
-                return (format & 131072 /* NoTrailingNewLine */) === 0;
-            }
-            else if (format & 2 /* PreserveLines */) {
+        function getClosingLineTerminatorCount(parentNode, children, format) {
+            if (format & 2 /* PreserveLines */ || preserveSourceNewlines) {
                 if (format & 65536 /* PreferNewLine */) {
-                    return true;
+                    return 1;
                 }
-                var lastChild = ts.lastOrUndefined(children);
-                if (lastChild === undefined) {
-                    return !ts.rangeIsOnSingleLine(parentNode, currentSourceFile);
+                var lastChild_1 = ts.lastOrUndefined(children);
+                if (lastChild_1 === undefined) {
+                    return ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
                 }
-                else if (ts.positionIsSynthesized(parentNode.pos) || ts.nodeIsSynthesized(lastChild)) {
-                    return synthesizedNodeStartsOnNewLine(lastChild, format);
+                if (!ts.positionIsSynthesized(parentNode.pos) && !ts.nodeIsSynthesized(lastChild_1) && lastChild_1.parent === parentNode) {
+                    if (preserveSourceNewlines) {
+                        return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenPositionAndNextNonWhitespaceCharacter(lastChild_1.end, currentSourceFile, includeComments); });
+                    }
+                    return ts.rangeEndPositionsAreOnSameLine(parentNode, lastChild_1, currentSourceFile) ? 0 : 1;
                 }
-                else {
-                    return !ts.rangeEndPositionsAreOnSameLine(parentNode, lastChild, currentSourceFile);
+                if (synthesizedNodeStartsOnNewLine(lastChild_1, format)) {
+                    return 1;
                 }
             }
-            else {
-                return false;
+            if (format & 1 /* MultiLine */ && !(format & 131072 /* NoTrailingNewLine */)) {
+                return 1;
             }
+            return 0;
+        }
+        function getEffectiveLines(getLineDifference) {
+            // If 'preserveSourceNewlines' is disabled, we should never call this function
+            // because it could be more expensive than alternative approximations.
+            ts.Debug.assert(!!preserveSourceNewlines);
+            // We start by measuring the line difference from a position to its adjacent comments,
+            // so that this is counted as a one-line difference, not two:
+            //
+            //   node1;
+            //   // NODE2 COMMENT
+            //   node2;
+            var lines = getLineDifference(/*includeComments*/ true);
+            if (lines === 0) {
+                // However, if the line difference considering comments was 0, we might have this:
+                //
+                //   node1; // NODE2 COMMENT
+                //   node2;
+                //
+                // in which case we should be ignoring node2's comment, so this too is counted as
+                // a one-line difference, not zero.
+                return getLineDifference(/*includeComments*/ false);
+            }
+            return lines;
         }
         function synthesizedNodeStartsOnNewLine(node, format) {
             if (ts.nodeIsSynthesized(node)) {
@@ -97163,21 +97403,24 @@ var ts;
             }
             return (format & 65536 /* PreferNewLine */) !== 0;
         }
-        function needsIndentation(parent, node1, node2) {
+        function getLinesBetweenNodes(parent, node1, node2) {
             if (ts.getEmitFlags(parent) & 131072 /* NoIndentation */) {
-                return false;
+                return 0;
             }
             parent = skipSynthesizedParentheses(parent);
             node1 = skipSynthesizedParentheses(node1);
             node2 = skipSynthesizedParentheses(node2);
             // Always use a newline for synthesized code if the synthesizer desires it.
             if (ts.getStartsOnNewLine(node2)) {
-                return true;
+                return 1;
             }
-            return !ts.nodeIsSynthesized(parent)
-                && !ts.nodeIsSynthesized(node1)
-                && !ts.nodeIsSynthesized(node2)
-                && !ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile);
+            if (!ts.nodeIsSynthesized(parent) && !ts.nodeIsSynthesized(node1) && !ts.nodeIsSynthesized(node2)) {
+                if (preserveSourceNewlines) {
+                    return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenRangeEndAndRangeStart(node1, node2, currentSourceFile, includeComments); });
+                }
+                return ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile) ? 0 : 1;
+            }
+            return 0;
         }
         function isEmptyBlock(block) {
             return block.statements.length === 0
@@ -99010,14 +99253,14 @@ var ts;
         var mapFromToProjectReferenceRedirectSource;
         var useSourceOfProjectReferenceRedirect = !!((_a = host.useSourceOfProjectReferenceRedirect) === null || _a === void 0 ? void 0 : _a.call(host)) &&
             !options.disableSourceOfProjectReferenceRedirect;
-        var onProgramCreateComplete = updateHostForUseSourceOfProjectReferenceRedirect({
+        var _b = updateHostForUseSourceOfProjectReferenceRedirect({
             compilerHost: host,
             useSourceOfProjectReferenceRedirect: useSourceOfProjectReferenceRedirect,
             toPath: toPath,
             getResolvedProjectReferences: getResolvedProjectReferences,
             getSourceOfProjectReferenceRedirect: getSourceOfProjectReferenceRedirect,
             forEachResolvedProjectReference: forEachResolvedProjectReference
-        });
+        }), onProgramCreateComplete = _b.onProgramCreateComplete, fileExists = _b.fileExists;
         var shouldCreateNewSourceFile = shouldProgramCreateNewSourceFiles(oldProgram, options);
         // We set `structuralIsReused` to `undefined` because `tryReuseStructureFromOldProgram` calls `tryReuseStructureFromOldProgram` which checks
         // `structuralIsReused`, which would be a TDZ violation if it was not set in advance to `undefined`.
@@ -99038,8 +99281,8 @@ var ts;
                         var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out;
                         if (useSourceOfProjectReferenceRedirect) {
                             if (out || ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) {
-                                for (var _b = 0, _c = parsedRef.commandLine.fileNames; _b < _c.length; _b++) {
-                                    var fileName = _c[_b];
+                                for (var _c = 0, _d = parsedRef.commandLine.fileNames; _c < _d.length; _c++) {
+                                    var fileName = _d[_c];
                                     processSourceFile(fileName, /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
                                 }
                             }
@@ -99049,8 +99292,8 @@ var ts;
                                 processSourceFile(ts.changeExtension(out, ".d.ts"), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
                             }
                             else if (ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) {
-                                for (var _d = 0, _e = parsedRef.commandLine.fileNames; _d < _e.length; _d++) {
-                                    var fileName = _e[_d];
+                                for (var _e = 0, _f = parsedRef.commandLine.fileNames; _e < _f.length; _e++) {
+                                    var fileName = _f[_e];
                                     if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) && !ts.fileExtensionIs(fileName, ".json" /* Json */)) {
                                         processSourceFile(ts.getOutputDeclarationFileName(fileName, parsedRef.commandLine, !host.useCaseSensitiveFileNames()), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
                                     }
@@ -99102,8 +99345,8 @@ var ts;
         // not part of the new program.
         if (oldProgram && host.onReleaseOldSourceFile) {
             var oldSourceFiles = oldProgram.getSourceFiles();
-            for (var _f = 0, oldSourceFiles_1 = oldSourceFiles; _f < oldSourceFiles_1.length; _f++) {
-                var oldSourceFile = oldSourceFiles_1[_f];
+            for (var _g = 0, oldSourceFiles_1 = oldSourceFiles; _g < oldSourceFiles_1.length; _g++) {
+                var oldSourceFile = oldSourceFiles_1[_g];
                 var newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
                 if (shouldCreateNewSourceFile || !newFile ||
                     // old file wasnt redirect but new file is
@@ -99168,6 +99411,7 @@ var ts;
             forEachResolvedProjectReference: forEachResolvedProjectReference,
             isSourceOfProjectReferenceRedirect: isSourceOfProjectReferenceRedirect,
             emitBuildInfo: emitBuildInfo,
+            fileExists: fileExists,
             getProbableSymlinks: getProbableSymlinks,
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
         };
@@ -99611,11 +99855,26 @@ var ts;
             return oldProgram.structureIsReused = 2 /* Completely */;
         }
         function getEmitHost(writeFileCallback) {
-            return __assign(__assign({ getPrependNodes: getPrependNodes,
-                getCanonicalFileName: getCanonicalFileName, getCommonSourceDirectory: program.getCommonSourceDirectory, getCompilerOptions: program.getCompilerOptions, getCurrentDirectory: function () { return currentDirectory; }, getNewLine: function () { return host.getNewLine(); }, getSourceFile: program.getSourceFile, getSourceFileByPath: program.getSourceFileByPath, getSourceFiles: program.getSourceFiles, getLibFileFromReference: program.getLibFileFromReference, isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
+            return {
+                getPrependNodes: getPrependNodes,
+                getCanonicalFileName: getCanonicalFileName,
+                getCommonSourceDirectory: program.getCommonSourceDirectory,
+                getCompilerOptions: program.getCompilerOptions,
+                getCurrentDirectory: function () { return currentDirectory; },
+                getNewLine: function () { return host.getNewLine(); },
+                getSourceFile: program.getSourceFile,
+                getSourceFileByPath: program.getSourceFileByPath,
+                getSourceFiles: program.getSourceFiles,
+                getLibFileFromReference: program.getLibFileFromReference,
+                isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
                 getResolvedProjectReferenceToRedirect: getResolvedProjectReferenceToRedirect,
+                getProjectReferenceRedirect: getProjectReferenceRedirect,
                 isSourceOfProjectReferenceRedirect: isSourceOfProjectReferenceRedirect,
-                getProbableSymlinks: getProbableSymlinks, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, fileExists: function (f) {
+                getProbableSymlinks: getProbableSymlinks,
+                writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }),
+                isEmitBlocked: isEmitBlocked,
+                readFile: function (f) { return host.readFile(f); },
+                fileExists: function (f) {
                     // Use local caches
                     var path = toPath(f);
                     if (getSourceFileByPath(path))
@@ -99624,7 +99883,12 @@ var ts;
                         return false;
                     // Before falling back to the host
                     return host.fileExists(f);
-                } }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {})), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); }, redirectTargetsMap: redirectTargetsMap });
+                },
+                useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
+                getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); },
+                getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); },
+                redirectTargetsMap: redirectTargetsMap,
+            };
         }
         function emitBuildInfo(writeFileCallback) {
             ts.Debug.assert(!options.out && !options.outFile);
@@ -100286,7 +100550,7 @@ var ts;
                 }
                 var sourceFileWithAddedExtension = ts.forEach(supportedExtensions, function (extension) { return getSourceFile(fileName + extension); });
                 if (fail && !sourceFileWithAddedExtension)
-                    fail(ts.Diagnostics.File_0_not_found, fileName + ".ts" /* Ts */);
+                    fail(ts.Diagnostics.Could_not_resolve_the_path_0_with_the_extensions_Colon_1, fileName, "'" + supportedExtensions.join("', '") + "'");
                 return sourceFileWithAddedExtension;
             }
         }
@@ -101290,20 +101554,8 @@ var ts;
         var originalGetDirectories = host.compilerHost.getDirectories;
         var originalRealpath = host.compilerHost.realpath;
         if (!host.useSourceOfProjectReferenceRedirect)
-            return ts.noop;
-        // This implementation of fileExists checks if the file being requested is
-        // .d.ts file for the referenced Project.
-        // If it is it returns true irrespective of whether that file exists on host
-        host.compilerHost.fileExists = function (file) {
-            if (originalFileExists.call(host.compilerHost, file))
-                return true;
-            if (!host.getResolvedProjectReferences())
-                return false;
-            if (!ts.isDeclarationFileName(file))
-                return false;
-            // Project references go to source file instead of .d.ts file
-            return fileOrDirectoryExistsUsingSource(file, /*isFile*/ true);
-        };
+            return { onProgramCreateComplete: ts.noop, fileExists: fileExists };
+        host.compilerHost.fileExists = fileExists;
         if (originalDirectoryExists) {
             // This implementation of directoryExists checks if the directory being requested is
             // directory of .d.ts file for the referenced Project.
@@ -101352,13 +101604,26 @@ var ts;
                     originalRealpath.call(host.compilerHost, s);
             };
         }
-        return onProgramCreateComplete;
+        return { onProgramCreateComplete: onProgramCreateComplete, fileExists: fileExists };
         function onProgramCreateComplete() {
             host.compilerHost.fileExists = originalFileExists;
             host.compilerHost.directoryExists = originalDirectoryExists;
             host.compilerHost.getDirectories = originalGetDirectories;
             // DO not revert realpath as it could be used later
         }
+        // This implementation of fileExists checks if the file being requested is
+        // .d.ts file for the referenced Project.
+        // If it is it returns true irrespective of whether that file exists on host
+        function fileExists(file) {
+            if (originalFileExists.call(host.compilerHost, file))
+                return true;
+            if (!host.getResolvedProjectReferences())
+                return false;
+            if (!ts.isDeclarationFileName(file))
+                return false;
+            // Project references go to source file instead of .d.ts file
+            return fileOrDirectoryExistsUsingSource(file, /*isFile*/ true);
+        }
         function fileExistsIfProjectReferenceDts(file) {
             var source = host.getSourceOfProjectReferenceRedirect(file);
             return source !== undefined ?
@@ -101544,8 +101809,8 @@ var ts;
 (function (ts) {
     function getFileEmitOutput(program, sourceFile, emitOnlyDtsFiles, cancellationToken, customTransformers, forceDtsEmit) {
         var outputFiles = [];
-        var emitResult = program.emit(sourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers, forceDtsEmit);
-        return { outputFiles: outputFiles, emitSkipped: emitResult.emitSkipped, exportedModulesFromDeclarationEmit: emitResult.exportedModulesFromDeclarationEmit };
+        var _a = program.emit(sourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers, forceDtsEmit), emitSkipped = _a.emitSkipped, diagnostics = _a.diagnostics, exportedModulesFromDeclarationEmit = _a.exportedModulesFromDeclarationEmit;
+        return { outputFiles: outputFiles, emitSkipped: emitSkipped, diagnostics: diagnostics, exportedModulesFromDeclarationEmit: exportedModulesFromDeclarationEmit };
         function writeFile(fileName, text, writeByteOrderMark) {
             outputFiles.push({ name: fileName, writeByteOrderMark: writeByteOrderMark, text: text });
         }
@@ -101753,12 +102018,14 @@ var ts;
          * This should be called whenever it is safe to commit the state of the builder
          */
         function updateSignaturesFromCache(state, signatureCache) {
-            signatureCache.forEach(function (signature, path) {
-                state.fileInfos.get(path).signature = signature;
-                state.hasCalledUpdateShapeSignature.set(path, true);
-            });
+            signatureCache.forEach(function (signature, path) { return updateSignatureOfFile(state, signature, path); });
         }
         BuilderState.updateSignaturesFromCache = updateSignaturesFromCache;
+        function updateSignatureOfFile(state, signature, path) {
+            state.fileInfos.get(path).signature = signature;
+            state.hasCalledUpdateShapeSignature.set(path, true);
+        }
+        BuilderState.updateSignatureOfFile = updateSignatureOfFile;
         /**
          * Returns if the shape of the signature has changed since last emit
          */
@@ -103632,39 +103899,39 @@ var ts;
                     ts.getEmitModuleResolutionKind(compilerOptions) !== ts.ModuleResolutionKind.NodeJs || ts.endsWith(oldImportSpecifier, "index") ? 1 /* Index */ : 0 /* Minimal */,
             };
         }
-        function updateModuleSpecifier(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, oldImportSpecifier) {
-            var res = getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, getPreferencesForUpdate(compilerOptions, oldImportSpecifier));
+        function updateModuleSpecifier(compilerOptions, importingSourceFileName, toFileName, host, oldImportSpecifier) {
+            var res = getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, getPreferencesForUpdate(compilerOptions, oldImportSpecifier));
             if (res === oldImportSpecifier)
                 return undefined;
             return res;
         }
         moduleSpecifiers.updateModuleSpecifier = updateModuleSpecifier;
         // Note: importingSourceFile is just for usesJsExtensionOnImports
-        function getModuleSpecifier(compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, files, preferences, redirectTargetsMap) {
+        function getModuleSpecifier(compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, preferences) {
             if (preferences === void 0) { preferences = {}; }
-            return getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, getPreferences(preferences, compilerOptions, importingSourceFile));
+            return getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, getPreferences(preferences, compilerOptions, importingSourceFile));
         }
         moduleSpecifiers.getModuleSpecifier = getModuleSpecifier;
-        function getNodeModulesPackageName(compilerOptions, importingSourceFileName, nodeModulesFileName, host, files, redirectTargetsMap) {
+        function getNodeModulesPackageName(compilerOptions, importingSourceFileName, nodeModulesFileName, host) {
             var info = getInfo(importingSourceFileName, host);
-            var modulePaths = getAllModulePaths(files, importingSourceFileName, nodeModulesFileName, info.getCanonicalFileName, host, redirectTargetsMap);
+            var modulePaths = getAllModulePaths(importingSourceFileName, nodeModulesFileName, host);
             return ts.firstDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions, /*packageNameOnly*/ true); });
         }
         moduleSpecifiers.getNodeModulesPackageName = getNodeModulesPackageName;
-        function getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, preferences) {
+        function getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, preferences) {
             var info = getInfo(importingSourceFileName, host);
-            var modulePaths = getAllModulePaths(files, importingSourceFileName, toFileName, info.getCanonicalFileName, host, redirectTargetsMap);
+            var modulePaths = getAllModulePaths(importingSourceFileName, toFileName, host);
             return ts.firstDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions); }) ||
                 getLocalModuleSpecifier(toFileName, info, compilerOptions, preferences);
         }
         /** Returns an import for each symlink and for the realpath. */
-        function getModuleSpecifiers(moduleSymbol, compilerOptions, importingSourceFile, host, files, userPreferences, redirectTargetsMap) {
+        function getModuleSpecifiers(moduleSymbol, compilerOptions, importingSourceFile, host, userPreferences) {
             var ambient = tryGetModuleNameFromAmbientModule(moduleSymbol);
             if (ambient)
                 return [ambient];
             var info = getInfo(importingSourceFile.path, host);
             var moduleSourceFile = ts.getSourceFileOfNode(moduleSymbol.valueDeclaration || ts.getNonAugmentationDeclaration(moduleSymbol));
-            var modulePaths = getAllModulePaths(files, importingSourceFile.path, moduleSourceFile.originalFileName, info.getCanonicalFileName, host, redirectTargetsMap);
+            var modulePaths = getAllModulePaths(importingSourceFile.path, moduleSourceFile.originalFileName, host);
             var preferences = getPreferences(userPreferences, compilerOptions, importingSourceFile);
             var global = ts.mapDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions); });
             return global.length ? global : modulePaths.map(function (moduleFileName) { return getLocalModuleSpecifier(moduleFileName, info, compilerOptions, preferences); });
@@ -103723,10 +103990,12 @@ var ts;
         function comparePathsByNumberOfDirectorySeparators(a, b) {
             return ts.compareValues(numberOfDirectorySeparators(a), numberOfDirectorySeparators(b));
         }
-        function forEachFileNameOfModule(files, importingFileName, importedFileName, getCanonicalFileName, host, redirectTargetsMap, preferSymlinks, cb) {
-            var redirects = redirectTargetsMap.get(importedFileName);
-            var importedFileNames = redirects ? __spreadArrays(redirects, [importedFileName]) : [importedFileName];
-            var cwd = host.getCurrentDirectory ? host.getCurrentDirectory() : "";
+        function forEachFileNameOfModule(importingFileName, importedFileName, host, preferSymlinks, cb) {
+            var getCanonicalFileName = ts.hostGetCanonicalFileName(host);
+            var cwd = host.getCurrentDirectory();
+            var referenceRedirect = host.isSourceOfProjectReferenceRedirect(importedFileName) ? host.getProjectReferenceRedirect(importedFileName) : undefined;
+            var redirects = host.redirectTargetsMap.get(ts.toPath(importedFileName, cwd, getCanonicalFileName)) || ts.emptyArray;
+            var importedFileNames = __spreadArrays((referenceRedirect ? [referenceRedirect] : ts.emptyArray), [importedFileName], redirects);
             var targets = importedFileNames.map(function (f) { return ts.getNormalizedAbsolutePath(f, cwd); });
             if (!preferSymlinks) {
                 var result_10 = ts.forEach(targets, cb);
@@ -103734,8 +104003,8 @@ var ts;
                     return result_10;
             }
             var links = host.getProbableSymlinks
-                ? host.getProbableSymlinks(files)
-                : ts.discoverProbableSymlinks(files, getCanonicalFileName, cwd);
+                ? host.getProbableSymlinks(host.getSourceFiles())
+                : ts.discoverProbableSymlinks(host.getSourceFiles(), getCanonicalFileName, cwd);
             var compareStrings = (!host.useCaseSensitiveFileNames || host.useCaseSensitiveFileNames()) ? ts.compareStringsCaseSensitive : ts.compareStringsCaseInsensitive;
             var result = ts.forEachEntry(links, function (resolved, path) {
                 if (ts.startsWithDirectory(importingFileName, resolved, getCanonicalFileName)) {
@@ -103760,22 +104029,28 @@ var ts;
          * Looks for existing imports that use symlinks to this module.
          * Symlinks will be returned first so they are preferred over the real path.
          */
-        function getAllModulePaths(files, importingFileName, importedFileName, getCanonicalFileName, host, redirectTargetsMap) {
-            var cwd = host.getCurrentDirectory ? host.getCurrentDirectory() : "";
+        function getAllModulePaths(importingFileName, importedFileName, host) {
+            var cwd = host.getCurrentDirectory();
+            var getCanonicalFileName = ts.hostGetCanonicalFileName(host);
             var allFileNames = ts.createMap();
-            forEachFileNameOfModule(files, importingFileName, importedFileName, getCanonicalFileName, host, redirectTargetsMap, 
+            var importedFileFromNodeModules = false;
+            forEachFileNameOfModule(importingFileName, importedFileName, host, 
             /*preferSymlinks*/ true, function (path) {
                 // dont return value, so we collect everything
                 allFileNames.set(path, getCanonicalFileName(path));
+                importedFileFromNodeModules = importedFileFromNodeModules || ts.pathContainsNodeModules(path);
             });
             // Sort by paths closest to importing file Name directory
             var sortedPaths = [];
-            var _loop_18 = function (directory) {
+            var _loop_19 = function (directory) {
                 var directoryStart = ts.ensureTrailingDirectorySeparator(directory);
                 var pathsInDirectory;
                 allFileNames.forEach(function (canonicalFileName, fileName) {
                     if (ts.startsWith(canonicalFileName, directoryStart)) {
-                        (pathsInDirectory || (pathsInDirectory = [])).push(fileName);
+                        // If the importedFile is from node modules, use only paths in node_modules folder as option
+                        if (!importedFileFromNodeModules || ts.pathContainsNodeModules(fileName)) {
+                            (pathsInDirectory || (pathsInDirectory = [])).push(fileName);
+                        }
                         allFileNames.delete(fileName);
                     }
                 });
@@ -103793,9 +104068,9 @@ var ts;
             };
             var out_directory_1;
             for (var directory = ts.getDirectoryPath(ts.toPath(importingFileName, cwd, getCanonicalFileName)); allFileNames.size !== 0;) {
-                var state_7 = _loop_18(directory);
+                var state_8 = _loop_19(directory);
                 directory = out_directory_1;
-                if (state_7 === "break")
+                if (state_8 === "break")
                     break;
             }
             if (allFileNames.size) {
@@ -108648,14 +108923,27 @@ var ts;
         return !!compilerOptions.module || compilerOptions.target >= 2 /* ES2015 */ || !!compilerOptions.noEmit;
     }
     ts.compilerOptionsIndicateEs6Modules = compilerOptionsIndicateEs6Modules;
-    function hostUsesCaseSensitiveFileNames(host) {
-        return host.useCaseSensitiveFileNames ? host.useCaseSensitiveFileNames() : false;
+    function createModuleSpecifierResolutionHost(program, host) {
+        // Mix in `getProbableSymlinks` from Program when host doesn't have it
+        // in order for non-Project hosts to have a symlinks cache.
+        return {
+            fileExists: function (fileName) { return program.fileExists(fileName); },
+            getCurrentDirectory: function () { return host.getCurrentDirectory(); },
+            readFile: ts.maybeBind(host, host.readFile),
+            useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames),
+            getProbableSymlinks: ts.maybeBind(host, host.getProbableSymlinks) || (function () { return program.getProbableSymlinks(); }),
+            getGlobalTypingsCacheLocation: ts.maybeBind(host, host.getGlobalTypingsCacheLocation),
+            getSourceFiles: function () { return program.getSourceFiles(); },
+            redirectTargetsMap: program.redirectTargetsMap,
+            getProjectReferenceRedirect: function (fileName) { return program.getProjectReferenceRedirect(fileName); },
+            isSourceOfProjectReferenceRedirect: function (fileName) { return program.isSourceOfProjectReferenceRedirect(fileName); },
+        };
     }
-    ts.hostUsesCaseSensitiveFileNames = hostUsesCaseSensitiveFileNames;
-    function hostGetCanonicalFileName(host) {
-        return ts.createGetCanonicalFileName(hostUsesCaseSensitiveFileNames(host));
+    ts.createModuleSpecifierResolutionHost = createModuleSpecifierResolutionHost;
+    function getModuleSpecifierResolverHost(program, host) {
+        return __assign(__assign({}, createModuleSpecifierResolutionHost(program, host)), { getCommonSourceDirectory: function () { return program.getCommonSourceDirectory(); } });
     }
-    ts.hostGetCanonicalFileName = hostGetCanonicalFileName;
+    ts.getModuleSpecifierResolverHost = getModuleSpecifierResolverHost;
     function makeImportIfNecessary(defaultImport, namedImports, moduleSpecifier, quotePreference) {
         return defaultImport || namedImports && namedImports.length ? makeImport(defaultImport, namedImports, moduleSpecifier, quotePreference) : undefined;
     }
@@ -109350,6 +109638,7 @@ var ts;
         return checker.getTypeAtLocation(caseClause.parent.parent.expression);
     }
     ts.getSwitchedType = getSwitchedType;
+    ts.ANONYMOUS = "anonymous function";
     function getTypeNodeIfAccessible(type, enclosingScope, program, host) {
         var checker = program.getTypeChecker();
         var typeIsAccessible = true;
@@ -109361,14 +109650,7 @@ var ts;
             reportInaccessibleThisError: notAccessible,
             reportPrivateInBaseOfClassExpression: notAccessible,
             reportInaccessibleUniqueSymbolError: notAccessible,
-            moduleResolverHost: {
-                readFile: host.readFile,
-                fileExists: host.fileExists,
-                directoryExists: host.directoryExists,
-                getSourceFiles: program.getSourceFiles,
-                getCurrentDirectory: program.getCurrentDirectory,
-                getCommonSourceDirectory: program.getCommonSourceDirectory,
-            }
+            moduleResolverHost: getModuleSpecifierResolverHost(program, host)
         });
         return typeIsAccessible ? res : undefined;
     }
@@ -115696,17 +115978,19 @@ var ts;
                 return exposedByParent ? scope.getSourceFile() : scope; // TODO: GH#18217
             }
             /** Used as a quick check for whether a symbol is used at all in a file (besides its definition). */
-            function isSymbolReferencedInFile(definition, checker, sourceFile) {
-                return eachSymbolReferenceInFile(definition, checker, sourceFile, function () { return true; }) || false;
+            function isSymbolReferencedInFile(definition, checker, sourceFile, searchContainer) {
+                if (searchContainer === void 0) { searchContainer = sourceFile; }
+                return eachSymbolReferenceInFile(definition, checker, sourceFile, function () { return true; }, searchContainer) || false;
             }
             Core.isSymbolReferencedInFile = isSymbolReferencedInFile;
-            function eachSymbolReferenceInFile(definition, checker, sourceFile, cb) {
+            function eachSymbolReferenceInFile(definition, checker, sourceFile, cb, searchContainer) {
+                if (searchContainer === void 0) { searchContainer = sourceFile; }
                 var symbol = ts.isParameterPropertyDeclaration(definition.parent, definition.parent.parent)
                     ? ts.first(checker.getSymbolsOfParameterPropertyDeclaration(definition.parent, definition.text))
                     : checker.getSymbolAtLocation(definition);
                 if (!symbol)
                     return undefined;
-                for (var _i = 0, _a = getPossibleSymbolReferenceNodes(sourceFile, symbol.name); _i < _a.length; _i++) {
+                for (var _i = 0, _a = getPossibleSymbolReferenceNodes(sourceFile, symbol.name, searchContainer); _i < _a.length; _i++) {
                     var token = _a[_i];
                     if (!ts.isIdentifier(token) || token === definition || token.escapedText !== definition.escapedText)
                         continue;
@@ -117095,7 +117379,7 @@ var ts;
                     : getSourceFileToImport(importedModuleSymbol, importLiteral, sourceFile, program, host, oldToNew);
                 // Need an update if the imported file moved, or the importing file moved and was using a relative path.
                 return toImport !== undefined && (toImport.updated || (importingSourceFileMoved && ts.pathIsRelative(importLiteral.text)))
-                    ? ts.moduleSpecifiers.updateModuleSpecifier(program.getCompilerOptions(), newImportFromPath, toImport.newFileName, host, allFiles, program.redirectTargetsMap, importLiteral.text)
+                    ? ts.moduleSpecifiers.updateModuleSpecifier(program.getCompilerOptions(), newImportFromPath, toImport.newFileName, ts.createModuleSpecifierResolutionHost(program, host), importLiteral.text)
                     : undefined;
             });
         };
@@ -117420,7 +117704,7 @@ var ts;
             function getConstructSignatureDefinition() {
                 // Applicable only if we are in a new expression, or we are on a constructor declaration
                 // and in either case the symbol has a construct signature definition, i.e. class
-                if (symbol.flags & 32 /* Class */ && !(symbol.flags & 16 /* Function */) && (ts.isNewExpressionTarget(node) || node.kind === 130 /* ConstructorKeyword */)) {
+                if (symbol.flags & 32 /* Class */ && !(symbol.flags & (16 /* Function */ | 3 /* Variable */)) && (ts.isNewExpressionTarget(node) || node.kind === 130 /* ConstructorKeyword */)) {
                     var cls = ts.find(filteredDeclarations, ts.isClassLike) || ts.Debug.fail("Expected declaration to have at least one class-like declaration");
                     return getSignatureDefinition(cls.members, /*selectConstructors*/ true);
                 }
@@ -123903,8 +124187,8 @@ var ts;
                     },
                     getIndentation: function () { return indentation; },
                     getDelta: getDelta,
-                    recomputeIndentation: function (lineAdded) {
-                        if (node.parent && formatting.SmartIndenter.shouldIndentChildNode(options, node.parent, node, sourceFile)) {
+                    recomputeIndentation: function (lineAdded, parent) {
+                        if (formatting.SmartIndenter.shouldIndentChildNode(options, parent, node, sourceFile)) {
                             indentation += lineAdded ? options.indentSize : -options.indentSize;
                             delta = formatting.SmartIndenter.shouldIndentChildNode(options, node) ? options.indentSize : 0;
                         }
@@ -124238,7 +124522,7 @@ var ts;
                                 // Handle the case where the next line is moved to be the end of this line.
                                 // In this case we don't indent the next line in the next pass.
                                 if (currentParent.getStart(sourceFile) === currentItem.pos) {
-                                    dynamicIndentation.recomputeIndentation(/*lineAddedByFormatting*/ false);
+                                    dynamicIndentation.recomputeIndentation(/*lineAddedByFormatting*/ false, contextNode);
                                 }
                                 break;
                             case 1 /* LineAdded */:
@@ -124246,7 +124530,7 @@ var ts;
                                 // In this case we indent token2 in the next pass but we set
                                 // sameLineIndent flag to notify the indenter that the indentation is within the line.
                                 if (currentParent.getStart(sourceFile) === currentItem.pos) {
-                                    dynamicIndentation.recomputeIndentation(/*lineAddedByFormatting*/ true);
+                                    dynamicIndentation.recomputeIndentation(/*lineAddedByFormatting*/ true, contextNode);
                                 }
                                 break;
                             default:
@@ -125362,9 +125646,18 @@ var ts;
                     suffix: (ts.isLineBreak(sourceFile.text.charCodeAt(pos)) ? "" : this.newLineCharacter) + (blankLineBetween ? this.newLineCharacter : ""),
                 });
             };
+            ChangeTracker.prototype.insertFirstParameter = function (sourceFile, parameters, newParam) {
+                var p0 = ts.firstOrUndefined(parameters);
+                if (p0) {
+                    this.insertNodeBefore(sourceFile, p0, newParam);
+                }
+                else {
+                    this.insertNodeAt(sourceFile, parameters.pos, newParam);
+                }
+            };
             ChangeTracker.prototype.insertNodeBefore = function (sourceFile, before, newNode, blankLineBetween) {
                 if (blankLineBetween === void 0) { blankLineBetween = false; }
-                this.insertNodeAt(sourceFile, getAdjustedStartPosition(sourceFile, before, {}), newNode, this.getOptionsForInsertNodeBefore(before, blankLineBetween));
+                this.insertNodeAt(sourceFile, getAdjustedStartPosition(sourceFile, before, {}), newNode, this.getOptionsForInsertNodeBefore(before, newNode, blankLineBetween));
             };
             ChangeTracker.prototype.insertModifierBefore = function (sourceFile, modifier, before) {
                 var pos = before.getStart(sourceFile);
@@ -125440,7 +125733,7 @@ var ts;
                 var start = (ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile) || ts.first(node.parameters)).getStart(sourceFile);
                 this.insertNodesAt(sourceFile, start, typeParameters, { prefix: "<", suffix: ">" });
             };
-            ChangeTracker.prototype.getOptionsForInsertNodeBefore = function (before, doubleNewlines) {
+            ChangeTracker.prototype.getOptionsForInsertNodeBefore = function (before, inserted, doubleNewlines) {
                 if (ts.isStatement(before) || ts.isClassElement(before)) {
                     return { suffix: doubleNewlines ? this.newLineCharacter + this.newLineCharacter : this.newLineCharacter };
                 }
@@ -125448,7 +125741,7 @@ var ts;
                     return { suffix: ", " };
                 }
                 else if (ts.isParameter(before)) {
-                    return {};
+                    return ts.isParameter(inserted) ? { suffix: ", " } : {};
                 }
                 else if (ts.isStringLiteral(before) && ts.isImportDeclaration(before.parent) || ts.isNamedImports(before)) {
                     return { suffix: ", " };
@@ -125909,7 +126202,7 @@ var ts;
             function getNonformattedText(node, sourceFile, newLineCharacter) {
                 var writer = createWriter(newLineCharacter);
                 var newLine = newLineCharacter === "\n" ? 1 /* LineFeed */ : 0 /* CarriageReturnLineFeed */;
-                ts.createPrinter({ newLine: newLine, neverAsciiEscape: true }, writer).writeNode(4 /* Unspecified */, node, sourceFile, writer);
+                ts.createPrinter({ newLine: newLine, neverAsciiEscape: true, preserveSourceNewlines: true }, writer).writeNode(4 /* Unspecified */, node, sourceFile, writer);
                 return { text: writer.getText(), node: assignPositionsToNode(node) };
             }
             changesToText.getNonformattedText = getNonformattedText;
@@ -126030,8 +126323,8 @@ var ts;
                 writer.writeSymbol(s, sym);
                 setLastNonTriviaPosition(s, /*force*/ false);
             }
-            function writeLine() {
-                writer.writeLine();
+            function writeLine(force) {
+                writer.writeLine(force);
             }
             function increaseIndent() {
                 writer.increaseIndent();
@@ -126241,15 +126534,21 @@ var ts;
                     case 257 /* NamespaceImport */:
                         deleteImportBinding(changes, sourceFile, node);
                         break;
+                    case 26 /* SemicolonToken */:
+                        deleteNode(changes, sourceFile, node, { trailingTriviaOption: TrailingTriviaOption.Exclude });
+                        break;
+                    case 94 /* FunctionKeyword */:
+                        deleteNode(changes, sourceFile, node, { leadingTriviaOption: LeadingTriviaOption.Exclude });
+                        break;
                     default:
                         if (ts.isImportClause(node.parent) && node.parent.name === node) {
                             deleteDefaultImport(changes, sourceFile, node.parent);
                         }
-                        else if (ts.isCallLikeExpression(node.parent)) {
+                        else if (ts.isCallExpression(node.parent) && ts.contains(node.parent.arguments, node)) {
                             deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         }
                         else {
-                            deleteNode(changes, sourceFile, node, node.kind === 26 /* SemicolonToken */ ? { trailingTriviaOption: TrailingTriviaOption.Exclude } : undefined);
+                            deleteNode(changes, sourceFile, node);
                         }
                 }
             }
@@ -126438,7 +126737,7 @@ var ts;
         codefix.eachDiagnostic = eachDiagnostic;
         function getDiagnostics(_a) {
             var program = _a.program, sourceFile = _a.sourceFile, cancellationToken = _a.cancellationToken;
-            return program.getSemanticDiagnostics(sourceFile, cancellationToken).concat(ts.computeSuggestionDiagnostics(sourceFile, program, cancellationToken));
+            return __spreadArrays(program.getSemanticDiagnostics(sourceFile, cancellationToken), program.getSyntacticDiagnostics(sourceFile, cancellationToken), ts.computeSuggestionDiagnostics(sourceFile, program, cancellationToken));
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
@@ -127216,987 +127515,6 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
-(function (ts) {
-    var codefix;
-    (function (codefix) {
-        var fixId = "inferFromUsage";
-        var errorCodes = [
-            // Variable declarations
-            ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code,
-            // Variable uses
-            ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code,
-            // Parameter declarations
-            ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code,
-            ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code,
-            // Get Accessor declarations
-            ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code,
-            ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code,
-            // Set Accessor declarations
-            ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code,
-            // Property declarations
-            ts.Diagnostics.Member_0_implicitly_has_an_1_type.code,
-            //// Suggestions
-            // Variable declarations
-            ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage.code,
-            // Variable uses
-            ts.Diagnostics.Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
-            // Parameter declarations
-            ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
-            ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code,
-            // Get Accessor declarations
-            ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_get_accessor_may_be_inferred_from_usage.code,
-            ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage.code,
-            // Set Accessor declarations
-            ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code,
-            // Property declarations
-            ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
-            // Function expressions and declarations
-            ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code,
-        ];
-        codefix.registerCodeFix({
-            errorCodes: errorCodes,
-            getCodeActions: function (context) {
-                var sourceFile = context.sourceFile, program = context.program, start = context.span.start, errorCode = context.errorCode, cancellationToken = context.cancellationToken, host = context.host, preferences = context.preferences;
-                var token = ts.getTokenAtPosition(sourceFile, start);
-                var declaration;
-                var changes = ts.textChanges.ChangeTracker.with(context, function (changes) { declaration = doChange(changes, sourceFile, token, errorCode, program, cancellationToken, /*markSeen*/ ts.returnTrue, host, preferences); });
-                var name = declaration && ts.getNameOfDeclaration(declaration);
-                return !name || changes.length === 0 ? undefined
-                    : [codefix.createCodeFixAction(fixId, changes, [getDiagnostic(errorCode, token), name.getText(sourceFile)], fixId, ts.Diagnostics.Infer_all_types_from_usage)];
-            },
-            fixIds: [fixId],
-            getAllCodeActions: function (context) {
-                var sourceFile = context.sourceFile, program = context.program, cancellationToken = context.cancellationToken, host = context.host, preferences = context.preferences;
-                var markSeen = ts.nodeSeenTracker();
-                return codefix.codeFixAll(context, errorCodes, function (changes, err) {
-                    doChange(changes, sourceFile, ts.getTokenAtPosition(err.file, err.start), err.code, program, cancellationToken, markSeen, host, preferences);
-                });
-            },
-        });
-        function getDiagnostic(errorCode, token) {
-            switch (errorCode) {
-                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code:
-                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.isSetAccessorDeclaration(ts.getContainingFunction(token)) ? ts.Diagnostics.Infer_type_of_0_from_usage : ts.Diagnostics.Infer_parameter_types_from_usage; // TODO: GH#18217
-                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
-                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Infer_parameter_types_from_usage;
-                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
-                    return ts.Diagnostics.Infer_this_type_of_0_from_usage;
-                default:
-                    return ts.Diagnostics.Infer_type_of_0_from_usage;
-            }
-        }
-        /** Map suggestion code to error code */
-        function mapSuggestionDiagnostic(errorCode) {
-            switch (errorCode) {
-                case ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code;
-                case ts.Diagnostics.Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code;
-                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code;
-                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code;
-                case ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_get_accessor_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code;
-                case ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code;
-                case ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code;
-                case ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Member_0_implicitly_has_an_1_type.code;
-            }
-            return errorCode;
-        }
-        function doChange(changes, sourceFile, token, errorCode, program, cancellationToken, markSeen, host, preferences) {
-            if (!ts.isParameterPropertyModifier(token.kind) && token.kind !== 75 /* Identifier */ && token.kind !== 25 /* DotDotDotToken */ && token.kind !== 104 /* ThisKeyword */) {
-                return undefined;
-            }
-            var parent = token.parent;
-            var importAdder = codefix.createImportAdder(sourceFile, program, preferences, host);
-            errorCode = mapSuggestionDiagnostic(errorCode);
-            switch (errorCode) {
-                // Variable and Property declarations
-                case ts.Diagnostics.Member_0_implicitly_has_an_1_type.code:
-                case ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code:
-                    if ((ts.isVariableDeclaration(parent) && markSeen(parent)) || ts.isPropertyDeclaration(parent) || ts.isPropertySignature(parent)) { // handle bad location
-                        annotateVariableDeclaration(changes, importAdder, sourceFile, parent, program, host, cancellationToken);
-                        importAdder.writeFixes(changes);
-                        return parent;
-                    }
-                    if (ts.isPropertyAccessExpression(parent)) {
-                        var type = inferTypeForVariableFromUsage(parent.name, program, cancellationToken);
-                        var typeNode = ts.getTypeNodeIfAccessible(type, parent, program, host);
-                        if (typeNode) {
-                            // Note that the codefix will never fire with an existing `@type` tag, so there is no need to merge tags
-                            var typeTag = ts.createJSDocTypeTag(ts.createJSDocTypeExpression(typeNode), /*comment*/ "");
-                            addJSDocTags(changes, sourceFile, ts.cast(parent.parent.parent, ts.isExpressionStatement), [typeTag]);
-                        }
-                        importAdder.writeFixes(changes);
-                        return parent;
-                    }
-                    return undefined;
-                case ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code: {
-                    var symbol = program.getTypeChecker().getSymbolAtLocation(token);
-                    if (symbol && symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) && markSeen(symbol.valueDeclaration)) {
-                        annotateVariableDeclaration(changes, importAdder, sourceFile, symbol.valueDeclaration, program, host, cancellationToken);
-                        importAdder.writeFixes(changes);
-                        return symbol.valueDeclaration;
-                    }
-                    return undefined;
-                }
-            }
-            var containingFunction = ts.getContainingFunction(token);
-            if (containingFunction === undefined) {
-                return undefined;
-            }
-            var declaration;
-            switch (errorCode) {
-                // Parameter declarations
-                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code:
-                    if (ts.isSetAccessorDeclaration(containingFunction)) {
-                        annotateSetAccessor(changes, importAdder, sourceFile, containingFunction, program, host, cancellationToken);
-                        declaration = containingFunction;
-                        break;
-                    }
-                // falls through
-                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
-                    if (markSeen(containingFunction)) {
-                        var param = ts.cast(parent, ts.isParameter);
-                        annotateParameters(changes, importAdder, sourceFile, param, containingFunction, program, host, cancellationToken);
-                        declaration = param;
-                    }
-                    break;
-                // Get Accessor declarations
-                case ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code:
-                case ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code:
-                    if (ts.isGetAccessorDeclaration(containingFunction) && ts.isIdentifier(containingFunction.name)) {
-                        annotate(changes, importAdder, sourceFile, containingFunction, inferTypeForVariableFromUsage(containingFunction.name, program, cancellationToken), program, host);
-                        declaration = containingFunction;
-                    }
-                    break;
-                // Set Accessor declarations
-                case ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code:
-                    if (ts.isSetAccessorDeclaration(containingFunction)) {
-                        annotateSetAccessor(changes, importAdder, sourceFile, containingFunction, program, host, cancellationToken);
-                        declaration = containingFunction;
-                    }
-                    break;
-                // Function 'this'
-                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
-                    if (ts.textChanges.isThisTypeAnnotatable(containingFunction) && markSeen(containingFunction)) {
-                        annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken);
-                        declaration = containingFunction;
-                    }
-                    break;
-                default:
-                    return ts.Debug.fail(String(errorCode));
-            }
-            importAdder.writeFixes(changes);
-            return declaration;
-        }
-        function annotateVariableDeclaration(changes, importAdder, sourceFile, declaration, program, host, cancellationToken) {
-            if (ts.isIdentifier(declaration.name)) {
-                annotate(changes, importAdder, sourceFile, declaration, inferTypeForVariableFromUsage(declaration.name, program, cancellationToken), program, host);
-            }
-        }
-        function annotateParameters(changes, importAdder, sourceFile, parameterDeclaration, containingFunction, program, host, cancellationToken) {
-            if (!ts.isIdentifier(parameterDeclaration.name)) {
-                return;
-            }
-            var parameterInferences = inferTypeForParametersFromUsage(containingFunction, sourceFile, program, cancellationToken);
-            ts.Debug.assert(containingFunction.parameters.length === parameterInferences.length, "Parameter count and inference count should match");
-            if (ts.isInJSFile(containingFunction)) {
-                annotateJSDocParameters(changes, sourceFile, parameterInferences, program, host);
-            }
-            else {
-                var needParens = ts.isArrowFunction(containingFunction) && !ts.findChildOfKind(containingFunction, 20 /* OpenParenToken */, sourceFile);
-                if (needParens)
-                    changes.insertNodeBefore(sourceFile, ts.first(containingFunction.parameters), ts.createToken(20 /* OpenParenToken */));
-                for (var _i = 0, parameterInferences_1 = parameterInferences; _i < parameterInferences_1.length; _i++) {
-                    var _a = parameterInferences_1[_i], declaration = _a.declaration, type = _a.type;
-                    if (declaration && !declaration.type && !declaration.initializer) {
-                        annotate(changes, importAdder, sourceFile, declaration, type, program, host);
-                    }
-                }
-                if (needParens)
-                    changes.insertNodeAfter(sourceFile, ts.last(containingFunction.parameters), ts.createToken(21 /* CloseParenToken */));
-            }
-        }
-        function annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken) {
-            var references = getFunctionReferences(containingFunction, sourceFile, program, cancellationToken);
-            if (!references || !references.length) {
-                return;
-            }
-            var thisInference = inferTypeFromReferences(program, references, cancellationToken).thisParameter();
-            var typeNode = ts.getTypeNodeIfAccessible(thisInference, containingFunction, program, host);
-            if (!typeNode) {
-                return;
-            }
-            if (ts.isInJSFile(containingFunction)) {
-                annotateJSDocThis(changes, sourceFile, containingFunction, typeNode);
-            }
-            else {
-                changes.tryInsertThisTypeAnnotation(sourceFile, containingFunction, typeNode);
-            }
-        }
-        function annotateJSDocThis(changes, sourceFile, containingFunction, typeNode) {
-            addJSDocTags(changes, sourceFile, containingFunction, [
-                ts.createJSDocThisTag(ts.createJSDocTypeExpression(typeNode)),
-            ]);
-        }
-        function annotateSetAccessor(changes, importAdder, sourceFile, setAccessorDeclaration, program, host, cancellationToken) {
-            var param = ts.firstOrUndefined(setAccessorDeclaration.parameters);
-            if (param && ts.isIdentifier(setAccessorDeclaration.name) && ts.isIdentifier(param.name)) {
-                var type = inferTypeForVariableFromUsage(setAccessorDeclaration.name, program, cancellationToken);
-                if (type === program.getTypeChecker().getAnyType()) {
-                    type = inferTypeForVariableFromUsage(param.name, program, cancellationToken);
-                }
-                if (ts.isInJSFile(setAccessorDeclaration)) {
-                    annotateJSDocParameters(changes, sourceFile, [{ declaration: param, type: type }], program, host);
-                }
-                else {
-                    annotate(changes, importAdder, sourceFile, param, type, program, host);
-                }
-            }
-        }
-        function annotate(changes, importAdder, sourceFile, declaration, type, program, host) {
-            var typeNode = ts.getTypeNodeIfAccessible(type, declaration, program, host);
-            if (typeNode) {
-                if (ts.isInJSFile(sourceFile) && declaration.kind !== 159 /* PropertySignature */) {
-                    var parent = ts.isVariableDeclaration(declaration) ? ts.tryCast(declaration.parent.parent, ts.isVariableStatement) : declaration;
-                    if (!parent) {
-                        return;
-                    }
-                    var typeExpression = ts.createJSDocTypeExpression(typeNode);
-                    var typeTag = ts.isGetAccessorDeclaration(declaration) ? ts.createJSDocReturnTag(typeExpression, "") : ts.createJSDocTypeTag(typeExpression, "");
-                    addJSDocTags(changes, sourceFile, parent, [typeTag]);
-                }
-                else if (!tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, type, sourceFile, changes, importAdder, ts.getEmitScriptTarget(program.getCompilerOptions()))) {
-                    changes.tryInsertTypeAnnotation(sourceFile, declaration, typeNode);
-                }
-            }
-        }
-        function tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, type, sourceFile, changes, importAdder, scriptTarget) {
-            var importableReference = codefix.tryGetAutoImportableReferenceFromImportTypeNode(typeNode, type, scriptTarget);
-            if (importableReference && changes.tryInsertTypeAnnotation(sourceFile, declaration, importableReference.typeReference)) {
-                ts.forEach(importableReference.symbols, function (s) { return importAdder.addImportFromExportedSymbol(s, /*usageIsTypeOnly*/ true); });
-                return true;
-            }
-            return false;
-        }
-        function annotateJSDocParameters(changes, sourceFile, parameterInferences, program, host) {
-            var signature = parameterInferences.length && parameterInferences[0].declaration.parent;
-            if (!signature) {
-                return;
-            }
-            var paramTags = ts.mapDefined(parameterInferences, function (inference) {
-                var param = inference.declaration;
-                // only infer parameters that have (1) no type and (2) an accessible inferred type
-                if (param.initializer || ts.getJSDocType(param) || !ts.isIdentifier(param.name))
-                    return;
-                var typeNode = inference.type && ts.getTypeNodeIfAccessible(inference.type, param, program, host);
-                var name = ts.getSynthesizedClone(param.name);
-                ts.setEmitFlags(name, 1536 /* NoComments */ | 2048 /* NoNestedComments */);
-                return typeNode && ts.createJSDocParamTag(name, !!inference.isOptional, ts.createJSDocTypeExpression(typeNode), "");
-            });
-            addJSDocTags(changes, sourceFile, signature, paramTags);
-        }
-        function addJSDocTags(changes, sourceFile, parent, newTags) {
-            var comments = ts.mapDefined(parent.jsDoc, function (j) { return j.comment; });
-            var oldTags = ts.flatMapToMutable(parent.jsDoc, function (j) { return j.tags; });
-            var unmergedNewTags = newTags.filter(function (newTag) { return !oldTags || !oldTags.some(function (tag, i) {
-                var merged = tryMergeJsdocTags(tag, newTag);
-                if (merged)
-                    oldTags[i] = merged;
-                return !!merged;
-            }); });
-            var tag = ts.createJSDocComment(comments.join("\n"), ts.createNodeArray(__spreadArrays((oldTags || ts.emptyArray), unmergedNewTags)));
-            var jsDocNode = parent.kind === 203 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
-            jsDocNode.jsDoc = parent.jsDoc;
-            jsDocNode.jsDocCache = parent.jsDocCache;
-            changes.insertJsdocCommentBefore(sourceFile, jsDocNode, tag);
-        }
-        function getJsDocNodeForArrowFunction(signature) {
-            if (signature.parent.kind === 160 /* PropertyDeclaration */) {
-                return signature.parent;
-            }
-            return signature.parent.parent;
-        }
-        function tryMergeJsdocTags(oldTag, newTag) {
-            if (oldTag.kind !== newTag.kind) {
-                return undefined;
-            }
-            switch (oldTag.kind) {
-                case 318 /* JSDocParameterTag */: {
-                    var oldParam = oldTag;
-                    var newParam = newTag;
-                    return ts.isIdentifier(oldParam.name) && ts.isIdentifier(newParam.name) && oldParam.name.escapedText === newParam.name.escapedText
-                        ? ts.createJSDocParamTag(newParam.name, newParam.isBracketed, newParam.typeExpression, oldParam.comment)
-                        : undefined;
-                }
-                case 319 /* JSDocReturnTag */:
-                    return ts.createJSDocReturnTag(newTag.typeExpression, oldTag.comment);
-            }
-        }
-        function getReferences(token, program, cancellationToken) {
-            // Position shouldn't matter since token is not a SourceFile.
-            return ts.mapDefined(ts.FindAllReferences.getReferenceEntriesForNode(-1, token, program, program.getSourceFiles(), cancellationToken), function (entry) {
-                return entry.kind !== 0 /* Span */ ? ts.tryCast(entry.node, ts.isIdentifier) : undefined;
-            });
-        }
-        function inferTypeForVariableFromUsage(token, program, cancellationToken) {
-            var references = getReferences(token, program, cancellationToken);
-            return inferTypeFromReferences(program, references, cancellationToken).single();
-        }
-        function inferTypeForParametersFromUsage(func, sourceFile, program, cancellationToken) {
-            var references = getFunctionReferences(func, sourceFile, program, cancellationToken);
-            return references && inferTypeFromReferences(program, references, cancellationToken).parameters(func) ||
-                func.parameters.map(function (p) { return ({
-                    declaration: p,
-                    type: ts.isIdentifier(p.name) ? inferTypeForVariableFromUsage(p.name, program, cancellationToken) : program.getTypeChecker().getAnyType()
-                }); });
-        }
-        function getFunctionReferences(containingFunction, sourceFile, program, cancellationToken) {
-            var searchToken;
-            switch (containingFunction.kind) {
-                case 163 /* Constructor */:
-                    searchToken = ts.findChildOfKind(containingFunction, 130 /* ConstructorKeyword */, sourceFile);
-                    break;
-                case 203 /* ArrowFunction */:
-                case 202 /* FunctionExpression */:
-                    var parent = containingFunction.parent;
-                    searchToken = ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name) ?
-                        parent.name :
-                        containingFunction.name;
-                    break;
-                case 245 /* FunctionDeclaration */:
-                case 162 /* MethodDeclaration */:
-                    searchToken = containingFunction.name;
-                    break;
-            }
-            if (!searchToken) {
-                return undefined;
-            }
-            return getReferences(searchToken, program, cancellationToken);
-        }
-        function inferTypeFromReferences(program, references, cancellationToken) {
-            var checker = program.getTypeChecker();
-            var builtinConstructors = {
-                string: function () { return checker.getStringType(); },
-                number: function () { return checker.getNumberType(); },
-                Array: function (t) { return checker.createArrayType(t); },
-                Promise: function (t) { return checker.createPromiseType(t); },
-            };
-            var builtins = [
-                checker.getStringType(),
-                checker.getNumberType(),
-                checker.createArrayType(checker.getAnyType()),
-                checker.createPromiseType(checker.getAnyType()),
-            ];
-            return {
-                single: single,
-                parameters: parameters,
-                thisParameter: thisParameter,
-            };
-            function createEmptyUsage() {
-                return {
-                    isNumber: undefined,
-                    isString: undefined,
-                    isNumberOrString: undefined,
-                    candidateTypes: undefined,
-                    properties: undefined,
-                    calls: undefined,
-                    constructs: undefined,
-                    numberIndex: undefined,
-                    stringIndex: undefined,
-                    candidateThisTypes: undefined,
-                    inferredTypes: undefined,
-                };
-            }
-            function combineUsages(usages) {
-                var combinedProperties = ts.createUnderscoreEscapedMap();
-                for (var _i = 0, usages_1 = usages; _i < usages_1.length; _i++) {
-                    var u = usages_1[_i];
-                    if (u.properties) {
-                        u.properties.forEach(function (p, name) {
-                            if (!combinedProperties.has(name)) {
-                                combinedProperties.set(name, []);
-                            }
-                            combinedProperties.get(name).push(p);
-                        });
-                    }
-                }
-                var properties = ts.createUnderscoreEscapedMap();
-                combinedProperties.forEach(function (ps, name) {
-                    properties.set(name, combineUsages(ps));
-                });
-                return {
-                    isNumber: usages.some(function (u) { return u.isNumber; }),
-                    isString: usages.some(function (u) { return u.isString; }),
-                    isNumberOrString: usages.some(function (u) { return u.isNumberOrString; }),
-                    candidateTypes: ts.flatMap(usages, function (u) { return u.candidateTypes; }),
-                    properties: properties,
-                    calls: ts.flatMap(usages, function (u) { return u.calls; }),
-                    constructs: ts.flatMap(usages, function (u) { return u.constructs; }),
-                    numberIndex: ts.forEach(usages, function (u) { return u.numberIndex; }),
-                    stringIndex: ts.forEach(usages, function (u) { return u.stringIndex; }),
-                    candidateThisTypes: ts.flatMap(usages, function (u) { return u.candidateThisTypes; }),
-                    inferredTypes: undefined,
-                };
-            }
-            function single() {
-                return combineTypes(inferTypesFromReferencesSingle(references));
-            }
-            function parameters(declaration) {
-                if (references.length === 0 || !declaration.parameters) {
-                    return undefined;
-                }
-                var usage = createEmptyUsage();
-                for (var _i = 0, references_2 = references; _i < references_2.length; _i++) {
-                    var reference = references_2[_i];
-                    cancellationToken.throwIfCancellationRequested();
-                    calculateUsageOfNode(reference, usage);
-                }
-                var calls = __spreadArrays(usage.constructs || [], usage.calls || []);
-                return declaration.parameters.map(function (parameter, parameterIndex) {
-                    var types = [];
-                    var isRest = ts.isRestParameter(parameter);
-                    var isOptional = false;
-                    for (var _i = 0, calls_1 = calls; _i < calls_1.length; _i++) {
-                        var call = calls_1[_i];
-                        if (call.argumentTypes.length <= parameterIndex) {
-                            isOptional = ts.isInJSFile(declaration);
-                            types.push(checker.getUndefinedType());
-                        }
-                        else if (isRest) {
-                            for (var i = parameterIndex; i < call.argumentTypes.length; i++) {
-                                types.push(checker.getBaseTypeOfLiteralType(call.argumentTypes[i]));
-                            }
-                        }
-                        else {
-                            types.push(checker.getBaseTypeOfLiteralType(call.argumentTypes[parameterIndex]));
-                        }
-                    }
-                    if (ts.isIdentifier(parameter.name)) {
-                        var inferred = inferTypesFromReferencesSingle(getReferences(parameter.name, program, cancellationToken));
-                        types.push.apply(types, (isRest ? ts.mapDefined(inferred, checker.getElementTypeOfArrayType) : inferred));
-                    }
-                    var type = combineTypes(types);
-                    return {
-                        type: isRest ? checker.createArrayType(type) : type,
-                        isOptional: isOptional && !isRest,
-                        declaration: parameter
-                    };
-                });
-            }
-            function thisParameter() {
-                var usage = createEmptyUsage();
-                for (var _i = 0, references_3 = references; _i < references_3.length; _i++) {
-                    var reference = references_3[_i];
-                    cancellationToken.throwIfCancellationRequested();
-                    calculateUsageOfNode(reference, usage);
-                }
-                return combineTypes(usage.candidateThisTypes || ts.emptyArray);
-            }
-            function inferTypesFromReferencesSingle(references) {
-                var usage = createEmptyUsage();
-                for (var _i = 0, references_4 = references; _i < references_4.length; _i++) {
-                    var reference = references_4[_i];
-                    cancellationToken.throwIfCancellationRequested();
-                    calculateUsageOfNode(reference, usage);
-                }
-                return inferTypes(usage);
-            }
-            function calculateUsageOfNode(node, usage) {
-                while (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
-                    node = node.parent;
-                }
-                switch (node.parent.kind) {
-                    case 227 /* ExpressionStatement */:
-                        addCandidateType(usage, checker.getVoidType());
-                        break;
-                    case 209 /* PostfixUnaryExpression */:
-                        usage.isNumber = true;
-                        break;
-                    case 208 /* PrefixUnaryExpression */:
-                        inferTypeFromPrefixUnaryExpression(node.parent, usage);
-                        break;
-                    case 210 /* BinaryExpression */:
-                        inferTypeFromBinaryExpression(node, node.parent, usage);
-                        break;
-                    case 278 /* CaseClause */:
-                    case 279 /* DefaultClause */:
-                        inferTypeFromSwitchStatementLabel(node.parent, usage);
-                        break;
-                    case 197 /* CallExpression */:
-                    case 198 /* NewExpression */:
-                        if (node.parent.expression === node) {
-                            inferTypeFromCallExpression(node.parent, usage);
-                        }
-                        else {
-                            inferTypeFromContextualType(node, usage);
-                        }
-                        break;
-                    case 195 /* PropertyAccessExpression */:
-                        inferTypeFromPropertyAccessExpression(node.parent, usage);
-                        break;
-                    case 196 /* ElementAccessExpression */:
-                        inferTypeFromPropertyElementExpression(node.parent, node, usage);
-                        break;
-                    case 282 /* PropertyAssignment */:
-                    case 283 /* ShorthandPropertyAssignment */:
-                        inferTypeFromPropertyAssignment(node.parent, usage);
-                        break;
-                    case 160 /* PropertyDeclaration */:
-                        inferTypeFromPropertyDeclaration(node.parent, usage);
-                        break;
-                    case 243 /* VariableDeclaration */: {
-                        var _a = node.parent, name = _a.name, initializer = _a.initializer;
-                        if (node === name) {
-                            if (initializer) { // This can happen for `let x = null;` which still has an implicit-any error.
-                                addCandidateType(usage, checker.getTypeAtLocation(initializer));
-                            }
-                            break;
-                        }
-                    }
-                    // falls through
-                    default:
-                        return inferTypeFromContextualType(node, usage);
-                }
-            }
-            function inferTypeFromContextualType(node, usage) {
-                if (ts.isExpressionNode(node)) {
-                    addCandidateType(usage, checker.getContextualType(node));
-                }
-            }
-            function inferTypeFromPrefixUnaryExpression(node, usage) {
-                switch (node.operator) {
-                    case 45 /* PlusPlusToken */:
-                    case 46 /* MinusMinusToken */:
-                    case 40 /* MinusToken */:
-                    case 54 /* TildeToken */:
-                        usage.isNumber = true;
-                        break;
-                    case 39 /* PlusToken */:
-                        usage.isNumberOrString = true;
-                        break;
-                    // case SyntaxKind.ExclamationToken:
-                    // no inferences here;
-                }
-            }
-            function inferTypeFromBinaryExpression(node, parent, usage) {
-                switch (parent.operatorToken.kind) {
-                    // ExponentiationOperator
-                    case 42 /* AsteriskAsteriskToken */:
-                    // MultiplicativeOperator
-                    // falls through
-                    case 41 /* AsteriskToken */:
-                    case 43 /* SlashToken */:
-                    case 44 /* PercentToken */:
-                    // ShiftOperator
-                    // falls through
-                    case 47 /* LessThanLessThanToken */:
-                    case 48 /* GreaterThanGreaterThanToken */:
-                    case 49 /* GreaterThanGreaterThanGreaterThanToken */:
-                    // BitwiseOperator
-                    // falls through
-                    case 50 /* AmpersandToken */:
-                    case 51 /* BarToken */:
-                    case 52 /* CaretToken */:
-                    // CompoundAssignmentOperator
-                    // falls through
-                    case 64 /* MinusEqualsToken */:
-                    case 66 /* AsteriskAsteriskEqualsToken */:
-                    case 65 /* AsteriskEqualsToken */:
-                    case 67 /* SlashEqualsToken */:
-                    case 68 /* PercentEqualsToken */:
-                    case 72 /* AmpersandEqualsToken */:
-                    case 73 /* BarEqualsToken */:
-                    case 74 /* CaretEqualsToken */:
-                    case 69 /* LessThanLessThanEqualsToken */:
-                    case 71 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                    case 70 /* GreaterThanGreaterThanEqualsToken */:
-                    // AdditiveOperator
-                    // falls through
-                    case 40 /* MinusToken */:
-                    // RelationalOperator
-                    // falls through
-                    case 29 /* LessThanToken */:
-                    case 32 /* LessThanEqualsToken */:
-                    case 31 /* GreaterThanToken */:
-                    case 33 /* GreaterThanEqualsToken */:
-                        var operandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
-                        if (operandType.flags & 1056 /* EnumLike */) {
-                            addCandidateType(usage, operandType);
-                        }
-                        else {
-                            usage.isNumber = true;
-                        }
-                        break;
-                    case 63 /* PlusEqualsToken */:
-                    case 39 /* PlusToken */:
-                        var otherOperandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
-                        if (otherOperandType.flags & 1056 /* EnumLike */) {
-                            addCandidateType(usage, otherOperandType);
-                        }
-                        else if (otherOperandType.flags & 296 /* NumberLike */) {
-                            usage.isNumber = true;
-                        }
-                        else if (otherOperandType.flags & 132 /* StringLike */) {
-                            usage.isString = true;
-                        }
-                        else if (otherOperandType.flags & 1 /* Any */) {
-                            // do nothing, maybe we'll learn something elsewhere
-                        }
-                        else {
-                            usage.isNumberOrString = true;
-                        }
-                        break;
-                    //  AssignmentOperators
-                    case 62 /* EqualsToken */:
-                    case 34 /* EqualsEqualsToken */:
-                    case 36 /* EqualsEqualsEqualsToken */:
-                    case 37 /* ExclamationEqualsEqualsToken */:
-                    case 35 /* ExclamationEqualsToken */:
-                        addCandidateType(usage, checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left));
-                        break;
-                    case 97 /* InKeyword */:
-                        if (node === parent.left) {
-                            usage.isString = true;
-                        }
-                        break;
-                    // LogicalOperator Or NullishCoalescing
-                    case 56 /* BarBarToken */:
-                    case 60 /* QuestionQuestionToken */:
-                        if (node === parent.left &&
-                            (node.parent.parent.kind === 243 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
-                            // var x = x || {};
-                            // TODO: use getFalsyflagsOfType
-                            addCandidateType(usage, checker.getTypeAtLocation(parent.right));
-                        }
-                        break;
-                    case 55 /* AmpersandAmpersandToken */:
-                    case 27 /* CommaToken */:
-                    case 98 /* InstanceOfKeyword */:
-                        // nothing to infer here
-                        break;
-                }
-            }
-            function inferTypeFromSwitchStatementLabel(parent, usage) {
-                addCandidateType(usage, checker.getTypeAtLocation(parent.parent.parent.expression));
-            }
-            function inferTypeFromCallExpression(parent, usage) {
-                var call = {
-                    argumentTypes: [],
-                    return_: createEmptyUsage()
-                };
-                if (parent.arguments) {
-                    for (var _i = 0, _a = parent.arguments; _i < _a.length; _i++) {
-                        var argument = _a[_i];
-                        call.argumentTypes.push(checker.getTypeAtLocation(argument));
-                    }
-                }
-                calculateUsageOfNode(parent, call.return_);
-                if (parent.kind === 197 /* CallExpression */) {
-                    (usage.calls || (usage.calls = [])).push(call);
-                }
-                else {
-                    (usage.constructs || (usage.constructs = [])).push(call);
-                }
-            }
-            function inferTypeFromPropertyAccessExpression(parent, usage) {
-                var name = ts.escapeLeadingUnderscores(parent.name.text);
-                if (!usage.properties) {
-                    usage.properties = ts.createUnderscoreEscapedMap();
-                }
-                var propertyUsage = usage.properties.get(name) || createEmptyUsage();
-                calculateUsageOfNode(parent, propertyUsage);
-                usage.properties.set(name, propertyUsage);
-            }
-            function inferTypeFromPropertyElementExpression(parent, node, usage) {
-                if (node === parent.argumentExpression) {
-                    usage.isNumberOrString = true;
-                    return;
-                }
-                else {
-                    var indexType = checker.getTypeAtLocation(parent.argumentExpression);
-                    var indexUsage = createEmptyUsage();
-                    calculateUsageOfNode(parent, indexUsage);
-                    if (indexType.flags & 296 /* NumberLike */) {
-                        usage.numberIndex = indexUsage;
-                    }
-                    else {
-                        usage.stringIndex = indexUsage;
-                    }
-                }
-            }
-            function inferTypeFromPropertyAssignment(assignment, usage) {
-                var nodeWithRealType = ts.isVariableDeclaration(assignment.parent.parent) ?
-                    assignment.parent.parent :
-                    assignment.parent;
-                addCandidateThisType(usage, checker.getTypeAtLocation(nodeWithRealType));
-            }
-            function inferTypeFromPropertyDeclaration(declaration, usage) {
-                addCandidateThisType(usage, checker.getTypeAtLocation(declaration.parent));
-            }
-            function removeLowPriorityInferences(inferences, priorities) {
-                var toRemove = [];
-                for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
-                    var i = inferences_1[_i];
-                    for (var _a = 0, priorities_1 = priorities; _a < priorities_1.length; _a++) {
-                        var _b = priorities_1[_a], high = _b.high, low = _b.low;
-                        if (high(i)) {
-                            ts.Debug.assert(!low(i), "Priority can't have both low and high");
-                            toRemove.push(low);
-                        }
-                    }
-                }
-                return inferences.filter(function (i) { return toRemove.every(function (f) { return !f(i); }); });
-            }
-            function combineFromUsage(usage) {
-                return combineTypes(inferTypes(usage));
-            }
-            function combineTypes(inferences) {
-                if (!inferences.length)
-                    return checker.getAnyType();
-                // 1. string or number individually override string | number
-                // 2. non-any, non-void overrides any or void
-                // 3. non-nullable, non-any, non-void, non-anonymous overrides anonymous types
-                var stringNumber = checker.getUnionType([checker.getStringType(), checker.getNumberType()]);
-                var priorities = [
-                    {
-                        high: function (t) { return t === checker.getStringType() || t === checker.getNumberType(); },
-                        low: function (t) { return t === stringNumber; }
-                    },
-                    {
-                        high: function (t) { return !(t.flags & (1 /* Any */ | 16384 /* Void */)); },
-                        low: function (t) { return !!(t.flags & (1 /* Any */ | 16384 /* Void */)); }
-                    },
-                    {
-                        high: function (t) { return !(t.flags & (98304 /* Nullable */ | 1 /* Any */ | 16384 /* Void */)) && !(ts.getObjectFlags(t) & 16 /* Anonymous */); },
-                        low: function (t) { return !!(ts.getObjectFlags(t) & 16 /* Anonymous */); }
-                    }
-                ];
-                var good = removeLowPriorityInferences(inferences, priorities);
-                var anons = good.filter(function (i) { return ts.getObjectFlags(i) & 16 /* Anonymous */; });
-                if (anons.length) {
-                    good = good.filter(function (i) { return !(ts.getObjectFlags(i) & 16 /* Anonymous */); });
-                    good.push(combineAnonymousTypes(anons));
-                }
-                return checker.getWidenedType(checker.getUnionType(good.map(checker.getBaseTypeOfLiteralType), 2 /* Subtype */));
-            }
-            function combineAnonymousTypes(anons) {
-                if (anons.length === 1) {
-                    return anons[0];
-                }
-                var calls = [];
-                var constructs = [];
-                var stringIndices = [];
-                var numberIndices = [];
-                var stringIndexReadonly = false;
-                var numberIndexReadonly = false;
-                var props = ts.createMultiMap();
-                for (var _i = 0, anons_1 = anons; _i < anons_1.length; _i++) {
-                    var anon = anons_1[_i];
-                    for (var _a = 0, _b = checker.getPropertiesOfType(anon); _a < _b.length; _a++) {
-                        var p = _b[_a];
-                        props.add(p.name, checker.getTypeOfSymbolAtLocation(p, p.valueDeclaration));
-                    }
-                    calls.push.apply(calls, checker.getSignaturesOfType(anon, 0 /* Call */));
-                    constructs.push.apply(constructs, checker.getSignaturesOfType(anon, 1 /* Construct */));
-                    if (anon.stringIndexInfo) {
-                        stringIndices.push(anon.stringIndexInfo.type);
-                        stringIndexReadonly = stringIndexReadonly || anon.stringIndexInfo.isReadonly;
-                    }
-                    if (anon.numberIndexInfo) {
-                        numberIndices.push(anon.numberIndexInfo.type);
-                        numberIndexReadonly = numberIndexReadonly || anon.numberIndexInfo.isReadonly;
-                    }
-                }
-                var members = ts.mapEntries(props, function (name, types) {
-                    var isOptional = types.length < anons.length ? 16777216 /* Optional */ : 0;
-                    var s = checker.createSymbol(4 /* Property */ | isOptional, name);
-                    s.type = checker.getUnionType(types);
-                    return [name, s];
-                });
-                return checker.createAnonymousType(anons[0].symbol, members, calls, constructs, stringIndices.length ? checker.createIndexInfo(checker.getUnionType(stringIndices), stringIndexReadonly) : undefined, numberIndices.length ? checker.createIndexInfo(checker.getUnionType(numberIndices), numberIndexReadonly) : undefined);
-            }
-            function inferTypes(usage) {
-                var types = [];
-                if (usage.isNumber) {
-                    types.push(checker.getNumberType());
-                }
-                if (usage.isString) {
-                    types.push(checker.getStringType());
-                }
-                if (usage.isNumberOrString) {
-                    types.push(checker.getUnionType([checker.getStringType(), checker.getNumberType()]));
-                }
-                if (usage.numberIndex) {
-                    types.push(checker.createArrayType(combineFromUsage(usage.numberIndex)));
-                }
-                if (usage.properties && usage.properties.size
-                    || usage.calls && usage.calls.length
-                    || usage.constructs && usage.constructs.length
-                    || usage.stringIndex) {
-                    types.push(inferStructuralType(usage));
-                }
-                types.push.apply(types, (usage.candidateTypes || []).map(function (t) { return checker.getBaseTypeOfLiteralType(t); }));
-                types.push.apply(types, inferNamedTypesFromProperties(usage));
-                return types;
-            }
-            function inferStructuralType(usage) {
-                var members = ts.createUnderscoreEscapedMap();
-                if (usage.properties) {
-                    usage.properties.forEach(function (u, name) {
-                        var symbol = checker.createSymbol(4 /* Property */, name);
-                        symbol.type = combineFromUsage(u);
-                        members.set(name, symbol);
-                    });
-                }
-                var callSignatures = usage.calls ? [getSignatureFromCalls(usage.calls)] : [];
-                var constructSignatures = usage.constructs ? [getSignatureFromCalls(usage.constructs)] : [];
-                var stringIndexInfo = usage.stringIndex && checker.createIndexInfo(combineFromUsage(usage.stringIndex), /*isReadonly*/ false);
-                return checker.createAnonymousType(/*symbol*/ undefined, members, callSignatures, constructSignatures, stringIndexInfo, /*numberIndexInfo*/ undefined);
-            }
-            function inferNamedTypesFromProperties(usage) {
-                if (!usage.properties || !usage.properties.size)
-                    return [];
-                var types = builtins.filter(function (t) { return allPropertiesAreAssignableToUsage(t, usage); });
-                if (0 < types.length && types.length < 3) {
-                    return types.map(function (t) { return inferInstantiationFromUsage(t, usage); });
-                }
-                return [];
-            }
-            function allPropertiesAreAssignableToUsage(type, usage) {
-                if (!usage.properties)
-                    return false;
-                return !ts.forEachEntry(usage.properties, function (propUsage, name) {
-                    var source = checker.getTypeOfPropertyOfType(type, name);
-                    if (!source) {
-                        return true;
-                    }
-                    if (propUsage.calls) {
-                        var sigs = checker.getSignaturesOfType(source, 0 /* Call */);
-                        return !sigs.length || !checker.isTypeAssignableTo(source, getFunctionFromCalls(propUsage.calls));
-                    }
-                    else {
-                        return !checker.isTypeAssignableTo(source, combineFromUsage(propUsage));
-                    }
-                });
-            }
-            /**
-             * inference is limited to
-             * 1. generic types with a single parameter
-             * 2. inference to/from calls with a single signature
-             */
-            function inferInstantiationFromUsage(type, usage) {
-                if (!(ts.getObjectFlags(type) & 4 /* Reference */) || !usage.properties) {
-                    return type;
-                }
-                var generic = type.target;
-                var singleTypeParameter = ts.singleOrUndefined(generic.typeParameters);
-                if (!singleTypeParameter)
-                    return type;
-                var types = [];
-                usage.properties.forEach(function (propUsage, name) {
-                    var genericPropertyType = checker.getTypeOfPropertyOfType(generic, name);
-                    ts.Debug.assert(!!genericPropertyType, "generic should have all the properties of its reference.");
-                    types.push.apply(types, inferTypeParameters(genericPropertyType, combineFromUsage(propUsage), singleTypeParameter));
-                });
-                return builtinConstructors[type.symbol.escapedName](combineTypes(types));
-            }
-            function inferTypeParameters(genericType, usageType, typeParameter) {
-                if (genericType === typeParameter) {
-                    return [usageType];
-                }
-                else if (genericType.flags & 3145728 /* UnionOrIntersection */) {
-                    return ts.flatMap(genericType.types, function (t) { return inferTypeParameters(t, usageType, typeParameter); });
-                }
-                else if (genericType.flags & 134217728 /* Awaited */) {
-                    return inferTypeParameters(genericType.awaitedType, usageType, typeParameter);
-                }
-                else if (ts.getObjectFlags(genericType) & 4 /* Reference */ && ts.getObjectFlags(usageType) & 4 /* Reference */) {
-                    // this is wrong because we need a reference to the targetType to, so we can check that it's also a reference
-                    var genericArgs = checker.getTypeArguments(genericType);
-                    var usageArgs = checker.getTypeArguments(usageType);
-                    var types = [];
-                    if (genericArgs && usageArgs) {
-                        for (var i = 0; i < genericArgs.length; i++) {
-                            if (usageArgs[i]) {
-                                types.push.apply(types, inferTypeParameters(genericArgs[i], usageArgs[i], typeParameter));
-                            }
-                        }
-                    }
-                    return types;
-                }
-                var genericSigs = checker.getSignaturesOfType(genericType, 0 /* Call */);
-                var usageSigs = checker.getSignaturesOfType(usageType, 0 /* Call */);
-                if (genericSigs.length === 1 && usageSigs.length === 1) {
-                    return inferFromSignatures(genericSigs[0], usageSigs[0], typeParameter);
-                }
-                return [];
-            }
-            function inferFromSignatures(genericSig, usageSig, typeParameter) {
-                var types = [];
-                for (var i = 0; i < genericSig.parameters.length; i++) {
-                    var genericParam = genericSig.parameters[i];
-                    var usageParam = usageSig.parameters[i];
-                    var isRest = genericSig.declaration && ts.isRestParameter(genericSig.declaration.parameters[i]);
-                    if (!usageParam) {
-                        break;
-                    }
-                    var genericParamType = checker.getTypeOfSymbolAtLocation(genericParam, genericParam.valueDeclaration);
-                    var elementType = isRest && checker.getElementTypeOfArrayType(genericParamType);
-                    if (elementType) {
-                        genericParamType = elementType;
-                    }
-                    var targetType = usageParam.type || checker.getTypeOfSymbolAtLocation(usageParam, usageParam.valueDeclaration);
-                    types.push.apply(types, inferTypeParameters(genericParamType, targetType, typeParameter));
-                }
-                var genericReturn = checker.getReturnTypeOfSignature(genericSig);
-                var usageReturn = checker.getReturnTypeOfSignature(usageSig);
-                types.push.apply(types, inferTypeParameters(genericReturn, usageReturn, typeParameter));
-                return types;
-            }
-            function getFunctionFromCalls(calls) {
-                return checker.createAnonymousType(/*symbol*/ undefined, ts.createSymbolTable(), [getSignatureFromCalls(calls)], ts.emptyArray, /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined);
-            }
-            function getSignatureFromCalls(calls) {
-                var parameters = [];
-                var length = Math.max.apply(Math, calls.map(function (c) { return c.argumentTypes.length; }));
-                var _loop_12 = function (i) {
-                    var symbol = checker.createSymbol(1 /* FunctionScopedVariable */, ts.escapeLeadingUnderscores("arg" + i));
-                    symbol.type = combineTypes(calls.map(function (call) { return call.argumentTypes[i] || checker.getUndefinedType(); }));
-                    if (calls.some(function (call) { return call.argumentTypes[i] === undefined; })) {
-                        symbol.flags |= 16777216 /* Optional */;
-                    }
-                    parameters.push(symbol);
-                };
-                for (var i = 0; i < length; i++) {
-                    _loop_12(i);
-                }
-                var returnType = combineFromUsage(combineUsages(calls.map(function (call) { return call.return_; })));
-                // TODO: GH#18217
-                return checker.createSignature(/*declaration*/ undefined, /*typeParameters*/ undefined, /*thisParameter*/ undefined, parameters, returnType, /*typePredicate*/ undefined, length, 0 /* None */);
-            }
-            function addCandidateType(usage, type) {
-                if (type && !(type.flags & 1 /* Any */) && !(type.flags & 131072 /* Never */)) {
-                    (usage.candidateTypes || (usage.candidateTypes = [])).push(type);
-                }
-            }
-            function addCandidateThisType(usage, type) {
-                if (type && !(type.flags & 1 /* Any */) && !(type.flags & 131072 /* Never */)) {
-                    (usage.candidateThisTypes || (usage.candidateThisTypes = [])).push(type);
-                }
-            }
-        }
-    })(codefix = ts.codefix || (ts.codefix = {}));
-})(ts || (ts = {}));
-/* @internal */
-var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -128412,7 +127730,7 @@ var ts;
             }
             // add the async keyword
             changes.insertLastModifierBefore(sourceFile, 126 /* AsyncKeyword */, functionToConvert);
-            var _loop_13 = function (returnStatement) {
+            var _loop_12 = function (returnStatement) {
                 ts.forEachChild(returnStatement, function visit(node) {
                     if (ts.isCallExpression(node)) {
                         var newNodes = transformExpression(node, transformer);
@@ -128425,7 +127743,7 @@ var ts;
             };
             for (var _i = 0, returnStatements_1 = returnStatements; _i < returnStatements_1.length; _i++) {
                 var returnStatement = returnStatements_1[_i];
-                _loop_13(returnStatement);
+                _loop_12(returnStatement);
             }
         }
         function getReturnStatementsWithPromiseHandlers(body) {
@@ -129404,6 +128722,54 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var errorCodes = [ts.Diagnostics.This_import_is_never_used_as_a_value_and_must_use_import_type_because_the_importsNotUsedAsValues_is_set_to_error.code];
+        var fixId = "convertToTypeOnlyImport";
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) {
+                    var importDeclaration = getImportDeclarationForDiagnosticSpan(context.span, context.sourceFile);
+                    fixSingleImportDeclaration(t, importDeclaration, context);
+                });
+                if (changes.length) {
+                    return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Convert_to_type_only_import, fixId, ts.Diagnostics.Convert_all_imports_not_used_as_a_value_to_type_only_imports)];
+                }
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                    var importDeclaration = getImportDeclarationForDiagnosticSpan(diag, context.sourceFile);
+                    fixSingleImportDeclaration(changes, importDeclaration, context);
+                });
+            }
+        });
+        function getImportDeclarationForDiagnosticSpan(span, sourceFile) {
+            return ts.tryCast(ts.getTokenAtPosition(sourceFile, span.start).parent, ts.isImportDeclaration);
+        }
+        function fixSingleImportDeclaration(changes, importDeclaration, context) {
+            if (!(importDeclaration === null || importDeclaration === void 0 ? void 0 : importDeclaration.importClause)) {
+                return;
+            }
+            var importClause = importDeclaration.importClause;
+            // `changes.insertModifierBefore` produces a range that might overlap further changes
+            changes.insertText(context.sourceFile, importDeclaration.getStart() + "import".length, " type");
+            // `import type foo, { Bar }` is not allowed, so move `foo` to new declaration
+            if (importClause.name && importClause.namedBindings) {
+                changes.deleteNodeRangeExcludingEnd(context.sourceFile, importClause.name, importDeclaration.importClause.namedBindings);
+                changes.insertNodeBefore(context.sourceFile, importDeclaration, ts.updateImportDeclaration(importDeclaration, 
+                /*decorators*/ undefined, 
+                /*modifiers*/ undefined, ts.createImportClause(importClause.name, 
+                /*namedBindings*/ undefined, 
+                /*isTypeOnly*/ true), importDeclaration.moduleSpecifier));
+            }
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -129793,7 +129159,7 @@ var ts;
             var allowsImportingSpecifier = createAutoImportFilter(sourceFile, program, host).allowsImportingSpecifier;
             var choicesForEachExportingModule = ts.flatMap(moduleSymbols, function (_a) {
                 var moduleSymbol = _a.moduleSymbol, importKind = _a.importKind, exportedSymbolIsTypeOnly = _a.exportedSymbolIsTypeOnly;
-                return ts.moduleSpecifiers.getModuleSpecifiers(moduleSymbol, compilerOptions, sourceFile, host, program.getSourceFiles(), preferences, program.redirectTargetsMap)
+                return ts.moduleSpecifiers.getModuleSpecifiers(moduleSymbol, compilerOptions, sourceFile, ts.createModuleSpecifierResolutionHost(program, host), preferences)
                     .map(function (moduleSpecifier) {
                     // `position` should only be undefined at a missing jsx namespace, in which case we shouldn't be looking for pure types.
                     return exportedSymbolIsTypeOnly && isJs
@@ -130143,12 +129509,11 @@ var ts;
         }
         function forEachExternalModuleToImportFrom(program, host, from, filterByPackageJson, cb) {
             var filteredCount = 0;
-            var moduleSpecifierResolutionHost = createModuleSpecifierResolutionHost(program, host);
+            var moduleSpecifierResolutionHost = ts.createModuleSpecifierResolutionHost(program, host);
             var packageJson = filterByPackageJson && createAutoImportFilter(from, program, host, moduleSpecifierResolutionHost);
-            var allSourceFiles = program.getSourceFiles();
-            forEachExternalModule(program.getTypeChecker(), allSourceFiles, function (module, sourceFile) {
+            forEachExternalModule(program.getTypeChecker(), program.getSourceFiles(), function (module, sourceFile) {
                 if (sourceFile === undefined) {
-                    if (!packageJson || packageJson.allowsImportingAmbientModule(module, allSourceFiles)) {
+                    if (!packageJson || packageJson.allowsImportingAmbientModule(module)) {
                         cb(module);
                     }
                     else if (packageJson) {
@@ -130158,7 +129523,7 @@ var ts;
                 else if (sourceFile &&
                     sourceFile !== from &&
                     isImportableFile(program, from, sourceFile, moduleSpecifierResolutionHost)) {
-                    if (!packageJson || packageJson.allowsImportingSourceFile(sourceFile, allSourceFiles)) {
+                    if (!packageJson || packageJson.allowsImportingSourceFile(sourceFile)) {
                         cb(module);
                     }
                     else if (packageJson) {
@@ -130187,7 +129552,7 @@ var ts;
             var _a;
             var getCanonicalFileName = ts.hostGetCanonicalFileName(moduleSpecifierResolutionHost);
             var globalTypingsCache = (_a = moduleSpecifierResolutionHost.getGlobalTypingsCacheLocation) === null || _a === void 0 ? void 0 : _a.call(moduleSpecifierResolutionHost);
-            return !!ts.moduleSpecifiers.forEachFileNameOfModule(program.getSourceFiles(), from.fileName, to.fileName, ts.hostGetCanonicalFileName(moduleSpecifierResolutionHost), moduleSpecifierResolutionHost, program.redirectTargetsMap, 
+            return !!ts.moduleSpecifiers.forEachFileNameOfModule(from.fileName, to.fileName, moduleSpecifierResolutionHost, 
             /*preferSymlinks*/ false, function (toPath) {
                 var toFile = program.getSourceFile(toPath);
                 // Determine to import using toPath only if toPath is what we were looking at
@@ -130239,21 +129604,8 @@ var ts;
             return !ts.isStringANonContextualKeyword(res) ? res || "_" : "_" + res;
         }
         codefix.moduleSpecifierToValidIdentifier = moduleSpecifierToValidIdentifier;
-        function createModuleSpecifierResolutionHost(program, host) {
-            // Mix in `getProbablySymlinks` from Program when host doesn't have it
-            // in order for non-Project hosts to have a symlinks cache.
-            return {
-                directoryExists: ts.maybeBind(host, host.directoryExists),
-                fileExists: ts.maybeBind(host, host.fileExists),
-                getCurrentDirectory: ts.maybeBind(host, host.getCurrentDirectory),
-                readFile: ts.maybeBind(host, host.readFile),
-                useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames),
-                getProbableSymlinks: ts.maybeBind(host, host.getProbableSymlinks) || program.getProbableSymlinks,
-                getGlobalTypingsCacheLocation: ts.maybeBind(host, host.getGlobalTypingsCacheLocation),
-            };
-        }
         function createAutoImportFilter(fromFile, program, host, moduleSpecifierResolutionHost) {
-            if (moduleSpecifierResolutionHost === void 0) { moduleSpecifierResolutionHost = createModuleSpecifierResolutionHost(program, host); }
+            if (moduleSpecifierResolutionHost === void 0) { moduleSpecifierResolutionHost = ts.createModuleSpecifierResolutionHost(program, host); }
             var packageJsons = host.getPackageJsonsVisibleToFile && host.getPackageJsonsVisibleToFile(fromFile.fileName) || ts.getPackageJsonsVisibleToFile(fromFile.fileName, host);
             var dependencyGroups = 1 /* Dependencies */ | 2 /* DevDependencies */ | 8 /* OptionalDependencies */;
             var usesNodeCoreModules;
@@ -130268,12 +129620,12 @@ var ts;
                 }
                 return false;
             }
-            function allowsImportingAmbientModule(moduleSymbol, allSourceFiles) {
+            function allowsImportingAmbientModule(moduleSymbol) {
                 if (!packageJsons.length) {
                     return true;
                 }
                 var declaringSourceFile = moduleSymbol.valueDeclaration.getSourceFile();
-                var declaringNodeModuleName = getNodeModulesPackageNameFromFileName(declaringSourceFile.fileName, allSourceFiles);
+                var declaringNodeModuleName = getNodeModulesPackageNameFromFileName(declaringSourceFile.fileName);
                 if (typeof declaringNodeModuleName === "undefined") {
                     return true;
                 }
@@ -130284,11 +129636,11 @@ var ts;
                 return moduleSpecifierIsCoveredByPackageJson(declaringNodeModuleName)
                     || moduleSpecifierIsCoveredByPackageJson(declaredModuleSpecifier);
             }
-            function allowsImportingSourceFile(sourceFile, allSourceFiles) {
+            function allowsImportingSourceFile(sourceFile) {
                 if (!packageJsons.length) {
                     return true;
                 }
-                var moduleSpecifier = getNodeModulesPackageNameFromFileName(sourceFile.fileName, allSourceFiles);
+                var moduleSpecifier = getNodeModulesPackageNameFromFileName(sourceFile.fileName);
                 if (!moduleSpecifier) {
                     return true;
                 }
@@ -130323,11 +129675,11 @@ var ts;
                 }
                 return false;
             }
-            function getNodeModulesPackageNameFromFileName(importedFileName, allSourceFiles) {
+            function getNodeModulesPackageNameFromFileName(importedFileName) {
                 if (!ts.stringContains(importedFileName, "node_modules")) {
                     return undefined;
                 }
-                var specifier = ts.moduleSpecifiers.getNodeModulesPackageName(host.getCompilationSettings(), fromFile.path, importedFileName, moduleSpecifierResolutionHost, allSourceFiles, program.redirectTargetsMap);
+                var specifier = ts.moduleSpecifiers.getNodeModulesPackageName(host.getCompilationSettings(), fromFile.path, importedFileName, moduleSpecifierResolutionHost);
                 if (!specifier) {
                     return undefined;
                 }
@@ -130350,6 +129702,68 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "fixImplicitThis";
+        var errorCodes = [ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, program = context.program, span = context.span;
+                var diagnostic;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) {
+                    diagnostic = doChange(t, sourceFile, span.start, program.getTypeChecker());
+                });
+                return diagnostic ? [codefix.createCodeFixAction(fixId, changes, diagnostic, fixId, ts.Diagnostics.Fix_all_implicit_this_errors)] : ts.emptyArray;
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                doChange(changes, diag.file, diag.start, context.program.getTypeChecker());
+            }); },
+        });
+        function doChange(changes, sourceFile, pos, checker) {
+            var token = ts.getTokenAtPosition(sourceFile, pos);
+            ts.Debug.assert(token.kind === 104 /* ThisKeyword */);
+            var fn = ts.getThisContainer(token, /*includeArrowFunctions*/ false);
+            if (!ts.isFunctionDeclaration(fn) && !ts.isFunctionExpression(fn))
+                return undefined;
+            if (!ts.isSourceFile(ts.getThisContainer(fn, /*includeArrowFunctions*/ false))) { // 'this' is defined outside, convert to arrow function
+                var fnKeyword = ts.Debug.assertDefined(ts.findChildOfKind(fn, 94 /* FunctionKeyword */, sourceFile));
+                var name = fn.name;
+                var body = ts.Debug.assertDefined(fn.body); // Should be defined because the function contained a 'this' expression
+                if (ts.isFunctionExpression(fn)) {
+                    if (name && ts.FindAllReferences.Core.isSymbolReferencedInFile(name, checker, sourceFile, body)) {
+                        // Function expression references itself. To fix we would have to extract it to a const.
+                        return undefined;
+                    }
+                    // `function() {}` --> `() => {}`
+                    changes.delete(sourceFile, fnKeyword);
+                    if (name) {
+                        changes.delete(sourceFile, name);
+                    }
+                    changes.insertText(sourceFile, body.pos, " =>");
+                    return [ts.Diagnostics.Convert_function_expression_0_to_arrow_function, name ? name.text : ts.ANONYMOUS];
+                }
+                else {
+                    // `function f() {}` => `const f = () => {}`
+                    // `name` should be defined because we only do this in inner contexts, and name is only undefined for `export default function() {}`.
+                    changes.replaceNode(sourceFile, fnKeyword, ts.createToken(81 /* ConstKeyword */));
+                    changes.insertText(sourceFile, name.end, " = ");
+                    changes.insertText(sourceFile, body.pos, " =>");
+                    return [ts.Diagnostics.Convert_function_declaration_0_to_arrow_function, name.text];
+                }
+            }
+            // No outer 'this', add a @class tag if in a JS constructor function
+            else if (ts.isSourceFileJS(sourceFile) && ts.isPropertyAccessExpression(token.parent) && ts.isAssignmentExpression(token.parent.parent)) {
+                codefix.addJSDocTags(changes, sourceFile, fn, [ts.createJSDocClassTag()]);
+                return ts.Diagnostics.Add_class_tag;
+            }
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -130508,7 +129922,7 @@ var ts;
                     });
                     typeDeclToMembers.forEach(function (infos, classDeclaration) {
                         var supers = getAllSupers(classDeclaration, checker);
-                        var _loop_14 = function (info) {
+                        var _loop_13 = function (info) {
                             // If some superclass added this property, don't add it again.
                             if (supers.some(function (superClassOrInterface) {
                                 var superInfos = typeDeclToMembers.get(superClassOrInterface);
@@ -130535,7 +129949,7 @@ var ts;
                         };
                         for (var _i = 0, infos_1 = infos; _i < infos_1.length; _i++) {
                             var info = infos_1[_i];
-                            _loop_14(info);
+                            _loop_13(info);
                         }
                     });
                 }));
@@ -131202,21 +130616,27 @@ var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
-        var fixIdHtmlEntity = "invalidJsxCharactersConvertToHtmlEntity";
-        var fixIdExpression = "invalidJsxCharactersConvertToExpression";
-        var errorCodes = [ts.Diagnostics.Unexpected_token_Did_you_mean_or_gt.code, ts.Diagnostics.Unexpected_token_Did_you_mean_or_rbrace.code];
+        var fixIdExpression = "fixInvalidJsxCharacters_expression";
+        var fixIdHtmlEntity = "fixInvalidJsxCharacters_htmlEntity";
+        var errorCodes = [
+            ts.Diagnostics.Unexpected_token_Did_you_mean_or_gt.code,
+            ts.Diagnostics.Unexpected_token_Did_you_mean_or_rbrace.code
+        ];
         codefix.registerCodeFix({
             errorCodes: errorCodes,
+            fixIds: [fixIdExpression, fixIdHtmlEntity],
             getCodeActions: function (context) {
-                var sourceFile = context.sourceFile, span = context.span;
-                var changeToExpression = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, span.start, /* useHtmlEntity */ false); });
-                var changeToHtmlEntity = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, span.start, /* useHtmlEntity */ true); });
+                var sourceFile = context.sourceFile, preferences = context.preferences, span = context.span;
+                var changeToExpression = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, preferences, sourceFile, span.start, /* useHtmlEntity */ false); });
+                var changeToHtmlEntity = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, preferences, sourceFile, span.start, /* useHtmlEntity */ true); });
                 return [
-                    codefix.createCodeFixActionWithoutFixAll(fixIdExpression, changeToExpression, ts.Diagnostics.Wrap_invalid_character_in_an_expression_container),
-                    codefix.createCodeFixAction(fixIdHtmlEntity, changeToHtmlEntity, ts.Diagnostics.Convert_invalid_character_to_its_html_entity_code, fixIdHtmlEntity, ts.Diagnostics.Convert_invalid_character_to_its_html_entity_code),
+                    codefix.createCodeFixAction(fixIdExpression, changeToExpression, ts.Diagnostics.Wrap_invalid_character_in_an_expression_container, fixIdExpression, ts.Diagnostics.Wrap_all_invalid_characters_in_an_expression_container),
+                    codefix.createCodeFixAction(fixIdHtmlEntity, changeToHtmlEntity, ts.Diagnostics.Convert_invalid_character_to_its_html_entity_code, fixIdHtmlEntity, ts.Diagnostics.Convert_all_invalid_characters_to_HTML_entity_code)
                 ];
             },
-            fixIds: [fixIdExpression, fixIdHtmlEntity],
+            getAllCodeActions: function (context) {
+                return codefix.codeFixAll(context, errorCodes, function (changes, diagnostic) { return doChange(changes, context.preferences, diagnostic.file, diagnostic.start, context.fixId === fixIdHtmlEntity); });
+            }
         });
         var htmlEntity = {
             ">": "&gt;",
@@ -131225,15 +130645,13 @@ var ts;
         function isValidCharacter(character) {
             return ts.hasProperty(htmlEntity, character);
         }
-        function doChange(changes, sourceFile, start, useHtmlEntity) {
+        function doChange(changes, preferences, sourceFile, start, useHtmlEntity) {
             var character = sourceFile.getText()[start];
             // sanity check
             if (!isValidCharacter(character)) {
                 return;
             }
-            var replacement = useHtmlEntity
-                ? htmlEntity[character]
-                : "{'" + character + "'}";
+            var replacement = useHtmlEntity ? htmlEntity[character] : "{" + ts.quote(character, preferences) + "}";
             changes.replaceRangeWithText(sourceFile, { pos: start, end: start + 1 }, replacement);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
@@ -131786,6 +131204,989 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "inferFromUsage";
+        var errorCodes = [
+            // Variable declarations
+            ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code,
+            // Variable uses
+            ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code,
+            // Parameter declarations
+            ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code,
+            ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code,
+            // Get Accessor declarations
+            ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code,
+            ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code,
+            // Set Accessor declarations
+            ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code,
+            // Property declarations
+            ts.Diagnostics.Member_0_implicitly_has_an_1_type.code,
+            //// Suggestions
+            // Variable declarations
+            ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage.code,
+            // Variable uses
+            ts.Diagnostics.Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Parameter declarations
+            ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
+            ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Get Accessor declarations
+            ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_get_accessor_may_be_inferred_from_usage.code,
+            ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Set Accessor declarations
+            ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code,
+            // Property declarations
+            ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Function expressions and declarations
+            ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code,
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, program = context.program, start = context.span.start, errorCode = context.errorCode, cancellationToken = context.cancellationToken, host = context.host, preferences = context.preferences;
+                var token = ts.getTokenAtPosition(sourceFile, start);
+                var declaration;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (changes) { declaration = doChange(changes, sourceFile, token, errorCode, program, cancellationToken, /*markSeen*/ ts.returnTrue, host, preferences); });
+                var name = declaration && ts.getNameOfDeclaration(declaration);
+                return !name || changes.length === 0 ? undefined
+                    : [codefix.createCodeFixAction(fixId, changes, [getDiagnostic(errorCode, token), name.getText(sourceFile)], fixId, ts.Diagnostics.Infer_all_types_from_usage)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                var sourceFile = context.sourceFile, program = context.program, cancellationToken = context.cancellationToken, host = context.host, preferences = context.preferences;
+                var markSeen = ts.nodeSeenTracker();
+                return codefix.codeFixAll(context, errorCodes, function (changes, err) {
+                    doChange(changes, sourceFile, ts.getTokenAtPosition(err.file, err.start), err.code, program, cancellationToken, markSeen, host, preferences);
+                });
+            },
+        });
+        function getDiagnostic(errorCode, token) {
+            switch (errorCode) {
+                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code:
+                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.isSetAccessorDeclaration(ts.getContainingFunction(token)) ? ts.Diagnostics.Infer_type_of_0_from_usage : ts.Diagnostics.Infer_parameter_types_from_usage; // TODO: GH#18217
+                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
+                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Infer_parameter_types_from_usage;
+                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
+                    return ts.Diagnostics.Infer_this_type_of_0_from_usage;
+                default:
+                    return ts.Diagnostics.Infer_type_of_0_from_usage;
+            }
+        }
+        /** Map suggestion code to error code */
+        function mapSuggestionDiagnostic(errorCode) {
+            switch (errorCode) {
+                case ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code;
+                case ts.Diagnostics.Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code;
+                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code;
+                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code;
+                case ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_get_accessor_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code;
+                case ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code;
+                case ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code;
+                case ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Member_0_implicitly_has_an_1_type.code;
+            }
+            return errorCode;
+        }
+        function doChange(changes, sourceFile, token, errorCode, program, cancellationToken, markSeen, host, preferences) {
+            if (!ts.isParameterPropertyModifier(token.kind) && token.kind !== 75 /* Identifier */ && token.kind !== 25 /* DotDotDotToken */ && token.kind !== 104 /* ThisKeyword */) {
+                return undefined;
+            }
+            var parent = token.parent;
+            var importAdder = codefix.createImportAdder(sourceFile, program, preferences, host);
+            errorCode = mapSuggestionDiagnostic(errorCode);
+            switch (errorCode) {
+                // Variable and Property declarations
+                case ts.Diagnostics.Member_0_implicitly_has_an_1_type.code:
+                case ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code:
+                    if ((ts.isVariableDeclaration(parent) && markSeen(parent)) || ts.isPropertyDeclaration(parent) || ts.isPropertySignature(parent)) { // handle bad location
+                        annotateVariableDeclaration(changes, importAdder, sourceFile, parent, program, host, cancellationToken);
+                        importAdder.writeFixes(changes);
+                        return parent;
+                    }
+                    if (ts.isPropertyAccessExpression(parent)) {
+                        var type = inferTypeForVariableFromUsage(parent.name, program, cancellationToken);
+                        var typeNode = ts.getTypeNodeIfAccessible(type, parent, program, host);
+                        if (typeNode) {
+                            // Note that the codefix will never fire with an existing `@type` tag, so there is no need to merge tags
+                            var typeTag = ts.createJSDocTypeTag(ts.createJSDocTypeExpression(typeNode), /*comment*/ "");
+                            addJSDocTags(changes, sourceFile, ts.cast(parent.parent.parent, ts.isExpressionStatement), [typeTag]);
+                        }
+                        importAdder.writeFixes(changes);
+                        return parent;
+                    }
+                    return undefined;
+                case ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code: {
+                    var symbol = program.getTypeChecker().getSymbolAtLocation(token);
+                    if (symbol && symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) && markSeen(symbol.valueDeclaration)) {
+                        annotateVariableDeclaration(changes, importAdder, sourceFile, symbol.valueDeclaration, program, host, cancellationToken);
+                        importAdder.writeFixes(changes);
+                        return symbol.valueDeclaration;
+                    }
+                    return undefined;
+                }
+            }
+            var containingFunction = ts.getContainingFunction(token);
+            if (containingFunction === undefined) {
+                return undefined;
+            }
+            var declaration;
+            switch (errorCode) {
+                // Parameter declarations
+                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code:
+                    if (ts.isSetAccessorDeclaration(containingFunction)) {
+                        annotateSetAccessor(changes, importAdder, sourceFile, containingFunction, program, host, cancellationToken);
+                        declaration = containingFunction;
+                        break;
+                    }
+                // falls through
+                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
+                    if (markSeen(containingFunction)) {
+                        var param = ts.cast(parent, ts.isParameter);
+                        annotateParameters(changes, importAdder, sourceFile, param, containingFunction, program, host, cancellationToken);
+                        declaration = param;
+                    }
+                    break;
+                // Get Accessor declarations
+                case ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code:
+                case ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code:
+                    if (ts.isGetAccessorDeclaration(containingFunction) && ts.isIdentifier(containingFunction.name)) {
+                        annotate(changes, importAdder, sourceFile, containingFunction, inferTypeForVariableFromUsage(containingFunction.name, program, cancellationToken), program, host);
+                        declaration = containingFunction;
+                    }
+                    break;
+                // Set Accessor declarations
+                case ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code:
+                    if (ts.isSetAccessorDeclaration(containingFunction)) {
+                        annotateSetAccessor(changes, importAdder, sourceFile, containingFunction, program, host, cancellationToken);
+                        declaration = containingFunction;
+                    }
+                    break;
+                // Function 'this'
+                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
+                    if (ts.textChanges.isThisTypeAnnotatable(containingFunction) && markSeen(containingFunction)) {
+                        annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken);
+                        declaration = containingFunction;
+                    }
+                    break;
+                default:
+                    return ts.Debug.fail(String(errorCode));
+            }
+            importAdder.writeFixes(changes);
+            return declaration;
+        }
+        function annotateVariableDeclaration(changes, importAdder, sourceFile, declaration, program, host, cancellationToken) {
+            if (ts.isIdentifier(declaration.name)) {
+                annotate(changes, importAdder, sourceFile, declaration, inferTypeForVariableFromUsage(declaration.name, program, cancellationToken), program, host);
+            }
+        }
+        function annotateParameters(changes, importAdder, sourceFile, parameterDeclaration, containingFunction, program, host, cancellationToken) {
+            if (!ts.isIdentifier(parameterDeclaration.name)) {
+                return;
+            }
+            var parameterInferences = inferTypeForParametersFromUsage(containingFunction, sourceFile, program, cancellationToken);
+            ts.Debug.assert(containingFunction.parameters.length === parameterInferences.length, "Parameter count and inference count should match");
+            if (ts.isInJSFile(containingFunction)) {
+                annotateJSDocParameters(changes, sourceFile, parameterInferences, program, host);
+            }
+            else {
+                var needParens = ts.isArrowFunction(containingFunction) && !ts.findChildOfKind(containingFunction, 20 /* OpenParenToken */, sourceFile);
+                if (needParens)
+                    changes.insertNodeBefore(sourceFile, ts.first(containingFunction.parameters), ts.createToken(20 /* OpenParenToken */));
+                for (var _i = 0, parameterInferences_1 = parameterInferences; _i < parameterInferences_1.length; _i++) {
+                    var _a = parameterInferences_1[_i], declaration = _a.declaration, type = _a.type;
+                    if (declaration && !declaration.type && !declaration.initializer) {
+                        annotate(changes, importAdder, sourceFile, declaration, type, program, host);
+                    }
+                }
+                if (needParens)
+                    changes.insertNodeAfter(sourceFile, ts.last(containingFunction.parameters), ts.createToken(21 /* CloseParenToken */));
+            }
+        }
+        function annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken) {
+            var references = getFunctionReferences(containingFunction, sourceFile, program, cancellationToken);
+            if (!references || !references.length) {
+                return;
+            }
+            var thisInference = inferTypeFromReferences(program, references, cancellationToken).thisParameter();
+            var typeNode = ts.getTypeNodeIfAccessible(thisInference, containingFunction, program, host);
+            if (!typeNode) {
+                return;
+            }
+            if (ts.isInJSFile(containingFunction)) {
+                annotateJSDocThis(changes, sourceFile, containingFunction, typeNode);
+            }
+            else {
+                changes.tryInsertThisTypeAnnotation(sourceFile, containingFunction, typeNode);
+            }
+        }
+        function annotateJSDocThis(changes, sourceFile, containingFunction, typeNode) {
+            addJSDocTags(changes, sourceFile, containingFunction, [
+                ts.createJSDocThisTag(ts.createJSDocTypeExpression(typeNode)),
+            ]);
+        }
+        function annotateSetAccessor(changes, importAdder, sourceFile, setAccessorDeclaration, program, host, cancellationToken) {
+            var param = ts.firstOrUndefined(setAccessorDeclaration.parameters);
+            if (param && ts.isIdentifier(setAccessorDeclaration.name) && ts.isIdentifier(param.name)) {
+                var type = inferTypeForVariableFromUsage(setAccessorDeclaration.name, program, cancellationToken);
+                if (type === program.getTypeChecker().getAnyType()) {
+                    type = inferTypeForVariableFromUsage(param.name, program, cancellationToken);
+                }
+                if (ts.isInJSFile(setAccessorDeclaration)) {
+                    annotateJSDocParameters(changes, sourceFile, [{ declaration: param, type: type }], program, host);
+                }
+                else {
+                    annotate(changes, importAdder, sourceFile, param, type, program, host);
+                }
+            }
+        }
+        function annotate(changes, importAdder, sourceFile, declaration, type, program, host) {
+            var typeNode = ts.getTypeNodeIfAccessible(type, declaration, program, host);
+            if (typeNode) {
+                if (ts.isInJSFile(sourceFile) && declaration.kind !== 159 /* PropertySignature */) {
+                    var parent = ts.isVariableDeclaration(declaration) ? ts.tryCast(declaration.parent.parent, ts.isVariableStatement) : declaration;
+                    if (!parent) {
+                        return;
+                    }
+                    var typeExpression = ts.createJSDocTypeExpression(typeNode);
+                    var typeTag = ts.isGetAccessorDeclaration(declaration) ? ts.createJSDocReturnTag(typeExpression, "") : ts.createJSDocTypeTag(typeExpression, "");
+                    addJSDocTags(changes, sourceFile, parent, [typeTag]);
+                }
+                else if (!tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, type, sourceFile, changes, importAdder, ts.getEmitScriptTarget(program.getCompilerOptions()))) {
+                    changes.tryInsertTypeAnnotation(sourceFile, declaration, typeNode);
+                }
+            }
+        }
+        function tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, type, sourceFile, changes, importAdder, scriptTarget) {
+            var importableReference = codefix.tryGetAutoImportableReferenceFromImportTypeNode(typeNode, type, scriptTarget);
+            if (importableReference && changes.tryInsertTypeAnnotation(sourceFile, declaration, importableReference.typeReference)) {
+                ts.forEach(importableReference.symbols, function (s) { return importAdder.addImportFromExportedSymbol(s, /*usageIsTypeOnly*/ true); });
+                return true;
+            }
+            return false;
+        }
+        function annotateJSDocParameters(changes, sourceFile, parameterInferences, program, host) {
+            var signature = parameterInferences.length && parameterInferences[0].declaration.parent;
+            if (!signature) {
+                return;
+            }
+            var paramTags = ts.mapDefined(parameterInferences, function (inference) {
+                var param = inference.declaration;
+                // only infer parameters that have (1) no type and (2) an accessible inferred type
+                if (param.initializer || ts.getJSDocType(param) || !ts.isIdentifier(param.name))
+                    return;
+                var typeNode = inference.type && ts.getTypeNodeIfAccessible(inference.type, param, program, host);
+                var name = ts.getSynthesizedClone(param.name);
+                ts.setEmitFlags(name, 1536 /* NoComments */ | 2048 /* NoNestedComments */);
+                return typeNode && ts.createJSDocParamTag(name, !!inference.isOptional, ts.createJSDocTypeExpression(typeNode), "");
+            });
+            addJSDocTags(changes, sourceFile, signature, paramTags);
+        }
+        function addJSDocTags(changes, sourceFile, parent, newTags) {
+            var comments = ts.mapDefined(parent.jsDoc, function (j) { return j.comment; });
+            var oldTags = ts.flatMapToMutable(parent.jsDoc, function (j) { return j.tags; });
+            var unmergedNewTags = newTags.filter(function (newTag) { return !oldTags || !oldTags.some(function (tag, i) {
+                var merged = tryMergeJsdocTags(tag, newTag);
+                if (merged)
+                    oldTags[i] = merged;
+                return !!merged;
+            }); });
+            var tag = ts.createJSDocComment(comments.join("\n"), ts.createNodeArray(__spreadArrays((oldTags || ts.emptyArray), unmergedNewTags)));
+            var jsDocNode = parent.kind === 203 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
+            jsDocNode.jsDoc = parent.jsDoc;
+            jsDocNode.jsDocCache = parent.jsDocCache;
+            changes.insertJsdocCommentBefore(sourceFile, jsDocNode, tag);
+        }
+        codefix.addJSDocTags = addJSDocTags;
+        function getJsDocNodeForArrowFunction(signature) {
+            if (signature.parent.kind === 160 /* PropertyDeclaration */) {
+                return signature.parent;
+            }
+            return signature.parent.parent;
+        }
+        function tryMergeJsdocTags(oldTag, newTag) {
+            if (oldTag.kind !== newTag.kind) {
+                return undefined;
+            }
+            switch (oldTag.kind) {
+                case 318 /* JSDocParameterTag */: {
+                    var oldParam = oldTag;
+                    var newParam = newTag;
+                    return ts.isIdentifier(oldParam.name) && ts.isIdentifier(newParam.name) && oldParam.name.escapedText === newParam.name.escapedText
+                        ? ts.createJSDocParamTag(newParam.name, newParam.isBracketed, newParam.typeExpression, oldParam.comment)
+                        : undefined;
+                }
+                case 319 /* JSDocReturnTag */:
+                    return ts.createJSDocReturnTag(newTag.typeExpression, oldTag.comment);
+            }
+        }
+        function getReferences(token, program, cancellationToken) {
+            // Position shouldn't matter since token is not a SourceFile.
+            return ts.mapDefined(ts.FindAllReferences.getReferenceEntriesForNode(-1, token, program, program.getSourceFiles(), cancellationToken), function (entry) {
+                return entry.kind !== 0 /* Span */ ? ts.tryCast(entry.node, ts.isIdentifier) : undefined;
+            });
+        }
+        function inferTypeForVariableFromUsage(token, program, cancellationToken) {
+            var references = getReferences(token, program, cancellationToken);
+            return inferTypeFromReferences(program, references, cancellationToken).single();
+        }
+        function inferTypeForParametersFromUsage(func, sourceFile, program, cancellationToken) {
+            var references = getFunctionReferences(func, sourceFile, program, cancellationToken);
+            return references && inferTypeFromReferences(program, references, cancellationToken).parameters(func) ||
+                func.parameters.map(function (p) { return ({
+                    declaration: p,
+                    type: ts.isIdentifier(p.name) ? inferTypeForVariableFromUsage(p.name, program, cancellationToken) : program.getTypeChecker().getAnyType()
+                }); });
+        }
+        function getFunctionReferences(containingFunction, sourceFile, program, cancellationToken) {
+            var searchToken;
+            switch (containingFunction.kind) {
+                case 163 /* Constructor */:
+                    searchToken = ts.findChildOfKind(containingFunction, 130 /* ConstructorKeyword */, sourceFile);
+                    break;
+                case 203 /* ArrowFunction */:
+                case 202 /* FunctionExpression */:
+                    var parent = containingFunction.parent;
+                    searchToken = ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name) ?
+                        parent.name :
+                        containingFunction.name;
+                    break;
+                case 245 /* FunctionDeclaration */:
+                case 162 /* MethodDeclaration */:
+                    searchToken = containingFunction.name;
+                    break;
+            }
+            if (!searchToken) {
+                return undefined;
+            }
+            return getReferences(searchToken, program, cancellationToken);
+        }
+        function inferTypeFromReferences(program, references, cancellationToken) {
+            var checker = program.getTypeChecker();
+            var builtinConstructors = {
+                string: function () { return checker.getStringType(); },
+                number: function () { return checker.getNumberType(); },
+                Array: function (t) { return checker.createArrayType(t); },
+                Promise: function (t) { return checker.createPromiseType(t); },
+            };
+            var builtins = [
+                checker.getStringType(),
+                checker.getNumberType(),
+                checker.createArrayType(checker.getAnyType()),
+                checker.createPromiseType(checker.getAnyType()),
+            ];
+            return {
+                single: single,
+                parameters: parameters,
+                thisParameter: thisParameter,
+            };
+            function createEmptyUsage() {
+                return {
+                    isNumber: undefined,
+                    isString: undefined,
+                    isNumberOrString: undefined,
+                    candidateTypes: undefined,
+                    properties: undefined,
+                    calls: undefined,
+                    constructs: undefined,
+                    numberIndex: undefined,
+                    stringIndex: undefined,
+                    candidateThisTypes: undefined,
+                    inferredTypes: undefined,
+                };
+            }
+            function combineUsages(usages) {
+                var combinedProperties = ts.createUnderscoreEscapedMap();
+                for (var _i = 0, usages_1 = usages; _i < usages_1.length; _i++) {
+                    var u = usages_1[_i];
+                    if (u.properties) {
+                        u.properties.forEach(function (p, name) {
+                            if (!combinedProperties.has(name)) {
+                                combinedProperties.set(name, []);
+                            }
+                            combinedProperties.get(name).push(p);
+                        });
+                    }
+                }
+                var properties = ts.createUnderscoreEscapedMap();
+                combinedProperties.forEach(function (ps, name) {
+                    properties.set(name, combineUsages(ps));
+                });
+                return {
+                    isNumber: usages.some(function (u) { return u.isNumber; }),
+                    isString: usages.some(function (u) { return u.isString; }),
+                    isNumberOrString: usages.some(function (u) { return u.isNumberOrString; }),
+                    candidateTypes: ts.flatMap(usages, function (u) { return u.candidateTypes; }),
+                    properties: properties,
+                    calls: ts.flatMap(usages, function (u) { return u.calls; }),
+                    constructs: ts.flatMap(usages, function (u) { return u.constructs; }),
+                    numberIndex: ts.forEach(usages, function (u) { return u.numberIndex; }),
+                    stringIndex: ts.forEach(usages, function (u) { return u.stringIndex; }),
+                    candidateThisTypes: ts.flatMap(usages, function (u) { return u.candidateThisTypes; }),
+                    inferredTypes: undefined,
+                };
+            }
+            function single() {
+                return combineTypes(inferTypesFromReferencesSingle(references));
+            }
+            function parameters(declaration) {
+                if (references.length === 0 || !declaration.parameters) {
+                    return undefined;
+                }
+                var usage = createEmptyUsage();
+                for (var _i = 0, references_2 = references; _i < references_2.length; _i++) {
+                    var reference = references_2[_i];
+                    cancellationToken.throwIfCancellationRequested();
+                    calculateUsageOfNode(reference, usage);
+                }
+                var calls = __spreadArrays(usage.constructs || [], usage.calls || []);
+                return declaration.parameters.map(function (parameter, parameterIndex) {
+                    var types = [];
+                    var isRest = ts.isRestParameter(parameter);
+                    var isOptional = false;
+                    for (var _i = 0, calls_1 = calls; _i < calls_1.length; _i++) {
+                        var call = calls_1[_i];
+                        if (call.argumentTypes.length <= parameterIndex) {
+                            isOptional = ts.isInJSFile(declaration);
+                            types.push(checker.getUndefinedType());
+                        }
+                        else if (isRest) {
+                            for (var i = parameterIndex; i < call.argumentTypes.length; i++) {
+                                types.push(checker.getBaseTypeOfLiteralType(call.argumentTypes[i]));
+                            }
+                        }
+                        else {
+                            types.push(checker.getBaseTypeOfLiteralType(call.argumentTypes[parameterIndex]));
+                        }
+                    }
+                    if (ts.isIdentifier(parameter.name)) {
+                        var inferred = inferTypesFromReferencesSingle(getReferences(parameter.name, program, cancellationToken));
+                        types.push.apply(types, (isRest ? ts.mapDefined(inferred, checker.getElementTypeOfArrayType) : inferred));
+                    }
+                    var type = combineTypes(types);
+                    return {
+                        type: isRest ? checker.createArrayType(type) : type,
+                        isOptional: isOptional && !isRest,
+                        declaration: parameter
+                    };
+                });
+            }
+            function thisParameter() {
+                var usage = createEmptyUsage();
+                for (var _i = 0, references_3 = references; _i < references_3.length; _i++) {
+                    var reference = references_3[_i];
+                    cancellationToken.throwIfCancellationRequested();
+                    calculateUsageOfNode(reference, usage);
+                }
+                return combineTypes(usage.candidateThisTypes || ts.emptyArray);
+            }
+            function inferTypesFromReferencesSingle(references) {
+                var usage = createEmptyUsage();
+                for (var _i = 0, references_4 = references; _i < references_4.length; _i++) {
+                    var reference = references_4[_i];
+                    cancellationToken.throwIfCancellationRequested();
+                    calculateUsageOfNode(reference, usage);
+                }
+                return inferTypes(usage);
+            }
+            function calculateUsageOfNode(node, usage) {
+                while (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
+                    node = node.parent;
+                }
+                switch (node.parent.kind) {
+                    case 227 /* ExpressionStatement */:
+                        addCandidateType(usage, checker.getVoidType());
+                        break;
+                    case 209 /* PostfixUnaryExpression */:
+                        usage.isNumber = true;
+                        break;
+                    case 208 /* PrefixUnaryExpression */:
+                        inferTypeFromPrefixUnaryExpression(node.parent, usage);
+                        break;
+                    case 210 /* BinaryExpression */:
+                        inferTypeFromBinaryExpression(node, node.parent, usage);
+                        break;
+                    case 278 /* CaseClause */:
+                    case 279 /* DefaultClause */:
+                        inferTypeFromSwitchStatementLabel(node.parent, usage);
+                        break;
+                    case 197 /* CallExpression */:
+                    case 198 /* NewExpression */:
+                        if (node.parent.expression === node) {
+                            inferTypeFromCallExpression(node.parent, usage);
+                        }
+                        else {
+                            inferTypeFromContextualType(node, usage);
+                        }
+                        break;
+                    case 195 /* PropertyAccessExpression */:
+                        inferTypeFromPropertyAccessExpression(node.parent, usage);
+                        break;
+                    case 196 /* ElementAccessExpression */:
+                        inferTypeFromPropertyElementExpression(node.parent, node, usage);
+                        break;
+                    case 282 /* PropertyAssignment */:
+                    case 283 /* ShorthandPropertyAssignment */:
+                        inferTypeFromPropertyAssignment(node.parent, usage);
+                        break;
+                    case 160 /* PropertyDeclaration */:
+                        inferTypeFromPropertyDeclaration(node.parent, usage);
+                        break;
+                    case 243 /* VariableDeclaration */: {
+                        var _a = node.parent, name = _a.name, initializer = _a.initializer;
+                        if (node === name) {
+                            if (initializer) { // This can happen for `let x = null;` which still has an implicit-any error.
+                                addCandidateType(usage, checker.getTypeAtLocation(initializer));
+                            }
+                            break;
+                        }
+                    }
+                    // falls through
+                    default:
+                        return inferTypeFromContextualType(node, usage);
+                }
+            }
+            function inferTypeFromContextualType(node, usage) {
+                if (ts.isExpressionNode(node)) {
+                    addCandidateType(usage, checker.getContextualType(node));
+                }
+            }
+            function inferTypeFromPrefixUnaryExpression(node, usage) {
+                switch (node.operator) {
+                    case 45 /* PlusPlusToken */:
+                    case 46 /* MinusMinusToken */:
+                    case 40 /* MinusToken */:
+                    case 54 /* TildeToken */:
+                        usage.isNumber = true;
+                        break;
+                    case 39 /* PlusToken */:
+                        usage.isNumberOrString = true;
+                        break;
+                    // case SyntaxKind.ExclamationToken:
+                    // no inferences here;
+                }
+            }
+            function inferTypeFromBinaryExpression(node, parent, usage) {
+                switch (parent.operatorToken.kind) {
+                    // ExponentiationOperator
+                    case 42 /* AsteriskAsteriskToken */:
+                    // MultiplicativeOperator
+                    // falls through
+                    case 41 /* AsteriskToken */:
+                    case 43 /* SlashToken */:
+                    case 44 /* PercentToken */:
+                    // ShiftOperator
+                    // falls through
+                    case 47 /* LessThanLessThanToken */:
+                    case 48 /* GreaterThanGreaterThanToken */:
+                    case 49 /* GreaterThanGreaterThanGreaterThanToken */:
+                    // BitwiseOperator
+                    // falls through
+                    case 50 /* AmpersandToken */:
+                    case 51 /* BarToken */:
+                    case 52 /* CaretToken */:
+                    // CompoundAssignmentOperator
+                    // falls through
+                    case 64 /* MinusEqualsToken */:
+                    case 66 /* AsteriskAsteriskEqualsToken */:
+                    case 65 /* AsteriskEqualsToken */:
+                    case 67 /* SlashEqualsToken */:
+                    case 68 /* PercentEqualsToken */:
+                    case 72 /* AmpersandEqualsToken */:
+                    case 73 /* BarEqualsToken */:
+                    case 74 /* CaretEqualsToken */:
+                    case 69 /* LessThanLessThanEqualsToken */:
+                    case 71 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 70 /* GreaterThanGreaterThanEqualsToken */:
+                    // AdditiveOperator
+                    // falls through
+                    case 40 /* MinusToken */:
+                    // RelationalOperator
+                    // falls through
+                    case 29 /* LessThanToken */:
+                    case 32 /* LessThanEqualsToken */:
+                    case 31 /* GreaterThanToken */:
+                    case 33 /* GreaterThanEqualsToken */:
+                        var operandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
+                        if (operandType.flags & 1056 /* EnumLike */) {
+                            addCandidateType(usage, operandType);
+                        }
+                        else {
+                            usage.isNumber = true;
+                        }
+                        break;
+                    case 63 /* PlusEqualsToken */:
+                    case 39 /* PlusToken */:
+                        var otherOperandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
+                        if (otherOperandType.flags & 1056 /* EnumLike */) {
+                            addCandidateType(usage, otherOperandType);
+                        }
+                        else if (otherOperandType.flags & 296 /* NumberLike */) {
+                            usage.isNumber = true;
+                        }
+                        else if (otherOperandType.flags & 132 /* StringLike */) {
+                            usage.isString = true;
+                        }
+                        else if (otherOperandType.flags & 1 /* Any */) {
+                            // do nothing, maybe we'll learn something elsewhere
+                        }
+                        else {
+                            usage.isNumberOrString = true;
+                        }
+                        break;
+                    //  AssignmentOperators
+                    case 62 /* EqualsToken */:
+                    case 34 /* EqualsEqualsToken */:
+                    case 36 /* EqualsEqualsEqualsToken */:
+                    case 37 /* ExclamationEqualsEqualsToken */:
+                    case 35 /* ExclamationEqualsToken */:
+                        addCandidateType(usage, checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left));
+                        break;
+                    case 97 /* InKeyword */:
+                        if (node === parent.left) {
+                            usage.isString = true;
+                        }
+                        break;
+                    // LogicalOperator Or NullishCoalescing
+                    case 56 /* BarBarToken */:
+                    case 60 /* QuestionQuestionToken */:
+                        if (node === parent.left &&
+                            (node.parent.parent.kind === 243 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
+                            // var x = x || {};
+                            // TODO: use getFalsyflagsOfType
+                            addCandidateType(usage, checker.getTypeAtLocation(parent.right));
+                        }
+                        break;
+                    case 55 /* AmpersandAmpersandToken */:
+                    case 27 /* CommaToken */:
+                    case 98 /* InstanceOfKeyword */:
+                        // nothing to infer here
+                        break;
+                }
+            }
+            function inferTypeFromSwitchStatementLabel(parent, usage) {
+                addCandidateType(usage, checker.getTypeAtLocation(parent.parent.parent.expression));
+            }
+            function inferTypeFromCallExpression(parent, usage) {
+                var call = {
+                    argumentTypes: [],
+                    return_: createEmptyUsage()
+                };
+                if (parent.arguments) {
+                    for (var _i = 0, _a = parent.arguments; _i < _a.length; _i++) {
+                        var argument = _a[_i];
+                        call.argumentTypes.push(checker.getTypeAtLocation(argument));
+                    }
+                }
+                calculateUsageOfNode(parent, call.return_);
+                if (parent.kind === 197 /* CallExpression */) {
+                    (usage.calls || (usage.calls = [])).push(call);
+                }
+                else {
+                    (usage.constructs || (usage.constructs = [])).push(call);
+                }
+            }
+            function inferTypeFromPropertyAccessExpression(parent, usage) {
+                var name = ts.escapeLeadingUnderscores(parent.name.text);
+                if (!usage.properties) {
+                    usage.properties = ts.createUnderscoreEscapedMap();
+                }
+                var propertyUsage = usage.properties.get(name) || createEmptyUsage();
+                calculateUsageOfNode(parent, propertyUsage);
+                usage.properties.set(name, propertyUsage);
+            }
+            function inferTypeFromPropertyElementExpression(parent, node, usage) {
+                if (node === parent.argumentExpression) {
+                    usage.isNumberOrString = true;
+                    return;
+                }
+                else {
+                    var indexType = checker.getTypeAtLocation(parent.argumentExpression);
+                    var indexUsage = createEmptyUsage();
+                    calculateUsageOfNode(parent, indexUsage);
+                    if (indexType.flags & 296 /* NumberLike */) {
+                        usage.numberIndex = indexUsage;
+                    }
+                    else {
+                        usage.stringIndex = indexUsage;
+                    }
+                }
+            }
+            function inferTypeFromPropertyAssignment(assignment, usage) {
+                var nodeWithRealType = ts.isVariableDeclaration(assignment.parent.parent) ?
+                    assignment.parent.parent :
+                    assignment.parent;
+                addCandidateThisType(usage, checker.getTypeAtLocation(nodeWithRealType));
+            }
+            function inferTypeFromPropertyDeclaration(declaration, usage) {
+                addCandidateThisType(usage, checker.getTypeAtLocation(declaration.parent));
+            }
+            function removeLowPriorityInferences(inferences, priorities) {
+                var toRemove = [];
+                for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
+                    var i = inferences_1[_i];
+                    for (var _a = 0, priorities_1 = priorities; _a < priorities_1.length; _a++) {
+                        var _b = priorities_1[_a], high = _b.high, low = _b.low;
+                        if (high(i)) {
+                            ts.Debug.assert(!low(i), "Priority can't have both low and high");
+                            toRemove.push(low);
+                        }
+                    }
+                }
+                return inferences.filter(function (i) { return toRemove.every(function (f) { return !f(i); }); });
+            }
+            function combineFromUsage(usage) {
+                return combineTypes(inferTypes(usage));
+            }
+            function combineTypes(inferences) {
+                if (!inferences.length)
+                    return checker.getAnyType();
+                // 1. string or number individually override string | number
+                // 2. non-any, non-void overrides any or void
+                // 3. non-nullable, non-any, non-void, non-anonymous overrides anonymous types
+                var stringNumber = checker.getUnionType([checker.getStringType(), checker.getNumberType()]);
+                var priorities = [
+                    {
+                        high: function (t) { return t === checker.getStringType() || t === checker.getNumberType(); },
+                        low: function (t) { return t === stringNumber; }
+                    },
+                    {
+                        high: function (t) { return !(t.flags & (1 /* Any */ | 16384 /* Void */)); },
+                        low: function (t) { return !!(t.flags & (1 /* Any */ | 16384 /* Void */)); }
+                    },
+                    {
+                        high: function (t) { return !(t.flags & (98304 /* Nullable */ | 1 /* Any */ | 16384 /* Void */)) && !(ts.getObjectFlags(t) & 16 /* Anonymous */); },
+                        low: function (t) { return !!(ts.getObjectFlags(t) & 16 /* Anonymous */); }
+                    }
+                ];
+                var good = removeLowPriorityInferences(inferences, priorities);
+                var anons = good.filter(function (i) { return ts.getObjectFlags(i) & 16 /* Anonymous */; });
+                if (anons.length) {
+                    good = good.filter(function (i) { return !(ts.getObjectFlags(i) & 16 /* Anonymous */); });
+                    good.push(combineAnonymousTypes(anons));
+                }
+                return checker.getWidenedType(checker.getUnionType(good.map(checker.getBaseTypeOfLiteralType), 2 /* Subtype */));
+            }
+            function combineAnonymousTypes(anons) {
+                if (anons.length === 1) {
+                    return anons[0];
+                }
+                var calls = [];
+                var constructs = [];
+                var stringIndices = [];
+                var numberIndices = [];
+                var stringIndexReadonly = false;
+                var numberIndexReadonly = false;
+                var props = ts.createMultiMap();
+                for (var _i = 0, anons_1 = anons; _i < anons_1.length; _i++) {
+                    var anon = anons_1[_i];
+                    for (var _a = 0, _b = checker.getPropertiesOfType(anon); _a < _b.length; _a++) {
+                        var p = _b[_a];
+                        props.add(p.name, checker.getTypeOfSymbolAtLocation(p, p.valueDeclaration));
+                    }
+                    calls.push.apply(calls, checker.getSignaturesOfType(anon, 0 /* Call */));
+                    constructs.push.apply(constructs, checker.getSignaturesOfType(anon, 1 /* Construct */));
+                    if (anon.stringIndexInfo) {
+                        stringIndices.push(anon.stringIndexInfo.type);
+                        stringIndexReadonly = stringIndexReadonly || anon.stringIndexInfo.isReadonly;
+                    }
+                    if (anon.numberIndexInfo) {
+                        numberIndices.push(anon.numberIndexInfo.type);
+                        numberIndexReadonly = numberIndexReadonly || anon.numberIndexInfo.isReadonly;
+                    }
+                }
+                var members = ts.mapEntries(props, function (name, types) {
+                    var isOptional = types.length < anons.length ? 16777216 /* Optional */ : 0;
+                    var s = checker.createSymbol(4 /* Property */ | isOptional, name);
+                    s.type = checker.getUnionType(types);
+                    return [name, s];
+                });
+                return checker.createAnonymousType(anons[0].symbol, members, calls, constructs, stringIndices.length ? checker.createIndexInfo(checker.getUnionType(stringIndices), stringIndexReadonly) : undefined, numberIndices.length ? checker.createIndexInfo(checker.getUnionType(numberIndices), numberIndexReadonly) : undefined);
+            }
+            function inferTypes(usage) {
+                var types = [];
+                if (usage.isNumber) {
+                    types.push(checker.getNumberType());
+                }
+                if (usage.isString) {
+                    types.push(checker.getStringType());
+                }
+                if (usage.isNumberOrString) {
+                    types.push(checker.getUnionType([checker.getStringType(), checker.getNumberType()]));
+                }
+                if (usage.numberIndex) {
+                    types.push(checker.createArrayType(combineFromUsage(usage.numberIndex)));
+                }
+                if (usage.properties && usage.properties.size
+                    || usage.calls && usage.calls.length
+                    || usage.constructs && usage.constructs.length
+                    || usage.stringIndex) {
+                    types.push(inferStructuralType(usage));
+                }
+                types.push.apply(types, (usage.candidateTypes || []).map(function (t) { return checker.getBaseTypeOfLiteralType(t); }));
+                types.push.apply(types, inferNamedTypesFromProperties(usage));
+                return types;
+            }
+            function inferStructuralType(usage) {
+                var members = ts.createUnderscoreEscapedMap();
+                if (usage.properties) {
+                    usage.properties.forEach(function (u, name) {
+                        var symbol = checker.createSymbol(4 /* Property */, name);
+                        symbol.type = combineFromUsage(u);
+                        members.set(name, symbol);
+                    });
+                }
+                var callSignatures = usage.calls ? [getSignatureFromCalls(usage.calls)] : [];
+                var constructSignatures = usage.constructs ? [getSignatureFromCalls(usage.constructs)] : [];
+                var stringIndexInfo = usage.stringIndex && checker.createIndexInfo(combineFromUsage(usage.stringIndex), /*isReadonly*/ false);
+                return checker.createAnonymousType(/*symbol*/ undefined, members, callSignatures, constructSignatures, stringIndexInfo, /*numberIndexInfo*/ undefined);
+            }
+            function inferNamedTypesFromProperties(usage) {
+                if (!usage.properties || !usage.properties.size)
+                    return [];
+                var types = builtins.filter(function (t) { return allPropertiesAreAssignableToUsage(t, usage); });
+                if (0 < types.length && types.length < 3) {
+                    return types.map(function (t) { return inferInstantiationFromUsage(t, usage); });
+                }
+                return [];
+            }
+            function allPropertiesAreAssignableToUsage(type, usage) {
+                if (!usage.properties)
+                    return false;
+                return !ts.forEachEntry(usage.properties, function (propUsage, name) {
+                    var source = checker.getTypeOfPropertyOfType(type, name);
+                    if (!source) {
+                        return true;
+                    }
+                    if (propUsage.calls) {
+                        var sigs = checker.getSignaturesOfType(source, 0 /* Call */);
+                        return !sigs.length || !checker.isTypeAssignableTo(source, getFunctionFromCalls(propUsage.calls));
+                    }
+                    else {
+                        return !checker.isTypeAssignableTo(source, combineFromUsage(propUsage));
+                    }
+                });
+            }
+            /**
+             * inference is limited to
+             * 1. generic types with a single parameter
+             * 2. inference to/from calls with a single signature
+             */
+            function inferInstantiationFromUsage(type, usage) {
+                if (!(ts.getObjectFlags(type) & 4 /* Reference */) || !usage.properties) {
+                    return type;
+                }
+                var generic = type.target;
+                var singleTypeParameter = ts.singleOrUndefined(generic.typeParameters);
+                if (!singleTypeParameter)
+                    return type;
+                var types = [];
+                usage.properties.forEach(function (propUsage, name) {
+                    var genericPropertyType = checker.getTypeOfPropertyOfType(generic, name);
+                    ts.Debug.assert(!!genericPropertyType, "generic should have all the properties of its reference.");
+                    types.push.apply(types, inferTypeParameters(genericPropertyType, combineFromUsage(propUsage), singleTypeParameter));
+                });
+                return builtinConstructors[type.symbol.escapedName](combineTypes(types));
+            }
+            function inferTypeParameters(genericType, usageType, typeParameter) {
+                if (genericType === typeParameter) {
+                    return [usageType];
+                }
+                else if (genericType.flags & 3145728 /* UnionOrIntersection */) {
+                    return ts.flatMap(genericType.types, function (t) { return inferTypeParameters(t, usageType, typeParameter); });
+                }
+                else if (genericType.flags & 134217728 /* Awaited */) {
+                    return inferTypeParameters(genericType.awaitedType, usageType, typeParameter);
+                }
+                else if (ts.getObjectFlags(genericType) & 4 /* Reference */ && ts.getObjectFlags(usageType) & 4 /* Reference */) {
+                    // this is wrong because we need a reference to the targetType to, so we can check that it's also a reference
+                    var genericArgs = checker.getTypeArguments(genericType);
+                    var usageArgs = checker.getTypeArguments(usageType);
+                    var types = [];
+                    if (genericArgs && usageArgs) {
+                        for (var i = 0; i < genericArgs.length; i++) {
+                            if (usageArgs[i]) {
+                                types.push.apply(types, inferTypeParameters(genericArgs[i], usageArgs[i], typeParameter));
+                            }
+                        }
+                    }
+                    return types;
+                }
+                var genericSigs = checker.getSignaturesOfType(genericType, 0 /* Call */);
+                var usageSigs = checker.getSignaturesOfType(usageType, 0 /* Call */);
+                // allow for multiple overloads of `then`.
+                if (genericSigs.length === 1 && usageSigs.length === 1) {
+                    return inferFromSignatures(genericSigs[0], usageSigs[0], typeParameter);
+                }
+                return [];
+            }
+            function inferFromSignatures(genericSig, usageSig, typeParameter) {
+                var types = [];
+                for (var i = 0; i < genericSig.parameters.length; i++) {
+                    var genericParam = genericSig.parameters[i];
+                    var usageParam = usageSig.parameters[i];
+                    var isRest = genericSig.declaration && ts.isRestParameter(genericSig.declaration.parameters[i]);
+                    if (!usageParam) {
+                        break;
+                    }
+                    var genericParamType = checker.getTypeOfSymbolAtLocation(genericParam, genericParam.valueDeclaration);
+                    var elementType = isRest && checker.getElementTypeOfArrayType(genericParamType);
+                    if (elementType) {
+                        genericParamType = elementType;
+                    }
+                    var targetType = usageParam.type || checker.getTypeOfSymbolAtLocation(usageParam, usageParam.valueDeclaration);
+                    types.push.apply(types, inferTypeParameters(genericParamType, targetType, typeParameter));
+                }
+                var genericReturn = checker.getReturnTypeOfSignature(genericSig);
+                var usageReturn = checker.getReturnTypeOfSignature(usageSig);
+                types.push.apply(types, inferTypeParameters(genericReturn, usageReturn, typeParameter));
+                return types;
+            }
+            function getFunctionFromCalls(calls) {
+                return checker.createAnonymousType(/*symbol*/ undefined, ts.createSymbolTable(), [getSignatureFromCalls(calls)], ts.emptyArray, /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined);
+            }
+            function getSignatureFromCalls(calls) {
+                var parameters = [];
+                var length = Math.max.apply(Math, calls.map(function (c) { return c.argumentTypes.length; }));
+                var _loop_14 = function (i) {
+                    var symbol = checker.createSymbol(1 /* FunctionScopedVariable */, ts.escapeLeadingUnderscores("arg" + i));
+                    symbol.type = combineTypes(calls.map(function (call) { return call.argumentTypes[i] || checker.getUndefinedType(); }));
+                    if (calls.some(function (call) { return call.argumentTypes[i] === undefined; })) {
+                        symbol.flags |= 16777216 /* Optional */;
+                    }
+                    parameters.push(symbol);
+                };
+                for (var i = 0; i < length; i++) {
+                    _loop_14(i);
+                }
+                var returnType = combineFromUsage(combineUsages(calls.map(function (call) { return call.return_; })));
+                // TODO: GH#18217
+                return checker.createSignature(/*declaration*/ undefined, /*typeParameters*/ undefined, /*thisParameter*/ undefined, parameters, returnType, /*typePredicate*/ undefined, length, 0 /* None */);
+            }
+            function addCandidateType(usage, type) {
+                if (type && !(type.flags & 1 /* Any */) && !(type.flags & 131072 /* Never */)) {
+                    (usage.candidateTypes || (usage.candidateTypes = [])).push(type);
+                }
+            }
+            function addCandidateThisType(usage, type) {
+                if (type && !(type.flags & 1 /* Any */) && !(type.flags & 131072 /* Never */)) {
+                    (usage.candidateThisTypes || (usage.candidateThisTypes = [])).push(type);
+                }
+            }
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -131856,21 +132257,10 @@ var ts;
             }
         }
         codefix.createMissingMemberNodes = createMissingMemberNodes;
-        function getModuleSpecifierResolverHost(context) {
-            return {
-                directoryExists: context.host.directoryExists ? function (d) { return context.host.directoryExists(d); } : undefined,
-                fileExists: context.host.fileExists ? function (f) { return context.host.fileExists(f); } : undefined,
-                getCurrentDirectory: context.host.getCurrentDirectory ? function () { return context.host.getCurrentDirectory(); } : undefined,
-                readFile: context.host.readFile ? function (f) { return context.host.readFile(f); } : undefined,
-                useCaseSensitiveFileNames: context.host.useCaseSensitiveFileNames ? function () { return context.host.useCaseSensitiveFileNames(); } : undefined,
-                getSourceFiles: function () { return context.program.getSourceFiles(); },
-                getCommonSourceDirectory: function () { return context.program.getCommonSourceDirectory(); },
-            };
-        }
         function getNoopSymbolTrackerWithResolver(context) {
             return {
                 trackSymbol: ts.noop,
-                moduleResolverHost: getModuleSpecifierResolverHost(context),
+                moduleResolverHost: ts.getModuleSpecifierResolverHost(context.program, context.host),
             };
         }
         codefix.getNoopSymbolTrackerWithResolver = getNoopSymbolTrackerWithResolver;
@@ -133656,7 +134046,7 @@ var ts;
                     case 245 /* FunctionDeclaration */:
                         return scope.name
                             ? "function '" + scope.name.text + "'"
-                            : "anonymous function";
+                            : ts.ANONYMOUS;
                     case 203 /* ArrowFunction */:
                         return "arrow function";
                     case 162 /* MethodDeclaration */:
@@ -134785,7 +135175,7 @@ var ts;
             var newTypeNode = ts.createTypeAliasDeclaration(
             /* decorators */ undefined, 
             /* modifiers */ undefined, name, typeParameters.map(function (id) { return ts.updateTypeParameterDeclaration(id, id.name, id.constraint, /* defaultType */ undefined); }), selection);
-            changes.insertNodeBefore(file, firstStatement, newTypeNode, /* blankLineBetween */ true);
+            changes.insertNodeBefore(file, firstStatement, ts.ignoreSourceNewlines(newTypeNode), /* blankLineBetween */ true);
             changes.replaceNode(file, selection, ts.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })));
         }
         function doInterfaceChange(changes, file, name, info) {
@@ -134794,7 +135184,7 @@ var ts;
             /* decorators */ undefined, 
             /* modifiers */ undefined, name, typeParameters, 
             /* heritageClauses */ undefined, typeElements);
-            changes.insertNodeBefore(file, firstStatement, newTypeNode, /* blankLineBetween */ true);
+            changes.insertNodeBefore(file, firstStatement, ts.ignoreSourceNewlines(newTypeNode), /* blankLineBetween */ true);
             changes.replaceNode(file, selection, ts.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })));
         }
         function doTypedefChange(changes, file, name, info) {
@@ -139565,7 +139955,10 @@ var ts;
         /// Emit
         LanguageServiceShimObject.prototype.getEmitOutput = function (fileName) {
             var _this = this;
-            return this.forwardJSONCall("getEmitOutput('" + fileName + "')", function () { return _this.languageService.getEmitOutput(fileName); });
+            return this.forwardJSONCall("getEmitOutput('" + fileName + "')", function () {
+                var _a = _this.languageService.getEmitOutput(fileName), diagnostics = _a.diagnostics, rest = __rest(_a, ["diagnostics"]);
+                return __assign(__assign({}, rest), { diagnostics: _this.realizeDiagnostics(diagnostics) });
+            });
         };
         LanguageServiceShimObject.prototype.getEmitOutputObject = function (fileName) {
             var _this = this;
diff --git a/lib/typescriptServices.d.ts b/lib/typescriptServices.d.ts
index 17fdc780f9d..3e4b517575c 100644
--- a/lib/typescriptServices.d.ts
+++ b/lib/typescriptServices.d.ts
@@ -1925,7 +1925,7 @@ declare namespace ts {
         /** @throws OperationCanceledException if isCancellationRequested is true */
         throwIfCancellationRequested(): void;
     }
-    export interface Program extends ScriptReferenceHost, ModuleSpecifierResolutionHost {
+    export interface Program extends ScriptReferenceHost {
         getCurrentDirectory(): string;
         /**
          * Get a list of root file names that were passed to a 'createProgram'
@@ -3187,11 +3187,6 @@ declare namespace ts {
         directoryExists?(directoryName: string): boolean;
         getCurrentDirectory?(): string;
     }
-    export interface ModuleSpecifierResolutionHost extends GetEffectiveTypeRootsHost {
-        useCaseSensitiveFileNames?(): boolean;
-        fileExists?(path: string): boolean;
-        readFile?(path: string): string | undefined;
-    }
     export interface TextSpan {
         start: number;
         length: number;
@@ -5107,7 +5102,7 @@ declare namespace ts {
         fileName: Path;
         packageName: string;
     }
-    interface LanguageServiceHost extends ModuleSpecifierResolutionHost {
+    interface LanguageServiceHost extends GetEffectiveTypeRootsHost {
         getCompilationSettings(): CompilerOptions;
         getNewLine?(): string;
         getProjectVersion?(): string;
@@ -5123,6 +5118,7 @@ declare namespace ts {
         log?(s: string): void;
         trace?(s: string): void;
         error?(s: string): void;
+        useCaseSensitiveFileNames?(): boolean;
         readDirectory?(path: string, extensions?: readonly string[], exclude?: readonly string[], include?: readonly string[], depth?: number): string[];
         readFile?(path: string, encoding?: string): string | undefined;
         realpath?(path: string): string;
diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
index 0a4971a6766..6955fbea9aa 100644
--- a/lib/typescriptServices.js
+++ b/lib/typescriptServices.js
@@ -244,7 +244,7 @@ var ts;
     // If changing the text in this section, be sure to test `configurePrerelease` too.
     ts.versionMajorMinor = "3.9";
     /** The version of the TypeScript compiler release */
-    ts.version = ts.versionMajorMinor + ".0-dev";
+    ts.version = ts.versionMajorMinor + ".0-beta";
     /**
      * Returns the native Map implementation if it is available and compatible (i.e. supports iteration).
      */
@@ -4595,6 +4595,7 @@ var ts;
         EmitFlags[EmitFlags["NoAsciiEscaping"] = 16777216] = "NoAsciiEscaping";
         /*@internal*/ EmitFlags[EmitFlags["TypeScriptClassWrapper"] = 33554432] = "TypeScriptClassWrapper";
         /*@internal*/ EmitFlags[EmitFlags["NeverApplyImportHelper"] = 67108864] = "NeverApplyImportHelper";
+        /*@internal*/ EmitFlags[EmitFlags["IgnoreSourceNewlines"] = 134217728] = "IgnoreSourceNewlines";
     })(EmitFlags = ts.EmitFlags || (ts.EmitFlags = {}));
     /**
      * Used by the checker, this enum keeps track of external emit helpers that should be type
@@ -7172,6 +7173,7 @@ var ts;
         Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: diag(2395, ts.DiagnosticCategory.Error, "Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local_2395", "Individual declarations in merged declaration '{0}' must be all exported or all local."),
         Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: diag(2396, ts.DiagnosticCategory.Error, "Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters_2396", "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters."),
         Declaration_name_conflicts_with_built_in_global_identifier_0: diag(2397, ts.DiagnosticCategory.Error, "Declaration_name_conflicts_with_built_in_global_identifier_0_2397", "Declaration name conflicts with built-in global identifier '{0}'."),
+        constructor_cannot_be_used_as_a_parameter_property_name: diag(2398, ts.DiagnosticCategory.Error, "constructor_cannot_be_used_as_a_parameter_property_name_2398", "'constructor' cannot be used as a parameter property name."),
         Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: diag(2399, ts.DiagnosticCategory.Error, "Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference_2399", "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference."),
         Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: diag(2400, ts.DiagnosticCategory.Error, "Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference_2400", "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference."),
         Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: diag(2401, ts.DiagnosticCategory.Error, "Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference_2401", "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference."),
@@ -7506,6 +7508,7 @@ var ts;
         _0_needs_an_explicit_type_annotation: diag(2782, ts.DiagnosticCategory.Message, "_0_needs_an_explicit_type_annotation_2782", "'{0}' needs an explicit type annotation."),
         _0_is_specified_more_than_once_so_this_usage_will_be_overwritten: diag(2783, ts.DiagnosticCategory.Error, "_0_is_specified_more_than_once_so_this_usage_will_be_overwritten_2783", "'{0}' is specified more than once, so this usage will be overwritten."),
         get_and_set_accessors_cannot_declare_this_parameters: diag(2784, ts.DiagnosticCategory.Error, "get_and_set_accessors_cannot_declare_this_parameters_2784", "'get' and 'set' accessors cannot declare 'this' parameters."),
+        This_spread_always_overwrites_this_property: diag(2785, ts.DiagnosticCategory.Error, "This_spread_always_overwrites_this_property_2785", "This spread always overwrites this property."),
         Import_declaration_0_is_using_private_name_1: diag(4000, ts.DiagnosticCategory.Error, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -7857,6 +7860,7 @@ var ts;
         Synchronously_call_callbacks_and_update_the_state_of_directory_watchers_on_platforms_that_don_t_support_recursive_watching_natively: diag(6228, ts.DiagnosticCategory.Message, "Synchronously_call_callbacks_and_update_the_state_of_directory_watchers_on_platforms_that_don_t_supp_6228", "Synchronously call callbacks and update the state of directory watchers on platforms that don't support recursive watching natively."),
         Tag_0_expects_at_least_1_arguments_but_the_JSX_factory_2_provides_at_most_3: diag(6229, ts.DiagnosticCategory.Error, "Tag_0_expects_at_least_1_arguments_but_the_JSX_factory_2_provides_at_most_3_6229", "Tag '{0}' expects at least '{1}' arguments, but the JSX factory '{2}' provides at most '{3}'."),
         Option_0_can_only_be_specified_in_tsconfig_json_file_or_set_to_false_or_null_on_command_line: diag(6230, ts.DiagnosticCategory.Error, "Option_0_can_only_be_specified_in_tsconfig_json_file_or_set_to_false_or_null_on_command_line_6230", "Option '{0}' can only be specified in 'tsconfig.json' file or set to 'false' or 'null' on command line."),
+        Could_not_resolve_the_path_0_with_the_extensions_Colon_1: diag(6231, ts.DiagnosticCategory.Error, "Could_not_resolve_the_path_0_with_the_extensions_Colon_1_6231", "Could not resolve the path '{0}' with the extensions: {1}."),
         Projects_to_reference: diag(6300, ts.DiagnosticCategory.Message, "Projects_to_reference_6300", "Projects to reference"),
         Enable_project_compilation: diag(6302, ts.DiagnosticCategory.Message, "Enable_project_compilation_6302", "Enable project compilation"),
         Composite_projects_may_not_disable_declaration_emit: diag(6304, ts.DiagnosticCategory.Error, "Composite_projects_may_not_disable_declaration_emit_6304", "Composite projects may not disable declaration emit."),
@@ -8153,7 +8157,15 @@ var ts;
         Set_the_target_option_in_your_configuration_file_to_0: diag(95098, ts.DiagnosticCategory.Message, "Set_the_target_option_in_your_configuration_file_to_0_95098", "Set the 'target' option in your configuration file to '{0}'"),
         Set_the_module_option_in_your_configuration_file_to_0: diag(95099, ts.DiagnosticCategory.Message, "Set_the_module_option_in_your_configuration_file_to_0_95099", "Set the 'module' option in your configuration file to '{0}'"),
         Convert_invalid_character_to_its_html_entity_code: diag(95100, ts.DiagnosticCategory.Message, "Convert_invalid_character_to_its_html_entity_code_95100", "Convert invalid character to its html entity code"),
-        Wrap_invalid_character_in_an_expression_container: diag(95101, ts.DiagnosticCategory.Message, "Wrap_invalid_character_in_an_expression_container_95101", "Wrap invalid character in an expression container"),
+        Convert_all_invalid_characters_to_HTML_entity_code: diag(95101, ts.DiagnosticCategory.Message, "Convert_all_invalid_characters_to_HTML_entity_code_95101", "Convert all invalid characters to HTML entity code"),
+        Add_class_tag: diag(95102, ts.DiagnosticCategory.Message, "Add_class_tag_95102", "Add '@class' tag"),
+        Add_this_tag: diag(95103, ts.DiagnosticCategory.Message, "Add_this_tag_95103", "Add '@this' tag"),
+        Add_this_parameter: diag(95104, ts.DiagnosticCategory.Message, "Add_this_parameter_95104", "Add 'this' parameter."),
+        Convert_function_expression_0_to_arrow_function: diag(95105, ts.DiagnosticCategory.Message, "Convert_function_expression_0_to_arrow_function_95105", "Convert function expression '{0}' to arrow function"),
+        Convert_function_declaration_0_to_arrow_function: diag(95106, ts.DiagnosticCategory.Message, "Convert_function_declaration_0_to_arrow_function_95106", "Convert function declaration '{0}' to arrow function"),
+        Fix_all_implicit_this_errors: diag(95107, ts.DiagnosticCategory.Message, "Fix_all_implicit_this_errors_95107", "Fix all implicit-'this' errors"),
+        Wrap_invalid_character_in_an_expression_container: diag(95108, ts.DiagnosticCategory.Message, "Wrap_invalid_character_in_an_expression_container_95108", "Wrap invalid character in an expression container"),
+        Wrap_all_invalid_characters_in_an_expression_container: diag(95109, ts.DiagnosticCategory.Message, "Wrap_all_invalid_characters_in_an_expression_container_95109", "Wrap all invalid characters in an expression container"),
         No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, ts.DiagnosticCategory.Error, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
         Classes_may_not_have_a_field_named_constructor: diag(18006, ts.DiagnosticCategory.Error, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
         JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, ts.DiagnosticCategory.Error, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
@@ -8455,11 +8467,20 @@ var ts;
     }
     ts.getLineStarts = getLineStarts;
     /* @internal */
+    function computeLineAndCharacterOfPosition(lineStarts, position) {
+        var lineNumber = computeLineOfPosition(lineStarts, position);
+        return {
+            line: lineNumber,
+            character: position - lineStarts[lineNumber]
+        };
+    }
+    ts.computeLineAndCharacterOfPosition = computeLineAndCharacterOfPosition;
     /**
+     * @internal
      * We assume the first line starts at position 0 and 'position' is non-negative.
      */
-    function computeLineAndCharacterOfPosition(lineStarts, position) {
-        var lineNumber = ts.binarySearch(lineStarts, position, ts.identity, ts.compareValues);
+    function computeLineOfPosition(lineStarts, position, lowerBound) {
+        var lineNumber = ts.binarySearch(lineStarts, position, ts.identity, ts.compareValues, lowerBound);
         if (lineNumber < 0) {
             // If the actual position was not found,
             // the binary search returns the 2's-complement of the next line start
@@ -8471,12 +8492,22 @@ var ts;
             lineNumber = ~lineNumber - 1;
             ts.Debug.assert(lineNumber !== -1, "position cannot precede the beginning of the file");
         }
-        return {
-            line: lineNumber,
-            character: position - lineStarts[lineNumber]
-        };
+        return lineNumber;
     }
-    ts.computeLineAndCharacterOfPosition = computeLineAndCharacterOfPosition;
+    ts.computeLineOfPosition = computeLineOfPosition;
+    /** @internal */
+    function getLinesBetweenPositions(sourceFile, pos1, pos2) {
+        if (pos1 === pos2)
+            return 0;
+        var lineStarts = getLineStarts(sourceFile);
+        var lower = Math.min(pos1, pos2);
+        var isNegative = lower === pos2;
+        var upper = isNegative ? pos1 : pos2;
+        var lowerLine = computeLineOfPosition(lineStarts, lower);
+        var upperLine = computeLineOfPosition(lineStarts, upper, lowerLine);
+        return isNegative ? lowerLine - upperLine : upperLine - lowerLine;
+    }
+    ts.getLinesBetweenPositions = getLinesBetweenPositions;
     function getLineAndCharacterOfPosition(sourceFile, position) {
         return computeLineAndCharacterOfPosition(getLineStarts(sourceFile), position);
     }
@@ -12848,6 +12879,7 @@ var ts;
     ts.emptyUnderscoreEscapedMap = ts.emptyMap;
     ts.externalHelpersModuleNameText = "tslib";
     ts.defaultMaximumTruncationLength = 160;
+    ts.noTruncationMaximumTruncationLength = 1000000;
     function getDeclarationOfKind(symbol, kind) {
         var declarations = symbol.declarations;
         if (declarations) {
@@ -13301,7 +13333,7 @@ var ts;
             return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos, /*stopAfterLineBreak*/ false, /*stopAtComments*/ true);
         }
         if (includeJsDoc && ts.hasJSDocNodes(node)) {
-            return getTokenPosOfNode(node.jsDoc[0]);
+            return getTokenPosOfNode(node.jsDoc[0], sourceFile);
         }
         // For a syntax list, it is possible that one of its children has JSDocComment nodes, while
         // the syntax list itself considers them as normal trivia. Therefore if we simply skip
@@ -16261,8 +16293,8 @@ var ts;
                 write(s);
             }
         }
-        function writeLine() {
-            if (!lineStart) {
+        function writeLine(force) {
+            if (!lineStart || force) {
                 output += newLine;
                 lineCount++;
                 linePos = output.length;
@@ -16373,6 +16405,14 @@ var ts;
             } });
     }
     ts.getTrailingSemicolonDeferringWriter = getTrailingSemicolonDeferringWriter;
+    function hostUsesCaseSensitiveFileNames(host) {
+        return host.useCaseSensitiveFileNames ? host.useCaseSensitiveFileNames() : false;
+    }
+    ts.hostUsesCaseSensitiveFileNames = hostUsesCaseSensitiveFileNames;
+    function hostGetCanonicalFileName(host) {
+        return ts.createGetCanonicalFileName(hostUsesCaseSensitiveFileNames(host));
+    }
+    ts.hostGetCanonicalFileName = hostGetCanonicalFileName;
     function getResolvedExternalModuleName(host, file, referenceFile) {
         return file.moduleName || getExternalModuleNameFromPath(host, file.fileName, referenceFile && referenceFile.fileName);
     }
@@ -16493,12 +16533,13 @@ var ts;
         }
     }
     ts.writeFileEnsuringDirectories = writeFileEnsuringDirectories;
-    function getLineOfLocalPosition(currentSourceFile, pos) {
-        return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line;
+    function getLineOfLocalPosition(sourceFile, pos) {
+        var lineStarts = ts.getLineStarts(sourceFile);
+        return ts.computeLineOfPosition(lineStarts, pos);
     }
     ts.getLineOfLocalPosition = getLineOfLocalPosition;
     function getLineOfLocalPositionFromLineMap(lineMap, pos) {
-        return ts.computeLineAndCharacterOfPosition(lineMap, pos).line;
+        return ts.computeLineOfPosition(lineMap, pos);
     }
     ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
     function getFirstConstructorWithBody(node) {
@@ -17269,7 +17310,7 @@ var ts;
     }
     ts.rangeIsOnSingleLine = rangeIsOnSingleLine;
     function rangeStartPositionsAreOnSameLine(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), getStartPositionOfRange(range2, sourceFile), sourceFile);
+        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile, /*includeComments*/ false), getStartPositionOfRange(range2, sourceFile, /*includeComments*/ false), sourceFile);
     }
     ts.rangeStartPositionsAreOnSameLine = rangeStartPositionsAreOnSameLine;
     function rangeEndPositionsAreOnSameLine(range1, range2, sourceFile) {
@@ -17277,26 +17318,52 @@ var ts;
     }
     ts.rangeEndPositionsAreOnSameLine = rangeEndPositionsAreOnSameLine;
     function rangeStartIsOnSameLineAsRangeEnd(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), range2.end, sourceFile);
+        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile, /*includeComments*/ false), range2.end, sourceFile);
     }
     ts.rangeStartIsOnSameLineAsRangeEnd = rangeStartIsOnSameLineAsRangeEnd;
     function rangeEndIsOnSameLineAsRangeStart(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile), sourceFile);
+        return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile, /*includeComments*/ false), sourceFile);
     }
     ts.rangeEndIsOnSameLineAsRangeStart = rangeEndIsOnSameLineAsRangeStart;
+    function getLinesBetweenRangeEndAndRangeStart(range1, range2, sourceFile, includeSecondRangeComments) {
+        var range2Start = getStartPositionOfRange(range2, sourceFile, includeSecondRangeComments);
+        return ts.getLinesBetweenPositions(sourceFile, range1.end, range2Start);
+    }
+    ts.getLinesBetweenRangeEndAndRangeStart = getLinesBetweenRangeEndAndRangeStart;
+    function getLinesBetweenRangeEndPositions(range1, range2, sourceFile) {
+        return ts.getLinesBetweenPositions(sourceFile, range1.end, range2.end);
+    }
+    ts.getLinesBetweenRangeEndPositions = getLinesBetweenRangeEndPositions;
     function isNodeArrayMultiLine(list, sourceFile) {
         return !positionsAreOnSameLine(list.pos, list.end, sourceFile);
     }
     ts.isNodeArrayMultiLine = isNodeArrayMultiLine;
     function positionsAreOnSameLine(pos1, pos2, sourceFile) {
-        return pos1 === pos2 ||
-            getLineOfLocalPosition(sourceFile, pos1) === getLineOfLocalPosition(sourceFile, pos2);
+        return ts.getLinesBetweenPositions(sourceFile, pos1, pos2) === 0;
     }
     ts.positionsAreOnSameLine = positionsAreOnSameLine;
-    function getStartPositionOfRange(range, sourceFile) {
-        return positionIsSynthesized(range.pos) ? -1 : ts.skipTrivia(sourceFile.text, range.pos);
+    function getStartPositionOfRange(range, sourceFile, includeComments) {
+        return positionIsSynthesized(range.pos) ? -1 : ts.skipTrivia(sourceFile.text, range.pos, /*stopAfterLineBreak*/ false, includeComments);
     }
     ts.getStartPositionOfRange = getStartPositionOfRange;
+    function getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter(pos, sourceFile, includeComments) {
+        var startPos = ts.skipTrivia(sourceFile.text, pos, /*stopAfterLineBreak*/ false, includeComments);
+        var prevPos = getPreviousNonWhitespacePosition(startPos, sourceFile);
+        return ts.getLinesBetweenPositions(sourceFile, prevPos || 0, startPos);
+    }
+    ts.getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter = getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter;
+    function getLinesBetweenPositionAndNextNonWhitespaceCharacter(pos, sourceFile, includeComments) {
+        var nextPos = ts.skipTrivia(sourceFile.text, pos, /*stopAfterLineBreak*/ false, includeComments);
+        return ts.getLinesBetweenPositions(sourceFile, pos, nextPos);
+    }
+    ts.getLinesBetweenPositionAndNextNonWhitespaceCharacter = getLinesBetweenPositionAndNextNonWhitespaceCharacter;
+    function getPreviousNonWhitespacePosition(pos, sourceFile) {
+        while (pos-- > 0) {
+            if (!ts.isWhiteSpaceLike(sourceFile.text.charCodeAt(pos))) {
+                return pos;
+            }
+        }
+    }
     /**
      * Determines whether a name was originally the declaration name of an enum or namespace
      * declaration.
@@ -22806,7 +22873,11 @@ var ts;
                         parseErrorAtRange(openingTag, ts.Diagnostics.JSX_fragment_has_no_corresponding_closing_tag);
                     }
                     else {
-                        parseErrorAtRange(openingTag.tagName, ts.Diagnostics.JSX_element_0_has_no_corresponding_closing_tag, ts.getTextOfNodeFromSourceText(sourceText, openingTag.tagName));
+                        // We want the error span to cover only 'Foo.Bar' in < Foo.Bar >
+                        // or to cover only 'Foo' in < Foo >
+                        var tag = openingTag.tagName;
+                        var start = ts.skipTrivia(sourceText, tag.pos);
+                        parseErrorAt(start, tag.end, ts.Diagnostics.JSX_element_0_has_no_corresponding_closing_tag, ts.getTextOfNodeFromSourceText(sourceText, openingTag.tagName));
                     }
                     return undefined;
                 case 30 /* LessThanSlashToken */:
@@ -35841,7 +35912,7 @@ var ts;
                 return true;
             }
             if (isUsedInFunctionOrInstanceProperty(usage, declaration, container)) {
-                if (compilerOptions.target === 99 /* ESNext */ && !!compilerOptions.useDefineForClassFields) {
+                if (compilerOptions.target === 99 /* ESNext */ && !!compilerOptions.useDefineForClassFields && ts.getContainingClass(declaration)) {
                     return (ts.isPropertyDeclaration(declaration) || ts.isParameterPropertyDeclaration(declaration, declaration.parent)) &&
                         !isPropertyImmediatelyReferencedWithinDeclaration(declaration, usage, /*stopAtAnyPropertyDeclaration*/ true);
                 }
@@ -37352,7 +37423,7 @@ var ts;
             return getPackagesSet().has(ts.getTypesPackageName(packageName));
         }
         function resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias) {
-            if (moduleSymbol) {
+            if (moduleSymbol === null || moduleSymbol === void 0 ? void 0 : moduleSymbol.exports) {
                 var exportEquals = resolveSymbol(moduleSymbol.exports.get("export=" /* ExportEquals */), dontResolveAlias);
                 var exported = getCommonJsExportEquals(getMergedSymbol(exportEquals), getMergedSymbol(moduleSymbol));
                 return getMergedSymbol(exported) || moduleSymbol;
@@ -38182,7 +38253,7 @@ var ts;
             var sourceFile = enclosingDeclaration && ts.getSourceFileOfNode(enclosingDeclaration);
             printer.writeNode(4 /* Unspecified */, typeNode, /*sourceFile*/ sourceFile, writer);
             var result = writer.getText();
-            var maxLength = noTruncation ? undefined : ts.defaultMaximumTruncationLength * 2;
+            var maxLength = noTruncation ? ts.noTruncationMaximumTruncationLength * 2 : ts.defaultMaximumTruncationLength * 2;
             if (maxLength && result && result.length >= maxLength) {
                 return result.substr(0, maxLength - "...".length) + "...";
             }
@@ -38243,9 +38314,13 @@ var ts;
                     tracker: tracker && tracker.trackSymbol ? tracker : { trackSymbol: ts.noop, moduleResolverHost: flags & 134217728 /* DoNotIncludeSymbolChain */ ? {
                             getCommonSourceDirectory: host.getCommonSourceDirectory ? function () { return host.getCommonSourceDirectory(); } : function () { return ""; },
                             getSourceFiles: function () { return host.getSourceFiles(); },
-                            getCurrentDirectory: ts.maybeBind(host, host.getCurrentDirectory),
+                            getCurrentDirectory: function () { return host.getCurrentDirectory(); },
                             getProbableSymlinks: ts.maybeBind(host, host.getProbableSymlinks),
-                            useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames)
+                            useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames),
+                            redirectTargetsMap: host.redirectTargetsMap,
+                            getProjectReferenceRedirect: function (fileName) { return host.getProjectReferenceRedirect(fileName); },
+                            isSourceOfProjectReferenceRedirect: function (fileName) { return host.isSourceOfProjectReferenceRedirect(fileName); },
+                            fileExists: function (fileName) { return host.fileExists(fileName); },
                         } : undefined },
                     encounteredError: false,
                     visitedTypes: undefined,
@@ -38259,7 +38334,7 @@ var ts;
             function checkTruncationLength(context) {
                 if (context.truncating)
                     return context.truncating;
-                return context.truncating = !(context.flags & 1 /* NoTruncation */) && context.approximateLength > ts.defaultMaximumTruncationLength;
+                return context.truncating = context.approximateLength > ((context.flags & 1 /* NoTruncation */) ? ts.noTruncationMaximumTruncationLength : ts.defaultMaximumTruncationLength);
             }
             function typeToTypeNodeHelper(type, context) {
                 if (cancellationToken && cancellationToken.throwIfCancellationRequested) {
@@ -39145,7 +39220,7 @@ var ts;
                     // specifier preference
                     var moduleResolverHost = context.tracker.moduleResolverHost;
                     var specifierCompilerOptions = isBundle_1 ? __assign(__assign({}, compilerOptions), { baseUrl: moduleResolverHost.getCommonSourceDirectory() }) : compilerOptions;
-                    specifier = ts.first(ts.moduleSpecifiers.getModuleSpecifiers(symbol, specifierCompilerOptions, contextFile, moduleResolverHost, host.getSourceFiles(), { importModuleSpecifierPreference: isBundle_1 ? "non-relative" : "relative" }, host.redirectTargetsMap));
+                    specifier = ts.first(ts.moduleSpecifiers.getModuleSpecifiers(symbol, specifierCompilerOptions, contextFile, moduleResolverHost, { importModuleSpecifierPreference: isBundle_1 ? "non-relative" : "relative" }));
                     links.specifierCache = links.specifierCache || ts.createMap();
                     links.specifierCache.set(contextFile.path, specifier);
                 }
@@ -40336,7 +40411,7 @@ var ts;
                                     var getCanonicalFileName = ts.createGetCanonicalFileName(!!host.useCaseSensitiveFileNames);
                                     var resolverHost = {
                                         getCanonicalFileName: getCanonicalFileName,
-                                        getCurrentDirectory: context.tracker.moduleResolverHost.getCurrentDirectory ? function () { return context.tracker.moduleResolverHost.getCurrentDirectory(); } : function () { return ""; },
+                                        getCurrentDirectory: function () { return context.tracker.moduleResolverHost.getCurrentDirectory(); },
                                         getCommonSourceDirectory: function () { return context.tracker.moduleResolverHost.getCommonSourceDirectory(); }
                                     };
                                     var newName = ts.getResolvedExternalModuleName(resolverHost, targetFile);
@@ -41081,7 +41156,7 @@ var ts;
                 // [Symbol.iterator] or next). This may be because we accessed properties from anyType,
                 // or it may have led to an error inside getElementTypeOfIterable.
                 var forOfStatement = declaration.parent.parent;
-                return checkRightHandSideOfForOf(forOfStatement.expression, forOfStatement.awaitModifier) || anyType;
+                return checkRightHandSideOfForOf(forOfStatement) || anyType;
             }
             if (ts.isBindingPattern(declaration.parent)) {
                 return getTypeForBindingElement(declaration);
@@ -44293,7 +44368,10 @@ var ts;
             return true;
         }
         function getSignatureOfTypeTag(node) {
-            var typeTag = ts.isInJSFile(node) ? ts.getJSDocTypeTag(node) : undefined;
+            // should be attached to a function declaration or expression
+            if (!(ts.isInJSFile(node) && ts.isFunctionLikeDeclaration(node)))
+                return undefined;
+            var typeTag = ts.getJSDocTypeTag(node);
             var signature = typeTag && typeTag.typeExpression && getSingleCallSignature(getTypeFromTypeNode(typeTag.typeExpression));
             return signature && getErasedSignature(signature);
         }
@@ -46307,65 +46385,89 @@ var ts;
             return type;
         }
         function getConditionalType(root, mapper) {
-            var checkType = instantiateType(root.checkType, mapper);
-            var extendsType = instantiateType(root.extendsType, mapper);
-            if (checkType === wildcardType || extendsType === wildcardType) {
-                return wildcardType;
+            var result;
+            var extraTypes;
+            var _loop_11 = function () {
+                var checkType = instantiateType(root.checkType, mapper);
+                var checkTypeInstantiable = isGenericObjectType(checkType) || isGenericIndexType(checkType);
+                var extendsType = instantiateType(root.extendsType, mapper);
+                if (checkType === wildcardType || extendsType === wildcardType) {
+                    return { value: wildcardType };
+                }
+                var combinedMapper = void 0;
+                if (root.inferTypeParameters) {
+                    var context = createInferenceContext(root.inferTypeParameters, /*signature*/ undefined, 0 /* None */);
+                    // We skip inference of the possible `infer` types unles the `extendsType` _is_ an infer type
+                    // if it was, it's trivial to say that extendsType = checkType, however such a pattern is used to
+                    // "reset" the type being build up during constraint calculation and avoid making an apparently "infinite" constraint
+                    // so in those cases we refain from performing inference and retain the uninfered type parameter
+                    if (!checkTypeInstantiable || !ts.some(root.inferTypeParameters, function (t) { return t === extendsType; })) {
+                        // We don't want inferences from constraints as they may cause us to eagerly resolve the
+                        // conditional type instead of deferring resolution. Also, we always want strict function
+                        // types rules (i.e. proper contravariance) for inferences.
+                        inferTypes(context.inferences, checkType, extendsType, 128 /* NoConstraints */ | 256 /* AlwaysStrict */);
+                    }
+                    combinedMapper = mergeTypeMappers(mapper, context.mapper);
+                }
+                // Instantiate the extends type including inferences for 'infer T' type parameters
+                var inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
+                // We attempt to resolve the conditional type only when the check and extends types are non-generic
+                if (!checkTypeInstantiable && !isGenericObjectType(inferredExtendsType) && !isGenericIndexType(inferredExtendsType)) {
+                    // Return falseType for a definitely false extends check. We check an instantiations of the two
+                    // types with type parameters mapped to the wildcard type, the most permissive instantiations
+                    // possible (the wildcard type is assignable to and from all types). If those are not related,
+                    // then no instantiations will be and we can just return the false branch type.
+                    if (!(inferredExtendsType.flags & 3 /* AnyOrUnknown */) && (checkType.flags & 1 /* Any */ || !isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType)))) {
+                        // Return union of trueType and falseType for 'any' since it matches anything
+                        if (checkType.flags & 1 /* Any */) {
+                            (extraTypes || (extraTypes = [])).push(instantiateTypeWithoutDepthIncrease(root.trueType, combinedMapper || mapper));
+                        }
+                        // If falseType is an immediately nested conditional type that isn't distributive or has an
+                        // identical checkType, switch to that type and loop.
+                        var falseType_1 = root.falseType;
+                        if (falseType_1.flags & 16777216 /* Conditional */) {
+                            var newRoot = falseType_1.root;
+                            if (newRoot.node.parent === root.node && (!newRoot.isDistributive || newRoot.checkType === root.checkType)) {
+                                root = newRoot;
+                                return "continue";
+                            }
+                        }
+                        result = instantiateTypeWithoutDepthIncrease(falseType_1, mapper);
+                        return "break";
+                    }
+                    // Return trueType for a definitely true extends check. We check instantiations of the two
+                    // types with type parameters mapped to their restrictive form, i.e. a form of the type parameter
+                    // that has no constraint. This ensures that, for example, the type
+                    //   type Foo<T extends { x: any }> = T extends { x: string } ? string : number
+                    // doesn't immediately resolve to 'string' instead of being deferred.
+                    if (inferredExtendsType.flags & 3 /* AnyOrUnknown */ || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(inferredExtendsType))) {
+                        result = instantiateTypeWithoutDepthIncrease(root.trueType, combinedMapper || mapper);
+                        return "break";
+                    }
+                }
+                // Return a deferred type for a check that is neither definitely true nor definitely false
+                var erasedCheckType = getActualTypeVariable(checkType);
+                result = createType(16777216 /* Conditional */);
+                result.root = root;
+                result.checkType = erasedCheckType;
+                result.extendsType = extendsType;
+                result.mapper = mapper;
+                result.combinedMapper = combinedMapper;
+                result.aliasSymbol = root.aliasSymbol;
+                result.aliasTypeArguments = instantiateTypes(root.aliasTypeArguments, mapper); // TODO: GH#18217
+                return "break";
+            };
+            // We loop here for an immediately nested conditional type in the false position, effectively treating
+            // types of the form 'A extends B ? X : C extends D ? Y : E extends F ? Z : ...' as a single construct for
+            // purposes of resolution. This means such types aren't subject to the instatiation depth limiter.
+            while (true) {
+                var state_4 = _loop_11();
+                if (typeof state_4 === "object")
+                    return state_4.value;
+                if (state_4 === "break")
+                    break;
             }
-            var checkTypeInstantiable = isGenericObjectType(checkType) || isGenericIndexType(checkType);
-            var combinedMapper;
-            if (root.inferTypeParameters) {
-                var context = createInferenceContext(root.inferTypeParameters, /*signature*/ undefined, 0 /* None */);
-                // We skip inference of the possible `infer` types unles the `extendsType` _is_ an infer type
-                // if it was, it's trivial to say that extendsType = checkType, however such a pattern is used to
-                // "reset" the type being build up during constraint calculation and avoid making an apparently "infinite" constraint
-                // so in those cases we refain from performing inference and retain the uninfered type parameter
-                if (!checkTypeInstantiable || !ts.some(root.inferTypeParameters, function (t) { return t === extendsType; })) {
-                    // We don't want inferences from constraints as they may cause us to eagerly resolve the
-                    // conditional type instead of deferring resolution. Also, we always want strict function
-                    // types rules (i.e. proper contravariance) for inferences.
-                    inferTypes(context.inferences, checkType, extendsType, 128 /* NoConstraints */ | 256 /* AlwaysStrict */);
-                }
-                combinedMapper = mergeTypeMappers(mapper, context.mapper);
-            }
-            // Instantiate the extends type including inferences for 'infer T' type parameters
-            var inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
-            // We attempt to resolve the conditional type only when the check and extends types are non-generic
-            if (!checkTypeInstantiable && !isGenericObjectType(inferredExtendsType) && !isGenericIndexType(inferredExtendsType)) {
-                if (inferredExtendsType.flags & 3 /* AnyOrUnknown */) {
-                    return instantiateType(root.trueType, combinedMapper || mapper);
-                }
-                // Return union of trueType and falseType for 'any' since it matches anything
-                if (checkType.flags & 1 /* Any */) {
-                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), instantiateType(root.falseType, mapper)]);
-                }
-                // Return falseType for a definitely false extends check. We check an instantiations of the two
-                // types with type parameters mapped to the wildcard type, the most permissive instantiations
-                // possible (the wildcard type is assignable to and from all types). If those are not related,
-                // then no instantiations will be and we can just return the false branch type.
-                if (!isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType))) {
-                    return instantiateType(root.falseType, mapper);
-                }
-                // Return trueType for a definitely true extends check. We check instantiations of the two
-                // types with type parameters mapped to their restrictive form, i.e. a form of the type parameter
-                // that has no constraint. This ensures that, for example, the type
-                //   type Foo<T extends { x: any }> = T extends { x: string } ? string : number
-                // doesn't immediately resolve to 'string' instead of being deferred.
-                if (isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(inferredExtendsType))) {
-                    return instantiateType(root.trueType, combinedMapper || mapper);
-                }
-            }
-            // Return a deferred type for a check that is neither definitely true nor definitely false
-            var erasedCheckType = getActualTypeVariable(checkType);
-            var result = createType(16777216 /* Conditional */);
-            result.root = root;
-            result.checkType = erasedCheckType;
-            result.extendsType = extendsType;
-            result.mapper = mapper;
-            result.combinedMapper = combinedMapper;
-            result.aliasSymbol = root.aliasSymbol;
-            result.aliasTypeArguments = instantiateTypes(root.aliasTypeArguments, mapper); // TODO: GH#18217
-            return result;
+            return extraTypes ? getUnionType(ts.append(extraTypes, result)) : result;
         }
         function getTrueTypeFromConditionalType(type) {
             return type.resolvedTrueType || (type.resolvedTrueType = instantiateType(type.root.trueType, type.mapper));
@@ -47253,6 +47355,16 @@ var ts;
             instantiationDepth--;
             return result;
         }
+        /**
+         * This can be used to avoid the penalty on instantiation depth for types which result from immediate
+         * simplification. It essentially removes the depth increase done in `instantiateType`.
+         */
+        function instantiateTypeWithoutDepthIncrease(type, mapper) {
+            instantiationDepth--;
+            var result = instantiateType(type, mapper);
+            instantiationDepth++;
+            return result;
+        }
         function instantiateTypeWorker(type, mapper) {
             var _a;
             var flags = type.flags;
@@ -48738,7 +48850,7 @@ var ts;
                     reducedTarget = findMatchingDiscriminantType(source, target, isRelatedTo) || filterPrimitivesIfContainsNonPrimitive(target);
                     checkTypes = reducedTarget.flags & 1048576 /* Union */ ? reducedTarget.types : [reducedTarget];
                 }
-                var _loop_11 = function (prop) {
+                var _loop_12 = function (prop) {
                     if (shouldCheckAsExcessProperty(prop, source.symbol) && !isIgnoredJsxProperty(source, prop)) {
                         if (!isKnownProperty(reducedTarget, prop.escapedName, isComparingJsxAttributes)) {
                             if (reportErrors) {
@@ -48794,9 +48906,9 @@ var ts;
                 };
                 for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    var state_4 = _loop_11(prop);
-                    if (typeof state_4 === "object")
-                        return state_4.value;
+                    var state_5 = _loop_12(prop);
+                    if (typeof state_5 === "object")
+                        return state_5.value;
                 }
                 return false;
             }
@@ -49232,6 +49344,8 @@ var ts;
                         }
                     }
                     else {
+                        // conditionals aren't related to one another via distributive constraint as it is much too inaccurate and allows way
+                        // more assignments than are desirable (since it maps the source check type to its constraint, it loses information)
                         var distributiveConstraint = getConstraintOfDistributiveConditionalType(source);
                         if (distributiveConstraint) {
                             if (result = isRelatedTo(distributiveConstraint, target, reportErrors)) {
@@ -49239,12 +49353,14 @@ var ts;
                                 return result;
                             }
                         }
-                        var defaultConstraint = getDefaultConstraintOfConditionalType(source);
-                        if (defaultConstraint) {
-                            if (result = isRelatedTo(defaultConstraint, target, reportErrors)) {
-                                resetErrorInfo(saveErrorInfo);
-                                return result;
-                            }
+                    }
+                    // conditionals _can_ be related to one another via normal constraint, as, eg, `A extends B ? O : never` should be assignable to `O`
+                    // when `O` is a conditional (`never` is trivially aissgnable to `O`, as is `O`!).
+                    var defaultConstraint = getDefaultConstraintOfConditionalType(source);
+                    if (defaultConstraint) {
+                        if (result = isRelatedTo(defaultConstraint, target, reportErrors)) {
+                            resetErrorInfo(saveErrorInfo);
+                            return result;
                         }
                     }
                 }
@@ -49473,11 +49589,11 @@ var ts;
                 // constituents of 'target'. If any combination does not have a match then 'source' is not relatable.
                 var discriminantCombinations = ts.cartesianProduct(sourceDiscriminantTypes);
                 var matchingTypes = [];
-                var _loop_12 = function (combination) {
+                var _loop_13 = function (combination) {
                     var hasMatch = false;
                     outer: for (var _i = 0, _a = target.types; _i < _a.length; _i++) {
                         var type = _a[_i];
-                        var _loop_13 = function (i) {
+                        var _loop_14 = function (i) {
                             var sourceProperty = sourcePropertiesFiltered[i];
                             var targetProperty = getPropertyOfType(type, sourceProperty.escapedName);
                             if (!targetProperty)
@@ -49493,8 +49609,8 @@ var ts;
                             }
                         };
                         for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
-                            var state_6 = _loop_13(i);
-                            switch (state_6) {
+                            var state_7 = _loop_14(i);
+                            switch (state_7) {
                                 case "continue-outer": continue outer;
                             }
                         }
@@ -49507,9 +49623,9 @@ var ts;
                 };
                 for (var _a = 0, discriminantCombinations_1 = discriminantCombinations; _a < discriminantCombinations_1.length; _a++) {
                     var combination = discriminantCombinations_1[_a];
-                    var state_5 = _loop_12(combination);
-                    if (typeof state_5 === "object")
-                        return state_5.value;
+                    var state_6 = _loop_13(combination);
+                    if (typeof state_6 === "object")
+                        return state_6.value;
                 }
                 // Compare the remaining non-discriminant properties of each match.
                 var result = -1 /* True */;
@@ -50094,7 +50210,7 @@ var ts;
                 // The emptyArray singleton is used to signal a recursive invocation.
                 cache.variances = ts.emptyArray;
                 variances = [];
-                var _loop_14 = function (tp) {
+                var _loop_15 = function (tp) {
                     var unmeasurable = false;
                     var unreliable = false;
                     var oldHandler = outofbandVarianceMarkerHandler;
@@ -50124,7 +50240,7 @@ var ts;
                 };
                 for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
                     var tp = typeParameters_1[_i];
-                    _loop_14(tp);
+                    _loop_15(tp);
                 }
                 cache.variances = variances;
             }
@@ -51232,7 +51348,7 @@ var ts;
         function inferTypes(inferences, originalSource, originalTarget, priority, contravariant) {
             if (priority === void 0) { priority = 0; }
             if (contravariant === void 0) { contravariant = false; }
-            var symbolStack;
+            var symbolOrTypeStack;
             var visited;
             var bivariant = false;
             var propagationType;
@@ -51411,8 +51527,8 @@ var ts;
                     priority = savePriority;
                 }
                 else if (target.flags & 134217728 /* Awaited */) {
-                    var targetTypes = [target.awaitedType, createPromiseLikeType(target.awaitedType)];
-                    inferToMultipleTypes(source, targetTypes, target.flags);
+                    inferFromTypes(source, target.awaitedType);
+                    inferFromTypes(source, createPromiseLikeType(target.awaitedType));
                 }
                 else if (target.flags & 3145728 /* UnionOrIntersection */) {
                     inferToMultipleTypes(source, target.types, target.flags);
@@ -51539,10 +51655,34 @@ var ts;
                 }
                 return typeVariable;
             }
+            function isPromiseForType(promiseType, promisedType) {
+                var _a;
+                return isThenableType(promiseType) && unwrapAwaitedType((_a = getPromisedTypeOfPromise(promiseType)) !== null && _a !== void 0 ? _a : errorType) === promisedType;
+            }
             function inferToMultipleTypes(source, targets, targetFlags) {
                 var typeVariableCount = 0;
                 if (targetFlags & 1048576 /* Union */) {
                     var nakedTypeVariable = void 0;
+                    for (var _i = 0, targets_2 = targets; _i < targets_2.length; _i++) {
+                        var t = targets_2[_i];
+                        if (getInferenceInfoForType(t)) {
+                            nakedTypeVariable = t;
+                            typeVariableCount++;
+                        }
+                    }
+                    // To better support backwards compatibility with the new `awaited` type, we detect a target
+                    // union of exactly `T | PromiseLike<T>` (for any compatible `PromiseLike`). When encountered,
+                    // we infer from source to the type parameter `T`, where each type of source is mapped to extract
+                    // the promised type of any promise (e.g., `string | Promise<number>` becomes `string | number`).
+                    if (typeVariableCount === 1 && targets.length === 2) {
+                        for (var _a = 0, targets_3 = targets; _a < targets_3.length; _a++) {
+                            var t = targets_3[_a];
+                            if (!getInferenceInfoForType(t) && isPromiseForType(t, nakedTypeVariable)) {
+                                inferFromTypes(mapType(source, function (s) { var _a; return (_a = getPromisedTypeOfPromise(s)) !== null && _a !== void 0 ? _a : s; }), nakedTypeVariable);
+                                return;
+                            }
+                        }
+                    }
                     var sources = source.flags & 1048576 /* Union */ ? source.types : [source];
                     var matched_1 = new Array(sources.length);
                     var inferenceCircularity = false;
@@ -51550,13 +51690,9 @@ var ts;
                     // track whether inferences were made from that particular type to some target with
                     // equal priority (i.e. of equal quality) to what we would infer for a naked type
                     // parameter.
-                    for (var _i = 0, targets_2 = targets; _i < targets_2.length; _i++) {
-                        var t = targets_2[_i];
-                        if (getInferenceInfoForType(t)) {
-                            nakedTypeVariable = t;
-                            typeVariableCount++;
-                        }
-                        else {
+                    for (var _b = 0, targets_4 = targets; _b < targets_4.length; _b++) {
+                        var t = targets_4[_b];
+                        if (!getInferenceInfoForType(t)) {
                             for (var i = 0; i < sources.length; i++) {
                                 var saveInferencePriority = inferencePriority;
                                 inferencePriority = 512 /* MaxValue */;
@@ -51594,8 +51730,8 @@ var ts;
                     // We infer from types that are not naked type variables first so that inferences we
                     // make from nested naked type variables and given slightly higher priority by virtue
                     // of being first in the candidates array.
-                    for (var _a = 0, targets_3 = targets; _a < targets_3.length; _a++) {
-                        var t = targets_3[_a];
+                    for (var _c = 0, targets_5 = targets; _c < targets_5.length; _c++) {
+                        var t = targets_5[_c];
                         if (getInferenceInfoForType(t)) {
                             typeVariableCount++;
                         }
@@ -51609,8 +51745,8 @@ var ts;
                 // we want to infer string for T, not Promise<string> | string. For intersection types
                 // we only infer to single naked type variables.
                 if (targetFlags & 2097152 /* Intersection */ ? typeVariableCount === 1 : typeVariableCount > 0) {
-                    for (var _b = 0, targets_4 = targets; _b < targets_4.length; _b++) {
-                        var t = targets_4[_b];
+                    for (var _d = 0, targets_6 = targets; _d < targets_6.length; _d++) {
+                        var t = targets_6[_d];
                         if (getInferenceInfoForType(t)) {
                             inferWithPriority(source, t, 1 /* NakedTypeVariable */);
                         }
@@ -51675,15 +51811,15 @@ var ts;
                 // its symbol with the instance side which would lead to false positives.
                 var isNonConstructorObject = target.flags & 524288 /* Object */ &&
                     !(ts.getObjectFlags(target) & 16 /* Anonymous */ && target.symbol && target.symbol.flags & 32 /* Class */);
-                var symbol = isNonConstructorObject ? target.symbol : undefined;
-                if (symbol) {
-                    if (ts.contains(symbolStack, symbol)) {
+                var symbolOrType = isNonConstructorObject ? isTupleType(target) ? target.target : target.symbol : undefined;
+                if (symbolOrType) {
+                    if (ts.contains(symbolOrTypeStack, symbolOrType)) {
                         inferencePriority = -1 /* Circularity */;
                         return;
                     }
-                    (symbolStack || (symbolStack = [])).push(symbol);
+                    (symbolOrTypeStack || (symbolOrTypeStack = [])).push(symbolOrType);
                     inferFromObjectTypesWorker(source, target);
-                    symbolStack.pop();
+                    symbolOrTypeStack.pop();
                 }
                 else {
                     inferFromObjectTypesWorker(source, target);
@@ -52012,6 +52148,12 @@ var ts;
             }
             return false;
         }
+        // Given a source x, check if target matches x or is an && operation with an operand that matches x.
+        function containsTruthyCheck(source, target) {
+            return isMatchingReference(source, target) ||
+                (target.kind === 210 /* BinaryExpression */ && target.operatorToken.kind === 55 /* AmpersandAmpersandToken */ &&
+                    (containsTruthyCheck(source, target.left) || containsTruthyCheck(source, target.right)));
+        }
         function getAccessedPropertyName(access) {
             return access.kind === 195 /* PropertyAccessExpression */ ? access.name.escapedText :
                 ts.isStringOrNumericLiteralLike(access.argumentExpression) ? ts.escapeLeadingUnderscores(access.argumentExpression.text) :
@@ -52258,7 +52400,7 @@ var ts;
                 case 232 /* ForInStatement */:
                     return stringType;
                 case 233 /* ForOfStatement */:
-                    return checkRightHandSideOfForOf(parent.expression, parent.awaitModifier) || errorType;
+                    return checkRightHandSideOfForOf(parent) || errorType;
                 case 210 /* BinaryExpression */:
                     return getAssignedTypeOfBinaryExpression(parent);
                 case 204 /* DeleteExpression */:
@@ -52299,7 +52441,7 @@ var ts;
                 return stringType;
             }
             if (node.parent.parent.kind === 233 /* ForOfStatement */) {
-                return checkRightHandSideOfForOf(node.parent.parent.expression, node.parent.parent.awaitModifier) || errorType;
+                return checkRightHandSideOfForOf(node.parent.parent) || errorType;
             }
             return errorType;
         }
@@ -52531,20 +52673,29 @@ var ts;
             return isLengthPushOrUnshift || isElementAssignment;
         }
         function isDeclarationWithExplicitTypeAnnotation(declaration) {
-            return !!(declaration && (declaration.kind === 243 /* VariableDeclaration */ || declaration.kind === 157 /* Parameter */ ||
+            return (declaration.kind === 243 /* VariableDeclaration */ || declaration.kind === 157 /* Parameter */ ||
                 declaration.kind === 160 /* PropertyDeclaration */ || declaration.kind === 159 /* PropertySignature */) &&
-                ts.getEffectiveTypeAnnotationNode(declaration));
+                !!ts.getEffectiveTypeAnnotationNode(declaration);
         }
         function getExplicitTypeOfSymbol(symbol, diagnostic) {
             if (symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 512 /* ValueModule */)) {
                 return getTypeOfSymbol(symbol);
             }
             if (symbol.flags & (3 /* Variable */ | 4 /* Property */)) {
-                if (isDeclarationWithExplicitTypeAnnotation(symbol.valueDeclaration)) {
-                    return getTypeOfSymbol(symbol);
-                }
-                if (diagnostic && symbol.valueDeclaration) {
-                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(symbol.valueDeclaration, ts.Diagnostics._0_needs_an_explicit_type_annotation, symbolToString(symbol)));
+                var declaration = symbol.valueDeclaration;
+                if (declaration) {
+                    if (isDeclarationWithExplicitTypeAnnotation(declaration)) {
+                        return getTypeOfSymbol(symbol);
+                    }
+                    if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 233 /* ForOfStatement */) {
+                        var expressionType = getTypeOfDottedName(declaration.parent.parent.expression, /*diagnostic*/ undefined);
+                        if (expressionType) {
+                            return getForOfIterationType(declaration.parent.parent, expressionType);
+                        }
+                    }
+                    if (diagnostic) {
+                        ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(declaration, ts.Diagnostics._0_needs_an_explicit_type_annotation, symbolToString(symbol)));
+                    }
                 }
             }
         }
@@ -53309,14 +53460,22 @@ var ts;
                 if (type.flags & 1 /* Any */ && literal.text === "function") {
                     return type;
                 }
+                if (assumeTrue && type.flags & 2 /* Unknown */ && literal.text === "object") {
+                    // The pattern x && typeof x === 'object', where x is of type unknown, narrows x to type object. We don't
+                    // need to check for the reverse typeof x === 'object' && x since that already narrows correctly.
+                    if (typeOfExpr.parent.parent.kind === 210 /* BinaryExpression */) {
+                        var expr = typeOfExpr.parent.parent;
+                        if (expr.operatorToken.kind === 55 /* AmpersandAmpersandToken */ && expr.right === typeOfExpr.parent && containsTruthyCheck(reference, expr.left)) {
+                            return nonPrimitiveType;
+                        }
+                    }
+                    return getUnionType([nonPrimitiveType, nullType]);
+                }
                 var facts = assumeTrue ?
                     typeofEQFacts.get(literal.text) || 128 /* TypeofEQHostObject */ :
                     typeofNEFacts.get(literal.text) || 32768 /* TypeofNEHostObject */;
                 return getTypeWithFacts(assumeTrue ? mapType(type, narrowTypeForTypeof) : type, facts);
                 function narrowTypeForTypeof(type) {
-                    if (type.flags & 2 /* Unknown */ && literal.text === "object") {
-                        return getUnionType([nonPrimitiveType, nullType]);
-                    }
                     // 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.
@@ -53591,7 +53750,10 @@ var ts;
                         }
                         if (strictNullChecks && assumeTrue && optionalChainContainsReference(predicateArgument, reference) &&
                             !(getTypeFacts(predicate.type) & 65536 /* EQUndefined */)) {
-                            return getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
+                            type = getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
+                        }
+                        if (isMatchingReferenceDiscriminant(predicateArgument, declaredType)) {
+                            return narrowTypeByDiscriminant(type, predicateArgument, function (t) { return getNarrowedType(t, predicate.type, assumeTrue, isTypeSubtypeOf); });
                         }
                     }
                 }
@@ -55473,8 +55635,8 @@ var ts;
             var inDestructuringPattern = ts.isAssignmentTarget(node);
             // Grammar checking
             checkGrammarObjectLiteralExpression(node, inDestructuringPattern);
-            var propertiesTable;
-            var allPropertiesTable = ts.createSymbolTable();
+            var allPropertiesTable = strictNullChecks ? ts.createSymbolTable() : undefined;
+            var propertiesTable = ts.createSymbolTable();
             var propertiesArray = [];
             var spread = emptyObjectType;
             var contextualType = getApparentTypeOfContextualType(node);
@@ -55489,7 +55651,6 @@ var ts;
             var patternWithComputedProperties = false;
             var hasComputedStringProperty = false;
             var hasComputedNumberProperty = false;
-            propertiesTable = ts.createSymbolTable();
             var offset = 0;
             for (var i = 0; i < node.properties.length; i++) {
                 var memberDecl = node.properties[i];
@@ -55548,7 +55709,7 @@ var ts;
                     prop.type = type;
                     prop.target = member;
                     member = prop;
-                    allPropertiesTable.set(prop.escapedName, prop);
+                    allPropertiesTable === null || allPropertiesTable === void 0 ? void 0 : allPropertiesTable.set(prop.escapedName, prop);
                 }
                 else if (memberDecl.kind === 284 /* SpreadAssignment */) {
                     if (languageVersion < 2 /* ES2015 */) {
@@ -55566,15 +55727,8 @@ var ts;
                         error(memberDecl, ts.Diagnostics.Spread_types_may_only_be_created_from_object_types);
                         return errorType;
                     }
-                    for (var _i = 0, _a = getPropertiesOfType(type); _i < _a.length; _i++) {
-                        var right = _a[_i];
-                        var rightType = getTypeOfSymbol(right);
-                        var left = allPropertiesTable.get(right.escapedName);
-                        if (strictNullChecks &&
-                            left &&
-                            !maybeTypeOfKind(rightType, 98304 /* Nullable */)) {
-                            error(left.valueDeclaration, ts.Diagnostics._0_is_specified_more_than_once_so_this_usage_will_be_overwritten, ts.unescapeLeadingUnderscores(left.escapedName));
-                        }
+                    if (allPropertiesTable) {
+                        checkSpreadPropOverrides(type, allPropertiesTable, memberDecl);
                     }
                     spread = getSpreadType(spread, type, node.symbol, objectFlags, inConstContext);
                     offset = i + 1;
@@ -55612,8 +55766,8 @@ var ts;
             // If the object literal is spread into another object literal, skip this step and let the top-level object
             // literal handle it instead.
             if (contextualTypeHasPattern && node.parent.kind !== 284 /* SpreadAssignment */) {
-                for (var _b = 0, _c = getPropertiesOfType(contextualType); _b < _c.length; _b++) {
-                    var prop = _c[_b];
+                for (var _i = 0, _a = getPropertiesOfType(contextualType); _i < _a.length; _i++) {
+                    var prop = _a[_i];
                     if (!propertiesTable.get(prop.escapedName) && !getPropertyOfType(spread, prop.escapedName)) {
                         if (!(prop.flags & 16777216 /* Optional */)) {
                             error(prop.valueDeclaration || prop.bindingElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
@@ -55726,6 +55880,7 @@ var ts;
          */
         function createJsxAttributesTypeFromAttributesProperty(openingLikeElement, checkMode) {
             var attributes = openingLikeElement.attributes;
+            var allAttributesTable = strictNullChecks ? ts.createSymbolTable() : undefined;
             var attributesTable = ts.createSymbolTable();
             var spread = emptyJsxObjectType;
             var hasSpreadAnyType = false;
@@ -55748,6 +55903,7 @@ var ts;
                     attributeSymbol.type = exprType;
                     attributeSymbol.target = member;
                     attributesTable.set(attributeSymbol.escapedName, attributeSymbol);
+                    allAttributesTable === null || allAttributesTable === void 0 ? void 0 : allAttributesTable.set(attributeSymbol.escapedName, attributeSymbol);
                     if (attributeDecl.name.escapedText === jsxChildrenPropertyName) {
                         explicitlySpecifyChildrenAttribute = true;
                     }
@@ -55764,6 +55920,9 @@ var ts;
                     }
                     if (isValidSpreadType(exprType)) {
                         spread = getSpreadType(spread, exprType, attributes.symbol, objectFlags, /*readonly*/ false);
+                        if (allAttributesTable) {
+                            checkSpreadPropOverrides(exprType, allAttributesTable, attributeDecl);
+                        }
                     }
                     else {
                         typeToIntersect = typeToIntersect ? getIntersectionType([typeToIntersect, exprType]) : exprType;
@@ -55839,6 +55998,16 @@ var ts;
             }
             return childrenTypes;
         }
+        function checkSpreadPropOverrides(type, props, spread) {
+            for (var _i = 0, _a = getPropertiesOfType(type); _i < _a.length; _i++) {
+                var right = _a[_i];
+                var left = props.get(right.escapedName);
+                if (left && !maybeTypeOfKind(getTypeOfSymbol(right), 98304 /* Nullable */)) {
+                    var diagnostic = error(left.valueDeclaration, ts.Diagnostics._0_is_specified_more_than_once_so_this_usage_will_be_overwritten, ts.unescapeLeadingUnderscores(left.escapedName));
+                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(spread, ts.Diagnostics.This_spread_always_overwrites_this_property));
+                }
+            }
+        }
         /**
          * Check attributes property of opening-like element. This function is called during chooseOverload to get call signature of a JSX opening-like element.
          * (See "checkApplicableSignatureForJsxOpeningLikeElement" for how the function is used)
@@ -57750,7 +57919,7 @@ var ts;
                         var min_3 = Number.MAX_VALUE;
                         var minIndex = 0;
                         var i_1 = 0;
-                        var _loop_15 = function (c) {
+                        var _loop_16 = function (c) {
                             var chain_2 = function () { return ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Overload_0_of_1_2_gave_the_following_error, i_1 + 1, candidates.length, signatureToString(c)); };
                             var diags_2 = getSignatureApplicabilityError(node, args, c, assignableRelation, 0 /* Normal */, /*reportErrors*/ true, chain_2);
                             if (diags_2) {
@@ -57768,7 +57937,7 @@ var ts;
                         };
                         for (var _a = 0, candidatesForArgumentError_1 = candidatesForArgumentError; _a < candidatesForArgumentError_1.length; _a++) {
                             var c = candidatesForArgumentError_1[_a];
-                            _loop_15(c);
+                            _loop_16(c);
                         }
                         var diags_3 = max > 1 ? allDiagnostics[minIndex] : ts.flatten(allDiagnostics);
                         ts.Debug.assert(diags_3.length > 0, "No errors reported for 3 or fewer overload signatures");
@@ -57902,7 +58071,7 @@ var ts;
             }
             var _a = ts.minAndMax(candidates, getNumNonRestParameters), minArgumentCount = _a.min, maxNonRestParam = _a.max;
             var parameters = [];
-            var _loop_16 = function (i) {
+            var _loop_17 = function (i) {
                 var symbols = ts.mapDefined(candidates, function (s) { return signatureHasRestParameter(s) ?
                     i < s.parameters.length - 1 ? s.parameters[i] : ts.last(s.parameters) :
                     i < s.parameters.length ? s.parameters[i] : undefined; });
@@ -57910,7 +58079,7 @@ var ts;
                 parameters.push(createCombinedSymbolFromTypes(symbols, ts.mapDefined(candidates, function (candidate) { return tryGetTypeAtPosition(candidate, i); })));
             };
             for (var i = 0; i < maxNonRestParam; i++) {
-                _loop_16(i);
+                _loop_17(i);
             }
             var restParameterSymbols = ts.mapDefined(candidates, function (c) { return signatureHasRestParameter(c) ? ts.last(c.parameters) : undefined; });
             var flags = 0 /* None */;
@@ -59016,7 +59185,7 @@ var ts;
             var globalPromiseType = getGlobalPromiseType(/*reportErrors*/ true);
             if (globalPromiseType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || unknownType;
+                promisedType = unwrapAwaitedType(getAwaitedType(promisedType) || unknownType);
                 return createTypeReference(globalPromiseType, [promisedType]);
             }
             return unknownType;
@@ -59026,7 +59195,7 @@ var ts;
             var globalPromiseLikeType = getGlobalPromiseLikeType(/*reportErrors*/ true);
             if (globalPromiseLikeType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || unknownType;
+                promisedType = unwrapAwaitedType(getAwaitedType(promisedType) || unknownType);
                 return createTypeReference(globalPromiseLikeType, [promisedType]);
             }
             return unknownType;
@@ -61081,6 +61250,9 @@ var ts;
                 if (!(func.kind === 163 /* Constructor */ && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
+                if (func.kind === 163 /* Constructor */ && ts.isIdentifier(node.name) && node.name.escapedText === "constructor") {
+                    error(node.name, ts.Diagnostics.constructor_cannot_be_used_as_a_parameter_property_name);
+                }
             }
             if (node.questionToken && ts.isBindingPattern(node.name) && func.body) {
                 error(node, ts.Diagnostics.A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature);
@@ -62200,6 +62372,9 @@ var ts;
          *   - The type has no base constraint,
          *   - OR The base constraint of the type is `any`, `unknown`, `object`, or the empty object `{}`,
          *   - OR The base constraint has a callable `then` member.
+         * This behavior is not entirely sound, as a `T extends { x: any }` could be instantiated with a
+         * subtype that has a callable `then`, however this is unlikely in practice and this slightly more unsound
+         * behavior is much more developer friendly.
          */
         function isGenericAwaitableType(type) {
             if (isGenericObjectType(type)) {
@@ -63560,7 +63735,7 @@ var ts;
             }
             else {
                 var varExpr = node.initializer;
-                var iteratedType = checkRightHandSideOfForOf(node.expression, node.awaitModifier);
+                var iteratedType = checkRightHandSideOfForOf(node);
                 // There may be a destructuring assignment on the left side
                 if (varExpr.kind === 193 /* ArrayLiteralExpression */ || varExpr.kind === 194 /* ObjectLiteralExpression */) {
                     // iteratedType may be undefined. In this case, we still want to check the structure of
@@ -63637,10 +63812,12 @@ var ts;
                 checkVariableDeclaration(decl);
             }
         }
-        function checkRightHandSideOfForOf(rhsExpression, awaitModifier) {
-            var expressionType = checkNonNullExpression(rhsExpression);
-            var use = awaitModifier ? 15 /* ForAwaitOf */ : 13 /* ForOf */;
-            return checkIteratedTypeOrElementType(use, expressionType, undefinedType, rhsExpression);
+        function checkRightHandSideOfForOf(statement) {
+            return getForOfIterationType(statement, checkNonNullExpression(statement.expression));
+        }
+        function getForOfIterationType(statement, expressionType) {
+            var use = statement.awaitModifier ? 15 /* ForAwaitOf */ : 13 /* ForOf */;
+            return checkIteratedTypeOrElementType(use, expressionType, undefinedType, statement.expression);
         }
         function checkIteratedTypeOrElementType(use, inputType, sentType, errorNode) {
             if (isTypeAny(inputType)) {
@@ -64760,7 +64937,7 @@ var ts;
         function issueMemberSpecificError(node, typeWithThis, baseWithThis, broadDiag) {
             // iterate over all implemented properties and issue errors on each one which isn't compatible, rather than the class as a whole, if possible
             var issuedMemberError = false;
-            var _loop_17 = function (member) {
+            var _loop_18 = function (member) {
                 if (ts.hasStaticModifier(member)) {
                     return "continue";
                 }
@@ -64779,7 +64956,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_17(member);
+                _loop_18(member);
             }
             if (!issuedMemberError) {
                 // check again with diagnostics to generate a less-specific error
@@ -66676,7 +66853,7 @@ var ts;
             //     for ( { a } of elems) {
             //     }
             if (expr.parent.kind === 233 /* ForOfStatement */) {
-                var iteratedType = checkRightHandSideOfForOf(expr.parent.expression, expr.parent.awaitModifier);
+                var iteratedType = checkRightHandSideOfForOf(expr.parent);
                 return checkDestructuringAssignment(expr, iteratedType || errorType);
             }
             // If this is from "for" initializer
@@ -71294,6 +71471,11 @@ var ts;
     }
     ts.createJSDocParamTag = createJSDocParamTag;
     /* @internal */
+    function createJSDocClassTag() {
+        return createJSDocTag(311 /* JSDocClassTag */, "class");
+    }
+    ts.createJSDocClassTag = createJSDocClassTag;
+    /* @internal */
     function createJSDocComment(comment, tags) {
         var node = createSynthesizedNode(304 /* JSDocComment */);
         node.comment = comment;
@@ -72312,6 +72494,12 @@ var ts;
         return node;
     }
     ts.moveSyntheticComments = moveSyntheticComments;
+    /** @internal */
+    function ignoreSourceNewlines(node) {
+        getOrCreateEmitNode(node).flags |= 134217728 /* IgnoreSourceNewlines */;
+        return node;
+    }
+    ts.ignoreSourceNewlines = ignoreSourceNewlines;
     /**
      * Gets the constant value to emit for an expression.
      */
@@ -91922,8 +92110,8 @@ var ts;
                         declFileName = paths.declarationFilePath || paths.jsFilePath || file.fileName;
                     }
                     if (declFileName) {
-                        var specifier = ts.moduleSpecifiers.getModuleSpecifier(__assign(__assign({}, options), { baseUrl: options.baseUrl && ts.toPath(options.baseUrl, host.getCurrentDirectory(), host.getCanonicalFileName) }), currentSourceFile, ts.toPath(outputFilePath, host.getCurrentDirectory(), host.getCanonicalFileName), ts.toPath(declFileName, host.getCurrentDirectory(), host.getCanonicalFileName), host, host.getSourceFiles(), 
-                        /*preferences*/ undefined, host.redirectTargetsMap);
+                        var specifier = ts.moduleSpecifiers.getModuleSpecifier(__assign(__assign({}, options), { baseUrl: options.baseUrl && ts.toPath(options.baseUrl, host.getCurrentDirectory(), host.getCanonicalFileName) }), currentSourceFile, ts.toPath(outputFilePath, host.getCurrentDirectory(), host.getCanonicalFileName), ts.toPath(declFileName, host.getCurrentDirectory(), host.getCanonicalFileName), host, 
+                        /*preferences*/ undefined);
                         if (!ts.pathIsRelative(specifier)) {
                             // If some compiler option/symlink/whatever allows access to the file containing the ambient module declaration
                             // via a non-relative name, emit a type reference directive to that non-relative name, rather than
@@ -91938,7 +92126,7 @@ var ts;
                         }
                         // omit references to files from node_modules (npm may disambiguate module
                         // references when installing this package, making the path is unreliable).
-                        if (ts.startsWith(fileName, "node_modules/") || fileName.indexOf("/node_modules/") !== -1) {
+                        if (ts.startsWith(fileName, "node_modules/") || ts.pathContainsNodeModules(fileName)) {
                             return;
                         }
                         references.push({ pos: -1, end: -1, fileName: fileName });
@@ -93977,6 +94165,7 @@ var ts;
             getLibFileFromReference: ts.notImplemented,
             isSourceFileFromExternalLibrary: ts.returnFalse,
             getResolvedProjectReferenceToRedirect: ts.returnUndefined,
+            getProjectReferenceRedirect: ts.returnUndefined,
             isSourceOfProjectReferenceRedirect: ts.returnFalse,
             writeFile: function (name, text, writeByteOrderMark) {
                 switch (name) {
@@ -94016,7 +94205,6 @@ var ts;
             isEmitBlocked: ts.returnFalse,
             readFile: function (f) { return host.readFile(f); },
             fileExists: function (f) { return host.fileExists(f); },
-            directoryExists: host.directoryExists && (function (f) { return host.directoryExists(f); }),
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
             getProgramBuildInfo: ts.returnUndefined,
             getSourceFileFromReference: ts.returnUndefined,
@@ -94051,6 +94239,7 @@ var ts;
         var tempFlags; // TempFlags for the current name generation scope.
         var reservedNamesStack; // Stack of TempFlags reserved in enclosing name generation scopes.
         var reservedNames; // TempFlags to reserve in nested name generation scopes.
+        var preserveSourceNewlines = printerOptions.preserveSourceNewlines; // Can be overridden inside nodes with the `IgnoreSourceNewlines` emit flag.
         var writer;
         var ownWriter; // Reusable `EmitTextWriter` for basic printing.
         var write = writeBase;
@@ -94333,14 +94522,19 @@ var ts;
         function pipelineEmit(emitHint, node) {
             var savedLastNode = lastNode;
             var savedLastSubstitution = lastSubstitution;
+            var savedPreserveSourceNewlines = preserveSourceNewlines;
             lastNode = node;
             lastSubstitution = undefined;
+            if (preserveSourceNewlines && !!(ts.getEmitFlags(node) & 134217728 /* IgnoreSourceNewlines */)) {
+                preserveSourceNewlines = false;
+            }
             var pipelinePhase = getPipelinePhase(0 /* Notification */, emitHint, node);
             pipelinePhase(emitHint, node);
             ts.Debug.assert(lastNode === node);
             var substitute = lastSubstitution;
             lastNode = savedLastNode;
             lastSubstitution = savedLastSubstitution;
+            preserveSourceNewlines = savedPreserveSourceNewlines;
             return substitute || node;
         }
         function getPipelinePhase(phase, emitHint, node) {
@@ -95327,9 +95521,9 @@ var ts;
         function emitPropertyAccessExpression(node) {
             var expression = ts.cast(emitExpression(node.expression), ts.isExpression);
             var token = node.questionDotToken || ts.createNode(24 /* DotToken */, node.expression.end, node.name.pos);
-            var indentBeforeDot = needsIndentation(node, node.expression, token);
-            var indentAfterDot = needsIndentation(node, token, node.name);
-            increaseIndentIf(indentBeforeDot, /*writeSpaceIfNotIndenting*/ false);
+            var linesBeforeDot = getLinesBetweenNodes(node, node.expression, token);
+            var linesAfterDot = getLinesBetweenNodes(node, token, node.name);
+            writeLinesAndIndent(linesBeforeDot, /*writeSpaceIfNotIndenting*/ false);
             var shouldEmitDotDot = token.kind !== 28 /* QuestionDotToken */ &&
                 mayNeedDotDotForPropertyAccess(expression) &&
                 !writer.hasTrailingComment() &&
@@ -95343,9 +95537,9 @@ var ts;
             else {
                 emitTokenWithComment(token.kind, node.expression.end, writePunctuation, node);
             }
-            increaseIndentIf(indentAfterDot, /*writeSpaceIfNotIndenting*/ false);
+            writeLinesAndIndent(linesAfterDot, /*writeSpaceIfNotIndenting*/ false);
             emit(node.name);
-            decreaseIndentIf(indentBeforeDot, indentAfterDot);
+            decreaseIndentIf(linesBeforeDot, linesAfterDot);
         }
         // 1..toString is a valid property access, emit a dot after the literal
         // Also emit a dot if expression is a integer const enum value - it will appear in generated code as numeric literal
@@ -95400,7 +95594,16 @@ var ts;
         }
         function emitParenthesizedExpression(node) {
             var openParenPos = emitTokenWithComment(20 /* OpenParenToken */, node.pos, writePunctuation, node);
+            var leadingNewlines = preserveSourceNewlines && getLeadingLineTerminatorCount(node, [node.expression], 0 /* None */);
+            if (leadingNewlines) {
+                writeLinesAndIndent(leadingNewlines, /*writeLinesIfNotIndenting*/ false);
+            }
             emitExpression(node.expression);
+            var trailingNewlines = preserveSourceNewlines && getClosingLineTerminatorCount(node, [node.expression], 0 /* None */);
+            if (trailingNewlines) {
+                writeLine(trailingNewlines);
+            }
+            decreaseIndentIf(leadingNewlines);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression ? node.expression.end : openParenPos, writePunctuation, node);
         }
         function emitFunctionExpression(node) {
@@ -95492,20 +95695,20 @@ var ts;
                     }
                     case 1 /* EmitRight */: {
                         var isCommaOperator = node.operatorToken.kind !== 27 /* CommaToken */;
-                        var indentBeforeOperator = needsIndentation(node, node.left, node.operatorToken);
-                        var indentAfterOperator = needsIndentation(node, node.operatorToken, node.right);
-                        increaseIndentIf(indentBeforeOperator, isCommaOperator);
+                        var linesBeforeOperator = getLinesBetweenNodes(node, node.left, node.operatorToken);
+                        var linesAfterOperator = getLinesBetweenNodes(node, node.operatorToken, node.right);
+                        writeLinesAndIndent(linesBeforeOperator, isCommaOperator);
                         emitLeadingCommentsOfPosition(node.operatorToken.pos);
                         writeTokenNode(node.operatorToken, node.operatorToken.kind === 97 /* InKeyword */ ? writeKeyword : writeOperator);
                         emitTrailingCommentsOfPosition(node.operatorToken.end, /*prefixSpace*/ true); // Binary operators should have a space before the comment starts
-                        increaseIndentIf(indentAfterOperator, /*writeSpaceIfNotIndenting*/ true);
+                        writeLinesAndIndent(linesAfterOperator, /*writeSpaceIfNotIndenting*/ true);
                         maybePipelineEmitExpression(node.right);
                         break;
                     }
                     case 2 /* FinishEmit */: {
-                        var indentBeforeOperator = needsIndentation(node, node.left, node.operatorToken);
-                        var indentAfterOperator = needsIndentation(node, node.operatorToken, node.right);
-                        decreaseIndentIf(indentBeforeOperator, indentAfterOperator);
+                        var linesBeforeOperator = getLinesBetweenNodes(node, node.left, node.operatorToken);
+                        var linesAfterOperator = getLinesBetweenNodes(node, node.operatorToken, node.right);
+                        decreaseIndentIf(linesBeforeOperator, linesAfterOperator);
                         stackIndex--;
                         break;
                     }
@@ -95541,21 +95744,21 @@ var ts;
             }
         }
         function emitConditionalExpression(node) {
-            var indentBeforeQuestion = needsIndentation(node, node.condition, node.questionToken);
-            var indentAfterQuestion = needsIndentation(node, node.questionToken, node.whenTrue);
-            var indentBeforeColon = needsIndentation(node, node.whenTrue, node.colonToken);
-            var indentAfterColon = needsIndentation(node, node.colonToken, node.whenFalse);
+            var linesBeforeQuestion = getLinesBetweenNodes(node, node.condition, node.questionToken);
+            var linesAfterQuestion = getLinesBetweenNodes(node, node.questionToken, node.whenTrue);
+            var linesBeforeColon = getLinesBetweenNodes(node, node.whenTrue, node.colonToken);
+            var linesAfterColon = getLinesBetweenNodes(node, node.colonToken, node.whenFalse);
             emitExpression(node.condition);
-            increaseIndentIf(indentBeforeQuestion, /*writeSpaceIfNotIndenting*/ true);
+            writeLinesAndIndent(linesBeforeQuestion, /*writeSpaceIfNotIndenting*/ true);
             emit(node.questionToken);
-            increaseIndentIf(indentAfterQuestion, /*writeSpaceIfNotIndenting*/ true);
+            writeLinesAndIndent(linesAfterQuestion, /*writeSpaceIfNotIndenting*/ true);
             emitExpression(node.whenTrue);
-            decreaseIndentIf(indentBeforeQuestion, indentAfterQuestion);
-            increaseIndentIf(indentBeforeColon, /*writeSpaceIfNotIndenting*/ true);
+            decreaseIndentIf(linesBeforeQuestion, linesAfterQuestion);
+            writeLinesAndIndent(linesBeforeColon, /*writeSpaceIfNotIndenting*/ true);
             emit(node.colonToken);
-            increaseIndentIf(indentAfterColon, /*writeSpaceIfNotIndenting*/ true);
+            writeLinesAndIndent(linesAfterColon, /*writeSpaceIfNotIndenting*/ true);
             emitExpression(node.whenFalse);
-            decreaseIndentIf(indentBeforeColon, indentAfterColon);
+            decreaseIndentIf(linesBeforeColon, linesAfterColon);
         }
         function emitTemplateExpression(node) {
             emit(node.head);
@@ -95896,14 +96099,14 @@ var ts;
             if (!ts.nodeIsSynthesized(body) && !ts.rangeIsOnSingleLine(body, currentSourceFile)) {
                 return false;
             }
-            if (shouldWriteLeadingLineTerminator(body, body.statements, 2 /* PreserveLines */)
-                || shouldWriteClosingLineTerminator(body, body.statements, 2 /* PreserveLines */)) {
+            if (getLeadingLineTerminatorCount(body, body.statements, 2 /* PreserveLines */)
+                || getClosingLineTerminatorCount(body, body.statements, 2 /* PreserveLines */)) {
                 return false;
             }
             var previousStatement;
             for (var _a = 0, _b = body.statements; _a < _b.length; _a++) {
                 var statement = _b[_a];
-                if (shouldWriteSeparatingLineTerminator(previousStatement, statement, 2 /* PreserveLines */)) {
+                if (getSeparatingLineTerminatorCount(previousStatement, statement, 2 /* PreserveLines */) > 0) {
                     return false;
                 }
                 previousStatement = statement;
@@ -96865,7 +97068,7 @@ var ts;
             }
             if (isEmpty) {
                 // Write a line terminator if the parent node was multi-line
-                if (format & 1 /* MultiLine */) {
+                if (format & 1 /* MultiLine */ && !(preserveSourceNewlines && ts.rangeIsOnSingleLine(parentNode, currentSourceFile))) {
                     writeLine();
                 }
                 else if (format & 256 /* SpaceBetweenBraces */ && !(format & 524288 /* NoSpaceIfEmpty */)) {
@@ -96876,8 +97079,9 @@ var ts;
                 // Write the opening line terminator or leading whitespace.
                 var mayEmitInterveningComments = (format & 262144 /* NoInterveningComments */) === 0;
                 var shouldEmitInterveningComments = mayEmitInterveningComments;
-                if (shouldWriteLeadingLineTerminator(parentNode, children, format)) { // TODO: GH#18217
-                    writeLine();
+                var leadingLineTerminatorCount = getLeadingLineTerminatorCount(parentNode, children, format); // TODO: GH#18217
+                if (leadingLineTerminatorCount) {
+                    writeLine(leadingLineTerminatorCount);
                     shouldEmitInterveningComments = false;
                 }
                 else if (format & 256 /* SpaceBetweenBraces */) {
@@ -96912,14 +97116,15 @@ var ts;
                         writeDelimiter(format);
                         recordBundleFileInternalSectionEnd(previousSourceFileTextKind);
                         // Write either a line terminator or whitespace to separate the elements.
-                        if (shouldWriteSeparatingLineTerminator(previousSibling, child, format)) {
+                        var separatingLineTerminatorCount = getSeparatingLineTerminatorCount(previousSibling, child, format);
+                        if (separatingLineTerminatorCount > 0) {
                             // If a synthesized node in a single-line list starts on a new
                             // line, we should increase the indent.
                             if ((format & (3 /* LinesMask */ | 128 /* Indented */)) === 0 /* SingleLine */) {
                                 increaseIndent();
                                 shouldDecreaseIndentAfterEmit = true;
                             }
-                            writeLine();
+                            writeLine(separatingLineTerminatorCount);
                             shouldEmitInterveningComments = false;
                         }
                         else if (previousSibling && format & 512 /* SpaceBetweenSiblings */) {
@@ -96964,8 +97169,9 @@ var ts;
                 }
                 recordBundleFileInternalSectionEnd(previousSourceFileTextKind);
                 // Write the closing line terminator or closing whitespace.
-                if (shouldWriteClosingLineTerminator(parentNode, children, format)) {
-                    writeLine();
+                var closingLineTerminatorCount = getClosingLineTerminatorCount(parentNode, children, format);
+                if (closingLineTerminatorCount) {
+                    writeLine(closingLineTerminatorCount);
                 }
                 else if (format & 256 /* SpaceBetweenBraces */) {
                     writeSpace();
@@ -97019,8 +97225,11 @@ var ts;
         function writeProperty(s) {
             writer.writeProperty(s);
         }
-        function writeLine() {
-            writer.writeLine();
+        function writeLine(count) {
+            if (count === void 0) { count = 1; }
+            for (var i = 0; i < count; i++) {
+                writer.writeLine(i > 0);
+            }
         }
         function increaseIndent() {
             writer.increaseIndent();
@@ -97067,10 +97276,10 @@ var ts;
                 }
             }
         }
-        function increaseIndentIf(value, writeSpaceIfNotIndenting) {
-            if (value) {
+        function writeLinesAndIndent(lineCount, writeSpaceIfNotIndenting) {
+            if (lineCount) {
                 increaseIndent();
-                writeLine();
+                writeLine(lineCount);
             }
             else if (writeSpaceIfNotIndenting) {
                 writeSpace();
@@ -97088,70 +97297,101 @@ var ts;
                 decreaseIndent();
             }
         }
-        function shouldWriteLeadingLineTerminator(parentNode, children, format) {
-            if (format & 1 /* MultiLine */) {
-                return true;
-            }
-            if (format & 2 /* PreserveLines */) {
+        function getLeadingLineTerminatorCount(parentNode, children, format) {
+            if (format & 2 /* PreserveLines */ || preserveSourceNewlines) {
                 if (format & 65536 /* PreferNewLine */) {
-                    return true;
+                    return 1;
                 }
-                var firstChild = children[0];
-                if (firstChild === undefined) {
-                    return !ts.rangeIsOnSingleLine(parentNode, currentSourceFile);
+                var firstChild_1 = children[0];
+                if (firstChild_1 === undefined) {
+                    return ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
                 }
-                else if (ts.positionIsSynthesized(parentNode.pos) || ts.nodeIsSynthesized(firstChild)) {
-                    return synthesizedNodeStartsOnNewLine(firstChild, format);
+                if (firstChild_1.kind === 11 /* JsxText */) {
+                    // JsxText will be written with its leading whitespace, so don't add more manually.
+                    return 0;
                 }
-                else {
-                    return !ts.rangeStartPositionsAreOnSameLine(parentNode, firstChild, currentSourceFile);
+                if (!ts.positionIsSynthesized(parentNode.pos) && !ts.nodeIsSynthesized(firstChild_1) && firstChild_1.parent === parentNode) {
+                    if (preserveSourceNewlines) {
+                        return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter(firstChild_1.pos, currentSourceFile, includeComments); });
+                    }
+                    return ts.rangeStartPositionsAreOnSameLine(parentNode, firstChild_1, currentSourceFile) ? 0 : 1;
+                }
+                if (synthesizedNodeStartsOnNewLine(firstChild_1, format)) {
+                    return 1;
                 }
             }
-            else {
-                return false;
-            }
+            return format & 1 /* MultiLine */ ? 1 : 0;
         }
-        function shouldWriteSeparatingLineTerminator(previousNode, nextNode, format) {
-            if (format & 1 /* MultiLine */) {
-                return true;
-            }
-            else if (format & 2 /* PreserveLines */) {
+        function getSeparatingLineTerminatorCount(previousNode, nextNode, format) {
+            if (format & 2 /* PreserveLines */ || preserveSourceNewlines) {
                 if (previousNode === undefined || nextNode === undefined) {
-                    return false;
+                    return 0;
                 }
-                else if (ts.nodeIsSynthesized(previousNode) || ts.nodeIsSynthesized(nextNode)) {
-                    return synthesizedNodeStartsOnNewLine(previousNode, format) || synthesizedNodeStartsOnNewLine(nextNode, format);
+                if (nextNode.kind === 11 /* JsxText */) {
+                    // JsxText will be written with its leading whitespace, so don't add more manually.
+                    return 0;
                 }
-                else {
-                    return !ts.rangeEndIsOnSameLineAsRangeStart(previousNode, nextNode, currentSourceFile);
+                else if (!ts.nodeIsSynthesized(previousNode) && !ts.nodeIsSynthesized(nextNode) && previousNode.parent === nextNode.parent) {
+                    if (preserveSourceNewlines) {
+                        return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenRangeEndAndRangeStart(previousNode, nextNode, currentSourceFile, includeComments); });
+                    }
+                    return ts.rangeEndIsOnSameLineAsRangeStart(previousNode, nextNode, currentSourceFile) ? 0 : 1;
+                }
+                else if (synthesizedNodeStartsOnNewLine(previousNode, format) || synthesizedNodeStartsOnNewLine(nextNode, format)) {
+                    return 1;
                 }
             }
-            else {
-                return ts.getStartsOnNewLine(nextNode);
+            else if (ts.getStartsOnNewLine(nextNode)) {
+                return 1;
             }
+            return format & 1 /* MultiLine */ ? 1 : 0;
         }
-        function shouldWriteClosingLineTerminator(parentNode, children, format) {
-            if (format & 1 /* MultiLine */) {
-                return (format & 131072 /* NoTrailingNewLine */) === 0;
-            }
-            else if (format & 2 /* PreserveLines */) {
+        function getClosingLineTerminatorCount(parentNode, children, format) {
+            if (format & 2 /* PreserveLines */ || preserveSourceNewlines) {
                 if (format & 65536 /* PreferNewLine */) {
-                    return true;
+                    return 1;
                 }
-                var lastChild = ts.lastOrUndefined(children);
-                if (lastChild === undefined) {
-                    return !ts.rangeIsOnSingleLine(parentNode, currentSourceFile);
+                var lastChild_1 = ts.lastOrUndefined(children);
+                if (lastChild_1 === undefined) {
+                    return ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
                 }
-                else if (ts.positionIsSynthesized(parentNode.pos) || ts.nodeIsSynthesized(lastChild)) {
-                    return synthesizedNodeStartsOnNewLine(lastChild, format);
+                if (!ts.positionIsSynthesized(parentNode.pos) && !ts.nodeIsSynthesized(lastChild_1) && lastChild_1.parent === parentNode) {
+                    if (preserveSourceNewlines) {
+                        return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenPositionAndNextNonWhitespaceCharacter(lastChild_1.end, currentSourceFile, includeComments); });
+                    }
+                    return ts.rangeEndPositionsAreOnSameLine(parentNode, lastChild_1, currentSourceFile) ? 0 : 1;
                 }
-                else {
-                    return !ts.rangeEndPositionsAreOnSameLine(parentNode, lastChild, currentSourceFile);
+                if (synthesizedNodeStartsOnNewLine(lastChild_1, format)) {
+                    return 1;
                 }
             }
-            else {
-                return false;
+            if (format & 1 /* MultiLine */ && !(format & 131072 /* NoTrailingNewLine */)) {
+                return 1;
             }
+            return 0;
+        }
+        function getEffectiveLines(getLineDifference) {
+            // If 'preserveSourceNewlines' is disabled, we should never call this function
+            // because it could be more expensive than alternative approximations.
+            ts.Debug.assert(!!preserveSourceNewlines);
+            // We start by measuring the line difference from a position to its adjacent comments,
+            // so that this is counted as a one-line difference, not two:
+            //
+            //   node1;
+            //   // NODE2 COMMENT
+            //   node2;
+            var lines = getLineDifference(/*includeComments*/ true);
+            if (lines === 0) {
+                // However, if the line difference considering comments was 0, we might have this:
+                //
+                //   node1; // NODE2 COMMENT
+                //   node2;
+                //
+                // in which case we should be ignoring node2's comment, so this too is counted as
+                // a one-line difference, not zero.
+                return getLineDifference(/*includeComments*/ false);
+            }
+            return lines;
         }
         function synthesizedNodeStartsOnNewLine(node, format) {
             if (ts.nodeIsSynthesized(node)) {
@@ -97163,21 +97403,24 @@ var ts;
             }
             return (format & 65536 /* PreferNewLine */) !== 0;
         }
-        function needsIndentation(parent, node1, node2) {
+        function getLinesBetweenNodes(parent, node1, node2) {
             if (ts.getEmitFlags(parent) & 131072 /* NoIndentation */) {
-                return false;
+                return 0;
             }
             parent = skipSynthesizedParentheses(parent);
             node1 = skipSynthesizedParentheses(node1);
             node2 = skipSynthesizedParentheses(node2);
             // Always use a newline for synthesized code if the synthesizer desires it.
             if (ts.getStartsOnNewLine(node2)) {
-                return true;
+                return 1;
             }
-            return !ts.nodeIsSynthesized(parent)
-                && !ts.nodeIsSynthesized(node1)
-                && !ts.nodeIsSynthesized(node2)
-                && !ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile);
+            if (!ts.nodeIsSynthesized(parent) && !ts.nodeIsSynthesized(node1) && !ts.nodeIsSynthesized(node2)) {
+                if (preserveSourceNewlines) {
+                    return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenRangeEndAndRangeStart(node1, node2, currentSourceFile, includeComments); });
+                }
+                return ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile) ? 0 : 1;
+            }
+            return 0;
         }
         function isEmptyBlock(block) {
             return block.statements.length === 0
@@ -99010,14 +99253,14 @@ var ts;
         var mapFromToProjectReferenceRedirectSource;
         var useSourceOfProjectReferenceRedirect = !!((_a = host.useSourceOfProjectReferenceRedirect) === null || _a === void 0 ? void 0 : _a.call(host)) &&
             !options.disableSourceOfProjectReferenceRedirect;
-        var onProgramCreateComplete = updateHostForUseSourceOfProjectReferenceRedirect({
+        var _b = updateHostForUseSourceOfProjectReferenceRedirect({
             compilerHost: host,
             useSourceOfProjectReferenceRedirect: useSourceOfProjectReferenceRedirect,
             toPath: toPath,
             getResolvedProjectReferences: getResolvedProjectReferences,
             getSourceOfProjectReferenceRedirect: getSourceOfProjectReferenceRedirect,
             forEachResolvedProjectReference: forEachResolvedProjectReference
-        });
+        }), onProgramCreateComplete = _b.onProgramCreateComplete, fileExists = _b.fileExists;
         var shouldCreateNewSourceFile = shouldProgramCreateNewSourceFiles(oldProgram, options);
         // We set `structuralIsReused` to `undefined` because `tryReuseStructureFromOldProgram` calls `tryReuseStructureFromOldProgram` which checks
         // `structuralIsReused`, which would be a TDZ violation if it was not set in advance to `undefined`.
@@ -99038,8 +99281,8 @@ var ts;
                         var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out;
                         if (useSourceOfProjectReferenceRedirect) {
                             if (out || ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) {
-                                for (var _b = 0, _c = parsedRef.commandLine.fileNames; _b < _c.length; _b++) {
-                                    var fileName = _c[_b];
+                                for (var _c = 0, _d = parsedRef.commandLine.fileNames; _c < _d.length; _c++) {
+                                    var fileName = _d[_c];
                                     processSourceFile(fileName, /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
                                 }
                             }
@@ -99049,8 +99292,8 @@ var ts;
                                 processSourceFile(ts.changeExtension(out, ".d.ts"), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
                             }
                             else if (ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) {
-                                for (var _d = 0, _e = parsedRef.commandLine.fileNames; _d < _e.length; _d++) {
-                                    var fileName = _e[_d];
+                                for (var _e = 0, _f = parsedRef.commandLine.fileNames; _e < _f.length; _e++) {
+                                    var fileName = _f[_e];
                                     if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) && !ts.fileExtensionIs(fileName, ".json" /* Json */)) {
                                         processSourceFile(ts.getOutputDeclarationFileName(fileName, parsedRef.commandLine, !host.useCaseSensitiveFileNames()), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
                                     }
@@ -99102,8 +99345,8 @@ var ts;
         // not part of the new program.
         if (oldProgram && host.onReleaseOldSourceFile) {
             var oldSourceFiles = oldProgram.getSourceFiles();
-            for (var _f = 0, oldSourceFiles_1 = oldSourceFiles; _f < oldSourceFiles_1.length; _f++) {
-                var oldSourceFile = oldSourceFiles_1[_f];
+            for (var _g = 0, oldSourceFiles_1 = oldSourceFiles; _g < oldSourceFiles_1.length; _g++) {
+                var oldSourceFile = oldSourceFiles_1[_g];
                 var newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
                 if (shouldCreateNewSourceFile || !newFile ||
                     // old file wasnt redirect but new file is
@@ -99168,6 +99411,7 @@ var ts;
             forEachResolvedProjectReference: forEachResolvedProjectReference,
             isSourceOfProjectReferenceRedirect: isSourceOfProjectReferenceRedirect,
             emitBuildInfo: emitBuildInfo,
+            fileExists: fileExists,
             getProbableSymlinks: getProbableSymlinks,
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
         };
@@ -99611,11 +99855,26 @@ var ts;
             return oldProgram.structureIsReused = 2 /* Completely */;
         }
         function getEmitHost(writeFileCallback) {
-            return __assign(__assign({ getPrependNodes: getPrependNodes,
-                getCanonicalFileName: getCanonicalFileName, getCommonSourceDirectory: program.getCommonSourceDirectory, getCompilerOptions: program.getCompilerOptions, getCurrentDirectory: function () { return currentDirectory; }, getNewLine: function () { return host.getNewLine(); }, getSourceFile: program.getSourceFile, getSourceFileByPath: program.getSourceFileByPath, getSourceFiles: program.getSourceFiles, getLibFileFromReference: program.getLibFileFromReference, isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
+            return {
+                getPrependNodes: getPrependNodes,
+                getCanonicalFileName: getCanonicalFileName,
+                getCommonSourceDirectory: program.getCommonSourceDirectory,
+                getCompilerOptions: program.getCompilerOptions,
+                getCurrentDirectory: function () { return currentDirectory; },
+                getNewLine: function () { return host.getNewLine(); },
+                getSourceFile: program.getSourceFile,
+                getSourceFileByPath: program.getSourceFileByPath,
+                getSourceFiles: program.getSourceFiles,
+                getLibFileFromReference: program.getLibFileFromReference,
+                isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
                 getResolvedProjectReferenceToRedirect: getResolvedProjectReferenceToRedirect,
+                getProjectReferenceRedirect: getProjectReferenceRedirect,
                 isSourceOfProjectReferenceRedirect: isSourceOfProjectReferenceRedirect,
-                getProbableSymlinks: getProbableSymlinks, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, fileExists: function (f) {
+                getProbableSymlinks: getProbableSymlinks,
+                writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }),
+                isEmitBlocked: isEmitBlocked,
+                readFile: function (f) { return host.readFile(f); },
+                fileExists: function (f) {
                     // Use local caches
                     var path = toPath(f);
                     if (getSourceFileByPath(path))
@@ -99624,7 +99883,12 @@ var ts;
                         return false;
                     // Before falling back to the host
                     return host.fileExists(f);
-                } }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {})), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); }, redirectTargetsMap: redirectTargetsMap });
+                },
+                useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
+                getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); },
+                getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); },
+                redirectTargetsMap: redirectTargetsMap,
+            };
         }
         function emitBuildInfo(writeFileCallback) {
             ts.Debug.assert(!options.out && !options.outFile);
@@ -100286,7 +100550,7 @@ var ts;
                 }
                 var sourceFileWithAddedExtension = ts.forEach(supportedExtensions, function (extension) { return getSourceFile(fileName + extension); });
                 if (fail && !sourceFileWithAddedExtension)
-                    fail(ts.Diagnostics.File_0_not_found, fileName + ".ts" /* Ts */);
+                    fail(ts.Diagnostics.Could_not_resolve_the_path_0_with_the_extensions_Colon_1, fileName, "'" + supportedExtensions.join("', '") + "'");
                 return sourceFileWithAddedExtension;
             }
         }
@@ -101290,20 +101554,8 @@ var ts;
         var originalGetDirectories = host.compilerHost.getDirectories;
         var originalRealpath = host.compilerHost.realpath;
         if (!host.useSourceOfProjectReferenceRedirect)
-            return ts.noop;
-        // This implementation of fileExists checks if the file being requested is
-        // .d.ts file for the referenced Project.
-        // If it is it returns true irrespective of whether that file exists on host
-        host.compilerHost.fileExists = function (file) {
-            if (originalFileExists.call(host.compilerHost, file))
-                return true;
-            if (!host.getResolvedProjectReferences())
-                return false;
-            if (!ts.isDeclarationFileName(file))
-                return false;
-            // Project references go to source file instead of .d.ts file
-            return fileOrDirectoryExistsUsingSource(file, /*isFile*/ true);
-        };
+            return { onProgramCreateComplete: ts.noop, fileExists: fileExists };
+        host.compilerHost.fileExists = fileExists;
         if (originalDirectoryExists) {
             // This implementation of directoryExists checks if the directory being requested is
             // directory of .d.ts file for the referenced Project.
@@ -101352,13 +101604,26 @@ var ts;
                     originalRealpath.call(host.compilerHost, s);
             };
         }
-        return onProgramCreateComplete;
+        return { onProgramCreateComplete: onProgramCreateComplete, fileExists: fileExists };
         function onProgramCreateComplete() {
             host.compilerHost.fileExists = originalFileExists;
             host.compilerHost.directoryExists = originalDirectoryExists;
             host.compilerHost.getDirectories = originalGetDirectories;
             // DO not revert realpath as it could be used later
         }
+        // This implementation of fileExists checks if the file being requested is
+        // .d.ts file for the referenced Project.
+        // If it is it returns true irrespective of whether that file exists on host
+        function fileExists(file) {
+            if (originalFileExists.call(host.compilerHost, file))
+                return true;
+            if (!host.getResolvedProjectReferences())
+                return false;
+            if (!ts.isDeclarationFileName(file))
+                return false;
+            // Project references go to source file instead of .d.ts file
+            return fileOrDirectoryExistsUsingSource(file, /*isFile*/ true);
+        }
         function fileExistsIfProjectReferenceDts(file) {
             var source = host.getSourceOfProjectReferenceRedirect(file);
             return source !== undefined ?
@@ -101544,8 +101809,8 @@ var ts;
 (function (ts) {
     function getFileEmitOutput(program, sourceFile, emitOnlyDtsFiles, cancellationToken, customTransformers, forceDtsEmit) {
         var outputFiles = [];
-        var emitResult = program.emit(sourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers, forceDtsEmit);
-        return { outputFiles: outputFiles, emitSkipped: emitResult.emitSkipped, exportedModulesFromDeclarationEmit: emitResult.exportedModulesFromDeclarationEmit };
+        var _a = program.emit(sourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers, forceDtsEmit), emitSkipped = _a.emitSkipped, diagnostics = _a.diagnostics, exportedModulesFromDeclarationEmit = _a.exportedModulesFromDeclarationEmit;
+        return { outputFiles: outputFiles, emitSkipped: emitSkipped, diagnostics: diagnostics, exportedModulesFromDeclarationEmit: exportedModulesFromDeclarationEmit };
         function writeFile(fileName, text, writeByteOrderMark) {
             outputFiles.push({ name: fileName, writeByteOrderMark: writeByteOrderMark, text: text });
         }
@@ -101753,12 +102018,14 @@ var ts;
          * This should be called whenever it is safe to commit the state of the builder
          */
         function updateSignaturesFromCache(state, signatureCache) {
-            signatureCache.forEach(function (signature, path) {
-                state.fileInfos.get(path).signature = signature;
-                state.hasCalledUpdateShapeSignature.set(path, true);
-            });
+            signatureCache.forEach(function (signature, path) { return updateSignatureOfFile(state, signature, path); });
         }
         BuilderState.updateSignaturesFromCache = updateSignaturesFromCache;
+        function updateSignatureOfFile(state, signature, path) {
+            state.fileInfos.get(path).signature = signature;
+            state.hasCalledUpdateShapeSignature.set(path, true);
+        }
+        BuilderState.updateSignatureOfFile = updateSignatureOfFile;
         /**
          * Returns if the shape of the signature has changed since last emit
          */
@@ -103632,39 +103899,39 @@ var ts;
                     ts.getEmitModuleResolutionKind(compilerOptions) !== ts.ModuleResolutionKind.NodeJs || ts.endsWith(oldImportSpecifier, "index") ? 1 /* Index */ : 0 /* Minimal */,
             };
         }
-        function updateModuleSpecifier(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, oldImportSpecifier) {
-            var res = getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, getPreferencesForUpdate(compilerOptions, oldImportSpecifier));
+        function updateModuleSpecifier(compilerOptions, importingSourceFileName, toFileName, host, oldImportSpecifier) {
+            var res = getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, getPreferencesForUpdate(compilerOptions, oldImportSpecifier));
             if (res === oldImportSpecifier)
                 return undefined;
             return res;
         }
         moduleSpecifiers.updateModuleSpecifier = updateModuleSpecifier;
         // Note: importingSourceFile is just for usesJsExtensionOnImports
-        function getModuleSpecifier(compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, files, preferences, redirectTargetsMap) {
+        function getModuleSpecifier(compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, preferences) {
             if (preferences === void 0) { preferences = {}; }
-            return getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, getPreferences(preferences, compilerOptions, importingSourceFile));
+            return getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, getPreferences(preferences, compilerOptions, importingSourceFile));
         }
         moduleSpecifiers.getModuleSpecifier = getModuleSpecifier;
-        function getNodeModulesPackageName(compilerOptions, importingSourceFileName, nodeModulesFileName, host, files, redirectTargetsMap) {
+        function getNodeModulesPackageName(compilerOptions, importingSourceFileName, nodeModulesFileName, host) {
             var info = getInfo(importingSourceFileName, host);
-            var modulePaths = getAllModulePaths(files, importingSourceFileName, nodeModulesFileName, info.getCanonicalFileName, host, redirectTargetsMap);
+            var modulePaths = getAllModulePaths(importingSourceFileName, nodeModulesFileName, host);
             return ts.firstDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions, /*packageNameOnly*/ true); });
         }
         moduleSpecifiers.getNodeModulesPackageName = getNodeModulesPackageName;
-        function getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, preferences) {
+        function getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, preferences) {
             var info = getInfo(importingSourceFileName, host);
-            var modulePaths = getAllModulePaths(files, importingSourceFileName, toFileName, info.getCanonicalFileName, host, redirectTargetsMap);
+            var modulePaths = getAllModulePaths(importingSourceFileName, toFileName, host);
             return ts.firstDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions); }) ||
                 getLocalModuleSpecifier(toFileName, info, compilerOptions, preferences);
         }
         /** Returns an import for each symlink and for the realpath. */
-        function getModuleSpecifiers(moduleSymbol, compilerOptions, importingSourceFile, host, files, userPreferences, redirectTargetsMap) {
+        function getModuleSpecifiers(moduleSymbol, compilerOptions, importingSourceFile, host, userPreferences) {
             var ambient = tryGetModuleNameFromAmbientModule(moduleSymbol);
             if (ambient)
                 return [ambient];
             var info = getInfo(importingSourceFile.path, host);
             var moduleSourceFile = ts.getSourceFileOfNode(moduleSymbol.valueDeclaration || ts.getNonAugmentationDeclaration(moduleSymbol));
-            var modulePaths = getAllModulePaths(files, importingSourceFile.path, moduleSourceFile.originalFileName, info.getCanonicalFileName, host, redirectTargetsMap);
+            var modulePaths = getAllModulePaths(importingSourceFile.path, moduleSourceFile.originalFileName, host);
             var preferences = getPreferences(userPreferences, compilerOptions, importingSourceFile);
             var global = ts.mapDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions); });
             return global.length ? global : modulePaths.map(function (moduleFileName) { return getLocalModuleSpecifier(moduleFileName, info, compilerOptions, preferences); });
@@ -103723,10 +103990,12 @@ var ts;
         function comparePathsByNumberOfDirectorySeparators(a, b) {
             return ts.compareValues(numberOfDirectorySeparators(a), numberOfDirectorySeparators(b));
         }
-        function forEachFileNameOfModule(files, importingFileName, importedFileName, getCanonicalFileName, host, redirectTargetsMap, preferSymlinks, cb) {
-            var redirects = redirectTargetsMap.get(importedFileName);
-            var importedFileNames = redirects ? __spreadArrays(redirects, [importedFileName]) : [importedFileName];
-            var cwd = host.getCurrentDirectory ? host.getCurrentDirectory() : "";
+        function forEachFileNameOfModule(importingFileName, importedFileName, host, preferSymlinks, cb) {
+            var getCanonicalFileName = ts.hostGetCanonicalFileName(host);
+            var cwd = host.getCurrentDirectory();
+            var referenceRedirect = host.isSourceOfProjectReferenceRedirect(importedFileName) ? host.getProjectReferenceRedirect(importedFileName) : undefined;
+            var redirects = host.redirectTargetsMap.get(ts.toPath(importedFileName, cwd, getCanonicalFileName)) || ts.emptyArray;
+            var importedFileNames = __spreadArrays((referenceRedirect ? [referenceRedirect] : ts.emptyArray), [importedFileName], redirects);
             var targets = importedFileNames.map(function (f) { return ts.getNormalizedAbsolutePath(f, cwd); });
             if (!preferSymlinks) {
                 var result_10 = ts.forEach(targets, cb);
@@ -103734,8 +104003,8 @@ var ts;
                     return result_10;
             }
             var links = host.getProbableSymlinks
-                ? host.getProbableSymlinks(files)
-                : ts.discoverProbableSymlinks(files, getCanonicalFileName, cwd);
+                ? host.getProbableSymlinks(host.getSourceFiles())
+                : ts.discoverProbableSymlinks(host.getSourceFiles(), getCanonicalFileName, cwd);
             var compareStrings = (!host.useCaseSensitiveFileNames || host.useCaseSensitiveFileNames()) ? ts.compareStringsCaseSensitive : ts.compareStringsCaseInsensitive;
             var result = ts.forEachEntry(links, function (resolved, path) {
                 if (ts.startsWithDirectory(importingFileName, resolved, getCanonicalFileName)) {
@@ -103760,22 +104029,28 @@ var ts;
          * Looks for existing imports that use symlinks to this module.
          * Symlinks will be returned first so they are preferred over the real path.
          */
-        function getAllModulePaths(files, importingFileName, importedFileName, getCanonicalFileName, host, redirectTargetsMap) {
-            var cwd = host.getCurrentDirectory ? host.getCurrentDirectory() : "";
+        function getAllModulePaths(importingFileName, importedFileName, host) {
+            var cwd = host.getCurrentDirectory();
+            var getCanonicalFileName = ts.hostGetCanonicalFileName(host);
             var allFileNames = ts.createMap();
-            forEachFileNameOfModule(files, importingFileName, importedFileName, getCanonicalFileName, host, redirectTargetsMap, 
+            var importedFileFromNodeModules = false;
+            forEachFileNameOfModule(importingFileName, importedFileName, host, 
             /*preferSymlinks*/ true, function (path) {
                 // dont return value, so we collect everything
                 allFileNames.set(path, getCanonicalFileName(path));
+                importedFileFromNodeModules = importedFileFromNodeModules || ts.pathContainsNodeModules(path);
             });
             // Sort by paths closest to importing file Name directory
             var sortedPaths = [];
-            var _loop_18 = function (directory) {
+            var _loop_19 = function (directory) {
                 var directoryStart = ts.ensureTrailingDirectorySeparator(directory);
                 var pathsInDirectory;
                 allFileNames.forEach(function (canonicalFileName, fileName) {
                     if (ts.startsWith(canonicalFileName, directoryStart)) {
-                        (pathsInDirectory || (pathsInDirectory = [])).push(fileName);
+                        // If the importedFile is from node modules, use only paths in node_modules folder as option
+                        if (!importedFileFromNodeModules || ts.pathContainsNodeModules(fileName)) {
+                            (pathsInDirectory || (pathsInDirectory = [])).push(fileName);
+                        }
                         allFileNames.delete(fileName);
                     }
                 });
@@ -103793,9 +104068,9 @@ var ts;
             };
             var out_directory_1;
             for (var directory = ts.getDirectoryPath(ts.toPath(importingFileName, cwd, getCanonicalFileName)); allFileNames.size !== 0;) {
-                var state_7 = _loop_18(directory);
+                var state_8 = _loop_19(directory);
                 directory = out_directory_1;
-                if (state_7 === "break")
+                if (state_8 === "break")
                     break;
             }
             if (allFileNames.size) {
@@ -108648,14 +108923,27 @@ var ts;
         return !!compilerOptions.module || compilerOptions.target >= 2 /* ES2015 */ || !!compilerOptions.noEmit;
     }
     ts.compilerOptionsIndicateEs6Modules = compilerOptionsIndicateEs6Modules;
-    function hostUsesCaseSensitiveFileNames(host) {
-        return host.useCaseSensitiveFileNames ? host.useCaseSensitiveFileNames() : false;
+    function createModuleSpecifierResolutionHost(program, host) {
+        // Mix in `getProbableSymlinks` from Program when host doesn't have it
+        // in order for non-Project hosts to have a symlinks cache.
+        return {
+            fileExists: function (fileName) { return program.fileExists(fileName); },
+            getCurrentDirectory: function () { return host.getCurrentDirectory(); },
+            readFile: ts.maybeBind(host, host.readFile),
+            useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames),
+            getProbableSymlinks: ts.maybeBind(host, host.getProbableSymlinks) || (function () { return program.getProbableSymlinks(); }),
+            getGlobalTypingsCacheLocation: ts.maybeBind(host, host.getGlobalTypingsCacheLocation),
+            getSourceFiles: function () { return program.getSourceFiles(); },
+            redirectTargetsMap: program.redirectTargetsMap,
+            getProjectReferenceRedirect: function (fileName) { return program.getProjectReferenceRedirect(fileName); },
+            isSourceOfProjectReferenceRedirect: function (fileName) { return program.isSourceOfProjectReferenceRedirect(fileName); },
+        };
     }
-    ts.hostUsesCaseSensitiveFileNames = hostUsesCaseSensitiveFileNames;
-    function hostGetCanonicalFileName(host) {
-        return ts.createGetCanonicalFileName(hostUsesCaseSensitiveFileNames(host));
+    ts.createModuleSpecifierResolutionHost = createModuleSpecifierResolutionHost;
+    function getModuleSpecifierResolverHost(program, host) {
+        return __assign(__assign({}, createModuleSpecifierResolutionHost(program, host)), { getCommonSourceDirectory: function () { return program.getCommonSourceDirectory(); } });
     }
-    ts.hostGetCanonicalFileName = hostGetCanonicalFileName;
+    ts.getModuleSpecifierResolverHost = getModuleSpecifierResolverHost;
     function makeImportIfNecessary(defaultImport, namedImports, moduleSpecifier, quotePreference) {
         return defaultImport || namedImports && namedImports.length ? makeImport(defaultImport, namedImports, moduleSpecifier, quotePreference) : undefined;
     }
@@ -109350,6 +109638,7 @@ var ts;
         return checker.getTypeAtLocation(caseClause.parent.parent.expression);
     }
     ts.getSwitchedType = getSwitchedType;
+    ts.ANONYMOUS = "anonymous function";
     function getTypeNodeIfAccessible(type, enclosingScope, program, host) {
         var checker = program.getTypeChecker();
         var typeIsAccessible = true;
@@ -109361,14 +109650,7 @@ var ts;
             reportInaccessibleThisError: notAccessible,
             reportPrivateInBaseOfClassExpression: notAccessible,
             reportInaccessibleUniqueSymbolError: notAccessible,
-            moduleResolverHost: {
-                readFile: host.readFile,
-                fileExists: host.fileExists,
-                directoryExists: host.directoryExists,
-                getSourceFiles: program.getSourceFiles,
-                getCurrentDirectory: program.getCurrentDirectory,
-                getCommonSourceDirectory: program.getCommonSourceDirectory,
-            }
+            moduleResolverHost: getModuleSpecifierResolverHost(program, host)
         });
         return typeIsAccessible ? res : undefined;
     }
@@ -115696,17 +115978,19 @@ var ts;
                 return exposedByParent ? scope.getSourceFile() : scope; // TODO: GH#18217
             }
             /** Used as a quick check for whether a symbol is used at all in a file (besides its definition). */
-            function isSymbolReferencedInFile(definition, checker, sourceFile) {
-                return eachSymbolReferenceInFile(definition, checker, sourceFile, function () { return true; }) || false;
+            function isSymbolReferencedInFile(definition, checker, sourceFile, searchContainer) {
+                if (searchContainer === void 0) { searchContainer = sourceFile; }
+                return eachSymbolReferenceInFile(definition, checker, sourceFile, function () { return true; }, searchContainer) || false;
             }
             Core.isSymbolReferencedInFile = isSymbolReferencedInFile;
-            function eachSymbolReferenceInFile(definition, checker, sourceFile, cb) {
+            function eachSymbolReferenceInFile(definition, checker, sourceFile, cb, searchContainer) {
+                if (searchContainer === void 0) { searchContainer = sourceFile; }
                 var symbol = ts.isParameterPropertyDeclaration(definition.parent, definition.parent.parent)
                     ? ts.first(checker.getSymbolsOfParameterPropertyDeclaration(definition.parent, definition.text))
                     : checker.getSymbolAtLocation(definition);
                 if (!symbol)
                     return undefined;
-                for (var _i = 0, _a = getPossibleSymbolReferenceNodes(sourceFile, symbol.name); _i < _a.length; _i++) {
+                for (var _i = 0, _a = getPossibleSymbolReferenceNodes(sourceFile, symbol.name, searchContainer); _i < _a.length; _i++) {
                     var token = _a[_i];
                     if (!ts.isIdentifier(token) || token === definition || token.escapedText !== definition.escapedText)
                         continue;
@@ -117095,7 +117379,7 @@ var ts;
                     : getSourceFileToImport(importedModuleSymbol, importLiteral, sourceFile, program, host, oldToNew);
                 // Need an update if the imported file moved, or the importing file moved and was using a relative path.
                 return toImport !== undefined && (toImport.updated || (importingSourceFileMoved && ts.pathIsRelative(importLiteral.text)))
-                    ? ts.moduleSpecifiers.updateModuleSpecifier(program.getCompilerOptions(), newImportFromPath, toImport.newFileName, host, allFiles, program.redirectTargetsMap, importLiteral.text)
+                    ? ts.moduleSpecifiers.updateModuleSpecifier(program.getCompilerOptions(), newImportFromPath, toImport.newFileName, ts.createModuleSpecifierResolutionHost(program, host), importLiteral.text)
                     : undefined;
             });
         };
@@ -117420,7 +117704,7 @@ var ts;
             function getConstructSignatureDefinition() {
                 // Applicable only if we are in a new expression, or we are on a constructor declaration
                 // and in either case the symbol has a construct signature definition, i.e. class
-                if (symbol.flags & 32 /* Class */ && !(symbol.flags & 16 /* Function */) && (ts.isNewExpressionTarget(node) || node.kind === 130 /* ConstructorKeyword */)) {
+                if (symbol.flags & 32 /* Class */ && !(symbol.flags & (16 /* Function */ | 3 /* Variable */)) && (ts.isNewExpressionTarget(node) || node.kind === 130 /* ConstructorKeyword */)) {
                     var cls = ts.find(filteredDeclarations, ts.isClassLike) || ts.Debug.fail("Expected declaration to have at least one class-like declaration");
                     return getSignatureDefinition(cls.members, /*selectConstructors*/ true);
                 }
@@ -123903,8 +124187,8 @@ var ts;
                     },
                     getIndentation: function () { return indentation; },
                     getDelta: getDelta,
-                    recomputeIndentation: function (lineAdded) {
-                        if (node.parent && formatting.SmartIndenter.shouldIndentChildNode(options, node.parent, node, sourceFile)) {
+                    recomputeIndentation: function (lineAdded, parent) {
+                        if (formatting.SmartIndenter.shouldIndentChildNode(options, parent, node, sourceFile)) {
                             indentation += lineAdded ? options.indentSize : -options.indentSize;
                             delta = formatting.SmartIndenter.shouldIndentChildNode(options, node) ? options.indentSize : 0;
                         }
@@ -124238,7 +124522,7 @@ var ts;
                                 // Handle the case where the next line is moved to be the end of this line.
                                 // In this case we don't indent the next line in the next pass.
                                 if (currentParent.getStart(sourceFile) === currentItem.pos) {
-                                    dynamicIndentation.recomputeIndentation(/*lineAddedByFormatting*/ false);
+                                    dynamicIndentation.recomputeIndentation(/*lineAddedByFormatting*/ false, contextNode);
                                 }
                                 break;
                             case 1 /* LineAdded */:
@@ -124246,7 +124530,7 @@ var ts;
                                 // In this case we indent token2 in the next pass but we set
                                 // sameLineIndent flag to notify the indenter that the indentation is within the line.
                                 if (currentParent.getStart(sourceFile) === currentItem.pos) {
-                                    dynamicIndentation.recomputeIndentation(/*lineAddedByFormatting*/ true);
+                                    dynamicIndentation.recomputeIndentation(/*lineAddedByFormatting*/ true, contextNode);
                                 }
                                 break;
                             default:
@@ -125362,9 +125646,18 @@ var ts;
                     suffix: (ts.isLineBreak(sourceFile.text.charCodeAt(pos)) ? "" : this.newLineCharacter) + (blankLineBetween ? this.newLineCharacter : ""),
                 });
             };
+            ChangeTracker.prototype.insertFirstParameter = function (sourceFile, parameters, newParam) {
+                var p0 = ts.firstOrUndefined(parameters);
+                if (p0) {
+                    this.insertNodeBefore(sourceFile, p0, newParam);
+                }
+                else {
+                    this.insertNodeAt(sourceFile, parameters.pos, newParam);
+                }
+            };
             ChangeTracker.prototype.insertNodeBefore = function (sourceFile, before, newNode, blankLineBetween) {
                 if (blankLineBetween === void 0) { blankLineBetween = false; }
-                this.insertNodeAt(sourceFile, getAdjustedStartPosition(sourceFile, before, {}), newNode, this.getOptionsForInsertNodeBefore(before, blankLineBetween));
+                this.insertNodeAt(sourceFile, getAdjustedStartPosition(sourceFile, before, {}), newNode, this.getOptionsForInsertNodeBefore(before, newNode, blankLineBetween));
             };
             ChangeTracker.prototype.insertModifierBefore = function (sourceFile, modifier, before) {
                 var pos = before.getStart(sourceFile);
@@ -125440,7 +125733,7 @@ var ts;
                 var start = (ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile) || ts.first(node.parameters)).getStart(sourceFile);
                 this.insertNodesAt(sourceFile, start, typeParameters, { prefix: "<", suffix: ">" });
             };
-            ChangeTracker.prototype.getOptionsForInsertNodeBefore = function (before, doubleNewlines) {
+            ChangeTracker.prototype.getOptionsForInsertNodeBefore = function (before, inserted, doubleNewlines) {
                 if (ts.isStatement(before) || ts.isClassElement(before)) {
                     return { suffix: doubleNewlines ? this.newLineCharacter + this.newLineCharacter : this.newLineCharacter };
                 }
@@ -125448,7 +125741,7 @@ var ts;
                     return { suffix: ", " };
                 }
                 else if (ts.isParameter(before)) {
-                    return {};
+                    return ts.isParameter(inserted) ? { suffix: ", " } : {};
                 }
                 else if (ts.isStringLiteral(before) && ts.isImportDeclaration(before.parent) || ts.isNamedImports(before)) {
                     return { suffix: ", " };
@@ -125909,7 +126202,7 @@ var ts;
             function getNonformattedText(node, sourceFile, newLineCharacter) {
                 var writer = createWriter(newLineCharacter);
                 var newLine = newLineCharacter === "\n" ? 1 /* LineFeed */ : 0 /* CarriageReturnLineFeed */;
-                ts.createPrinter({ newLine: newLine, neverAsciiEscape: true }, writer).writeNode(4 /* Unspecified */, node, sourceFile, writer);
+                ts.createPrinter({ newLine: newLine, neverAsciiEscape: true, preserveSourceNewlines: true }, writer).writeNode(4 /* Unspecified */, node, sourceFile, writer);
                 return { text: writer.getText(), node: assignPositionsToNode(node) };
             }
             changesToText.getNonformattedText = getNonformattedText;
@@ -126030,8 +126323,8 @@ var ts;
                 writer.writeSymbol(s, sym);
                 setLastNonTriviaPosition(s, /*force*/ false);
             }
-            function writeLine() {
-                writer.writeLine();
+            function writeLine(force) {
+                writer.writeLine(force);
             }
             function increaseIndent() {
                 writer.increaseIndent();
@@ -126241,15 +126534,21 @@ var ts;
                     case 257 /* NamespaceImport */:
                         deleteImportBinding(changes, sourceFile, node);
                         break;
+                    case 26 /* SemicolonToken */:
+                        deleteNode(changes, sourceFile, node, { trailingTriviaOption: TrailingTriviaOption.Exclude });
+                        break;
+                    case 94 /* FunctionKeyword */:
+                        deleteNode(changes, sourceFile, node, { leadingTriviaOption: LeadingTriviaOption.Exclude });
+                        break;
                     default:
                         if (ts.isImportClause(node.parent) && node.parent.name === node) {
                             deleteDefaultImport(changes, sourceFile, node.parent);
                         }
-                        else if (ts.isCallLikeExpression(node.parent)) {
+                        else if (ts.isCallExpression(node.parent) && ts.contains(node.parent.arguments, node)) {
                             deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         }
                         else {
-                            deleteNode(changes, sourceFile, node, node.kind === 26 /* SemicolonToken */ ? { trailingTriviaOption: TrailingTriviaOption.Exclude } : undefined);
+                            deleteNode(changes, sourceFile, node);
                         }
                 }
             }
@@ -126438,7 +126737,7 @@ var ts;
         codefix.eachDiagnostic = eachDiagnostic;
         function getDiagnostics(_a) {
             var program = _a.program, sourceFile = _a.sourceFile, cancellationToken = _a.cancellationToken;
-            return program.getSemanticDiagnostics(sourceFile, cancellationToken).concat(ts.computeSuggestionDiagnostics(sourceFile, program, cancellationToken));
+            return __spreadArrays(program.getSemanticDiagnostics(sourceFile, cancellationToken), program.getSyntacticDiagnostics(sourceFile, cancellationToken), ts.computeSuggestionDiagnostics(sourceFile, program, cancellationToken));
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
@@ -127216,987 +127515,6 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
-(function (ts) {
-    var codefix;
-    (function (codefix) {
-        var fixId = "inferFromUsage";
-        var errorCodes = [
-            // Variable declarations
-            ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code,
-            // Variable uses
-            ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code,
-            // Parameter declarations
-            ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code,
-            ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code,
-            // Get Accessor declarations
-            ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code,
-            ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code,
-            // Set Accessor declarations
-            ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code,
-            // Property declarations
-            ts.Diagnostics.Member_0_implicitly_has_an_1_type.code,
-            //// Suggestions
-            // Variable declarations
-            ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage.code,
-            // Variable uses
-            ts.Diagnostics.Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
-            // Parameter declarations
-            ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
-            ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code,
-            // Get Accessor declarations
-            ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_get_accessor_may_be_inferred_from_usage.code,
-            ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage.code,
-            // Set Accessor declarations
-            ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code,
-            // Property declarations
-            ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
-            // Function expressions and declarations
-            ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code,
-        ];
-        codefix.registerCodeFix({
-            errorCodes: errorCodes,
-            getCodeActions: function (context) {
-                var sourceFile = context.sourceFile, program = context.program, start = context.span.start, errorCode = context.errorCode, cancellationToken = context.cancellationToken, host = context.host, preferences = context.preferences;
-                var token = ts.getTokenAtPosition(sourceFile, start);
-                var declaration;
-                var changes = ts.textChanges.ChangeTracker.with(context, function (changes) { declaration = doChange(changes, sourceFile, token, errorCode, program, cancellationToken, /*markSeen*/ ts.returnTrue, host, preferences); });
-                var name = declaration && ts.getNameOfDeclaration(declaration);
-                return !name || changes.length === 0 ? undefined
-                    : [codefix.createCodeFixAction(fixId, changes, [getDiagnostic(errorCode, token), name.getText(sourceFile)], fixId, ts.Diagnostics.Infer_all_types_from_usage)];
-            },
-            fixIds: [fixId],
-            getAllCodeActions: function (context) {
-                var sourceFile = context.sourceFile, program = context.program, cancellationToken = context.cancellationToken, host = context.host, preferences = context.preferences;
-                var markSeen = ts.nodeSeenTracker();
-                return codefix.codeFixAll(context, errorCodes, function (changes, err) {
-                    doChange(changes, sourceFile, ts.getTokenAtPosition(err.file, err.start), err.code, program, cancellationToken, markSeen, host, preferences);
-                });
-            },
-        });
-        function getDiagnostic(errorCode, token) {
-            switch (errorCode) {
-                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code:
-                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.isSetAccessorDeclaration(ts.getContainingFunction(token)) ? ts.Diagnostics.Infer_type_of_0_from_usage : ts.Diagnostics.Infer_parameter_types_from_usage; // TODO: GH#18217
-                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
-                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Infer_parameter_types_from_usage;
-                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
-                    return ts.Diagnostics.Infer_this_type_of_0_from_usage;
-                default:
-                    return ts.Diagnostics.Infer_type_of_0_from_usage;
-            }
-        }
-        /** Map suggestion code to error code */
-        function mapSuggestionDiagnostic(errorCode) {
-            switch (errorCode) {
-                case ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code;
-                case ts.Diagnostics.Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code;
-                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code;
-                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code;
-                case ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_get_accessor_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code;
-                case ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code;
-                case ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code;
-                case ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
-                    return ts.Diagnostics.Member_0_implicitly_has_an_1_type.code;
-            }
-            return errorCode;
-        }
-        function doChange(changes, sourceFile, token, errorCode, program, cancellationToken, markSeen, host, preferences) {
-            if (!ts.isParameterPropertyModifier(token.kind) && token.kind !== 75 /* Identifier */ && token.kind !== 25 /* DotDotDotToken */ && token.kind !== 104 /* ThisKeyword */) {
-                return undefined;
-            }
-            var parent = token.parent;
-            var importAdder = codefix.createImportAdder(sourceFile, program, preferences, host);
-            errorCode = mapSuggestionDiagnostic(errorCode);
-            switch (errorCode) {
-                // Variable and Property declarations
-                case ts.Diagnostics.Member_0_implicitly_has_an_1_type.code:
-                case ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code:
-                    if ((ts.isVariableDeclaration(parent) && markSeen(parent)) || ts.isPropertyDeclaration(parent) || ts.isPropertySignature(parent)) { // handle bad location
-                        annotateVariableDeclaration(changes, importAdder, sourceFile, parent, program, host, cancellationToken);
-                        importAdder.writeFixes(changes);
-                        return parent;
-                    }
-                    if (ts.isPropertyAccessExpression(parent)) {
-                        var type = inferTypeForVariableFromUsage(parent.name, program, cancellationToken);
-                        var typeNode = ts.getTypeNodeIfAccessible(type, parent, program, host);
-                        if (typeNode) {
-                            // Note that the codefix will never fire with an existing `@type` tag, so there is no need to merge tags
-                            var typeTag = ts.createJSDocTypeTag(ts.createJSDocTypeExpression(typeNode), /*comment*/ "");
-                            addJSDocTags(changes, sourceFile, ts.cast(parent.parent.parent, ts.isExpressionStatement), [typeTag]);
-                        }
-                        importAdder.writeFixes(changes);
-                        return parent;
-                    }
-                    return undefined;
-                case ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code: {
-                    var symbol = program.getTypeChecker().getSymbolAtLocation(token);
-                    if (symbol && symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) && markSeen(symbol.valueDeclaration)) {
-                        annotateVariableDeclaration(changes, importAdder, sourceFile, symbol.valueDeclaration, program, host, cancellationToken);
-                        importAdder.writeFixes(changes);
-                        return symbol.valueDeclaration;
-                    }
-                    return undefined;
-                }
-            }
-            var containingFunction = ts.getContainingFunction(token);
-            if (containingFunction === undefined) {
-                return undefined;
-            }
-            var declaration;
-            switch (errorCode) {
-                // Parameter declarations
-                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code:
-                    if (ts.isSetAccessorDeclaration(containingFunction)) {
-                        annotateSetAccessor(changes, importAdder, sourceFile, containingFunction, program, host, cancellationToken);
-                        declaration = containingFunction;
-                        break;
-                    }
-                // falls through
-                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
-                    if (markSeen(containingFunction)) {
-                        var param = ts.cast(parent, ts.isParameter);
-                        annotateParameters(changes, importAdder, sourceFile, param, containingFunction, program, host, cancellationToken);
-                        declaration = param;
-                    }
-                    break;
-                // Get Accessor declarations
-                case ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code:
-                case ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code:
-                    if (ts.isGetAccessorDeclaration(containingFunction) && ts.isIdentifier(containingFunction.name)) {
-                        annotate(changes, importAdder, sourceFile, containingFunction, inferTypeForVariableFromUsage(containingFunction.name, program, cancellationToken), program, host);
-                        declaration = containingFunction;
-                    }
-                    break;
-                // Set Accessor declarations
-                case ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code:
-                    if (ts.isSetAccessorDeclaration(containingFunction)) {
-                        annotateSetAccessor(changes, importAdder, sourceFile, containingFunction, program, host, cancellationToken);
-                        declaration = containingFunction;
-                    }
-                    break;
-                // Function 'this'
-                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
-                    if (ts.textChanges.isThisTypeAnnotatable(containingFunction) && markSeen(containingFunction)) {
-                        annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken);
-                        declaration = containingFunction;
-                    }
-                    break;
-                default:
-                    return ts.Debug.fail(String(errorCode));
-            }
-            importAdder.writeFixes(changes);
-            return declaration;
-        }
-        function annotateVariableDeclaration(changes, importAdder, sourceFile, declaration, program, host, cancellationToken) {
-            if (ts.isIdentifier(declaration.name)) {
-                annotate(changes, importAdder, sourceFile, declaration, inferTypeForVariableFromUsage(declaration.name, program, cancellationToken), program, host);
-            }
-        }
-        function annotateParameters(changes, importAdder, sourceFile, parameterDeclaration, containingFunction, program, host, cancellationToken) {
-            if (!ts.isIdentifier(parameterDeclaration.name)) {
-                return;
-            }
-            var parameterInferences = inferTypeForParametersFromUsage(containingFunction, sourceFile, program, cancellationToken);
-            ts.Debug.assert(containingFunction.parameters.length === parameterInferences.length, "Parameter count and inference count should match");
-            if (ts.isInJSFile(containingFunction)) {
-                annotateJSDocParameters(changes, sourceFile, parameterInferences, program, host);
-            }
-            else {
-                var needParens = ts.isArrowFunction(containingFunction) && !ts.findChildOfKind(containingFunction, 20 /* OpenParenToken */, sourceFile);
-                if (needParens)
-                    changes.insertNodeBefore(sourceFile, ts.first(containingFunction.parameters), ts.createToken(20 /* OpenParenToken */));
-                for (var _i = 0, parameterInferences_1 = parameterInferences; _i < parameterInferences_1.length; _i++) {
-                    var _a = parameterInferences_1[_i], declaration = _a.declaration, type = _a.type;
-                    if (declaration && !declaration.type && !declaration.initializer) {
-                        annotate(changes, importAdder, sourceFile, declaration, type, program, host);
-                    }
-                }
-                if (needParens)
-                    changes.insertNodeAfter(sourceFile, ts.last(containingFunction.parameters), ts.createToken(21 /* CloseParenToken */));
-            }
-        }
-        function annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken) {
-            var references = getFunctionReferences(containingFunction, sourceFile, program, cancellationToken);
-            if (!references || !references.length) {
-                return;
-            }
-            var thisInference = inferTypeFromReferences(program, references, cancellationToken).thisParameter();
-            var typeNode = ts.getTypeNodeIfAccessible(thisInference, containingFunction, program, host);
-            if (!typeNode) {
-                return;
-            }
-            if (ts.isInJSFile(containingFunction)) {
-                annotateJSDocThis(changes, sourceFile, containingFunction, typeNode);
-            }
-            else {
-                changes.tryInsertThisTypeAnnotation(sourceFile, containingFunction, typeNode);
-            }
-        }
-        function annotateJSDocThis(changes, sourceFile, containingFunction, typeNode) {
-            addJSDocTags(changes, sourceFile, containingFunction, [
-                ts.createJSDocThisTag(ts.createJSDocTypeExpression(typeNode)),
-            ]);
-        }
-        function annotateSetAccessor(changes, importAdder, sourceFile, setAccessorDeclaration, program, host, cancellationToken) {
-            var param = ts.firstOrUndefined(setAccessorDeclaration.parameters);
-            if (param && ts.isIdentifier(setAccessorDeclaration.name) && ts.isIdentifier(param.name)) {
-                var type = inferTypeForVariableFromUsage(setAccessorDeclaration.name, program, cancellationToken);
-                if (type === program.getTypeChecker().getAnyType()) {
-                    type = inferTypeForVariableFromUsage(param.name, program, cancellationToken);
-                }
-                if (ts.isInJSFile(setAccessorDeclaration)) {
-                    annotateJSDocParameters(changes, sourceFile, [{ declaration: param, type: type }], program, host);
-                }
-                else {
-                    annotate(changes, importAdder, sourceFile, param, type, program, host);
-                }
-            }
-        }
-        function annotate(changes, importAdder, sourceFile, declaration, type, program, host) {
-            var typeNode = ts.getTypeNodeIfAccessible(type, declaration, program, host);
-            if (typeNode) {
-                if (ts.isInJSFile(sourceFile) && declaration.kind !== 159 /* PropertySignature */) {
-                    var parent = ts.isVariableDeclaration(declaration) ? ts.tryCast(declaration.parent.parent, ts.isVariableStatement) : declaration;
-                    if (!parent) {
-                        return;
-                    }
-                    var typeExpression = ts.createJSDocTypeExpression(typeNode);
-                    var typeTag = ts.isGetAccessorDeclaration(declaration) ? ts.createJSDocReturnTag(typeExpression, "") : ts.createJSDocTypeTag(typeExpression, "");
-                    addJSDocTags(changes, sourceFile, parent, [typeTag]);
-                }
-                else if (!tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, type, sourceFile, changes, importAdder, ts.getEmitScriptTarget(program.getCompilerOptions()))) {
-                    changes.tryInsertTypeAnnotation(sourceFile, declaration, typeNode);
-                }
-            }
-        }
-        function tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, type, sourceFile, changes, importAdder, scriptTarget) {
-            var importableReference = codefix.tryGetAutoImportableReferenceFromImportTypeNode(typeNode, type, scriptTarget);
-            if (importableReference && changes.tryInsertTypeAnnotation(sourceFile, declaration, importableReference.typeReference)) {
-                ts.forEach(importableReference.symbols, function (s) { return importAdder.addImportFromExportedSymbol(s, /*usageIsTypeOnly*/ true); });
-                return true;
-            }
-            return false;
-        }
-        function annotateJSDocParameters(changes, sourceFile, parameterInferences, program, host) {
-            var signature = parameterInferences.length && parameterInferences[0].declaration.parent;
-            if (!signature) {
-                return;
-            }
-            var paramTags = ts.mapDefined(parameterInferences, function (inference) {
-                var param = inference.declaration;
-                // only infer parameters that have (1) no type and (2) an accessible inferred type
-                if (param.initializer || ts.getJSDocType(param) || !ts.isIdentifier(param.name))
-                    return;
-                var typeNode = inference.type && ts.getTypeNodeIfAccessible(inference.type, param, program, host);
-                var name = ts.getSynthesizedClone(param.name);
-                ts.setEmitFlags(name, 1536 /* NoComments */ | 2048 /* NoNestedComments */);
-                return typeNode && ts.createJSDocParamTag(name, !!inference.isOptional, ts.createJSDocTypeExpression(typeNode), "");
-            });
-            addJSDocTags(changes, sourceFile, signature, paramTags);
-        }
-        function addJSDocTags(changes, sourceFile, parent, newTags) {
-            var comments = ts.mapDefined(parent.jsDoc, function (j) { return j.comment; });
-            var oldTags = ts.flatMapToMutable(parent.jsDoc, function (j) { return j.tags; });
-            var unmergedNewTags = newTags.filter(function (newTag) { return !oldTags || !oldTags.some(function (tag, i) {
-                var merged = tryMergeJsdocTags(tag, newTag);
-                if (merged)
-                    oldTags[i] = merged;
-                return !!merged;
-            }); });
-            var tag = ts.createJSDocComment(comments.join("\n"), ts.createNodeArray(__spreadArrays((oldTags || ts.emptyArray), unmergedNewTags)));
-            var jsDocNode = parent.kind === 203 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
-            jsDocNode.jsDoc = parent.jsDoc;
-            jsDocNode.jsDocCache = parent.jsDocCache;
-            changes.insertJsdocCommentBefore(sourceFile, jsDocNode, tag);
-        }
-        function getJsDocNodeForArrowFunction(signature) {
-            if (signature.parent.kind === 160 /* PropertyDeclaration */) {
-                return signature.parent;
-            }
-            return signature.parent.parent;
-        }
-        function tryMergeJsdocTags(oldTag, newTag) {
-            if (oldTag.kind !== newTag.kind) {
-                return undefined;
-            }
-            switch (oldTag.kind) {
-                case 318 /* JSDocParameterTag */: {
-                    var oldParam = oldTag;
-                    var newParam = newTag;
-                    return ts.isIdentifier(oldParam.name) && ts.isIdentifier(newParam.name) && oldParam.name.escapedText === newParam.name.escapedText
-                        ? ts.createJSDocParamTag(newParam.name, newParam.isBracketed, newParam.typeExpression, oldParam.comment)
-                        : undefined;
-                }
-                case 319 /* JSDocReturnTag */:
-                    return ts.createJSDocReturnTag(newTag.typeExpression, oldTag.comment);
-            }
-        }
-        function getReferences(token, program, cancellationToken) {
-            // Position shouldn't matter since token is not a SourceFile.
-            return ts.mapDefined(ts.FindAllReferences.getReferenceEntriesForNode(-1, token, program, program.getSourceFiles(), cancellationToken), function (entry) {
-                return entry.kind !== 0 /* Span */ ? ts.tryCast(entry.node, ts.isIdentifier) : undefined;
-            });
-        }
-        function inferTypeForVariableFromUsage(token, program, cancellationToken) {
-            var references = getReferences(token, program, cancellationToken);
-            return inferTypeFromReferences(program, references, cancellationToken).single();
-        }
-        function inferTypeForParametersFromUsage(func, sourceFile, program, cancellationToken) {
-            var references = getFunctionReferences(func, sourceFile, program, cancellationToken);
-            return references && inferTypeFromReferences(program, references, cancellationToken).parameters(func) ||
-                func.parameters.map(function (p) { return ({
-                    declaration: p,
-                    type: ts.isIdentifier(p.name) ? inferTypeForVariableFromUsage(p.name, program, cancellationToken) : program.getTypeChecker().getAnyType()
-                }); });
-        }
-        function getFunctionReferences(containingFunction, sourceFile, program, cancellationToken) {
-            var searchToken;
-            switch (containingFunction.kind) {
-                case 163 /* Constructor */:
-                    searchToken = ts.findChildOfKind(containingFunction, 130 /* ConstructorKeyword */, sourceFile);
-                    break;
-                case 203 /* ArrowFunction */:
-                case 202 /* FunctionExpression */:
-                    var parent = containingFunction.parent;
-                    searchToken = ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name) ?
-                        parent.name :
-                        containingFunction.name;
-                    break;
-                case 245 /* FunctionDeclaration */:
-                case 162 /* MethodDeclaration */:
-                    searchToken = containingFunction.name;
-                    break;
-            }
-            if (!searchToken) {
-                return undefined;
-            }
-            return getReferences(searchToken, program, cancellationToken);
-        }
-        function inferTypeFromReferences(program, references, cancellationToken) {
-            var checker = program.getTypeChecker();
-            var builtinConstructors = {
-                string: function () { return checker.getStringType(); },
-                number: function () { return checker.getNumberType(); },
-                Array: function (t) { return checker.createArrayType(t); },
-                Promise: function (t) { return checker.createPromiseType(t); },
-            };
-            var builtins = [
-                checker.getStringType(),
-                checker.getNumberType(),
-                checker.createArrayType(checker.getAnyType()),
-                checker.createPromiseType(checker.getAnyType()),
-            ];
-            return {
-                single: single,
-                parameters: parameters,
-                thisParameter: thisParameter,
-            };
-            function createEmptyUsage() {
-                return {
-                    isNumber: undefined,
-                    isString: undefined,
-                    isNumberOrString: undefined,
-                    candidateTypes: undefined,
-                    properties: undefined,
-                    calls: undefined,
-                    constructs: undefined,
-                    numberIndex: undefined,
-                    stringIndex: undefined,
-                    candidateThisTypes: undefined,
-                    inferredTypes: undefined,
-                };
-            }
-            function combineUsages(usages) {
-                var combinedProperties = ts.createUnderscoreEscapedMap();
-                for (var _i = 0, usages_1 = usages; _i < usages_1.length; _i++) {
-                    var u = usages_1[_i];
-                    if (u.properties) {
-                        u.properties.forEach(function (p, name) {
-                            if (!combinedProperties.has(name)) {
-                                combinedProperties.set(name, []);
-                            }
-                            combinedProperties.get(name).push(p);
-                        });
-                    }
-                }
-                var properties = ts.createUnderscoreEscapedMap();
-                combinedProperties.forEach(function (ps, name) {
-                    properties.set(name, combineUsages(ps));
-                });
-                return {
-                    isNumber: usages.some(function (u) { return u.isNumber; }),
-                    isString: usages.some(function (u) { return u.isString; }),
-                    isNumberOrString: usages.some(function (u) { return u.isNumberOrString; }),
-                    candidateTypes: ts.flatMap(usages, function (u) { return u.candidateTypes; }),
-                    properties: properties,
-                    calls: ts.flatMap(usages, function (u) { return u.calls; }),
-                    constructs: ts.flatMap(usages, function (u) { return u.constructs; }),
-                    numberIndex: ts.forEach(usages, function (u) { return u.numberIndex; }),
-                    stringIndex: ts.forEach(usages, function (u) { return u.stringIndex; }),
-                    candidateThisTypes: ts.flatMap(usages, function (u) { return u.candidateThisTypes; }),
-                    inferredTypes: undefined,
-                };
-            }
-            function single() {
-                return combineTypes(inferTypesFromReferencesSingle(references));
-            }
-            function parameters(declaration) {
-                if (references.length === 0 || !declaration.parameters) {
-                    return undefined;
-                }
-                var usage = createEmptyUsage();
-                for (var _i = 0, references_2 = references; _i < references_2.length; _i++) {
-                    var reference = references_2[_i];
-                    cancellationToken.throwIfCancellationRequested();
-                    calculateUsageOfNode(reference, usage);
-                }
-                var calls = __spreadArrays(usage.constructs || [], usage.calls || []);
-                return declaration.parameters.map(function (parameter, parameterIndex) {
-                    var types = [];
-                    var isRest = ts.isRestParameter(parameter);
-                    var isOptional = false;
-                    for (var _i = 0, calls_1 = calls; _i < calls_1.length; _i++) {
-                        var call = calls_1[_i];
-                        if (call.argumentTypes.length <= parameterIndex) {
-                            isOptional = ts.isInJSFile(declaration);
-                            types.push(checker.getUndefinedType());
-                        }
-                        else if (isRest) {
-                            for (var i = parameterIndex; i < call.argumentTypes.length; i++) {
-                                types.push(checker.getBaseTypeOfLiteralType(call.argumentTypes[i]));
-                            }
-                        }
-                        else {
-                            types.push(checker.getBaseTypeOfLiteralType(call.argumentTypes[parameterIndex]));
-                        }
-                    }
-                    if (ts.isIdentifier(parameter.name)) {
-                        var inferred = inferTypesFromReferencesSingle(getReferences(parameter.name, program, cancellationToken));
-                        types.push.apply(types, (isRest ? ts.mapDefined(inferred, checker.getElementTypeOfArrayType) : inferred));
-                    }
-                    var type = combineTypes(types);
-                    return {
-                        type: isRest ? checker.createArrayType(type) : type,
-                        isOptional: isOptional && !isRest,
-                        declaration: parameter
-                    };
-                });
-            }
-            function thisParameter() {
-                var usage = createEmptyUsage();
-                for (var _i = 0, references_3 = references; _i < references_3.length; _i++) {
-                    var reference = references_3[_i];
-                    cancellationToken.throwIfCancellationRequested();
-                    calculateUsageOfNode(reference, usage);
-                }
-                return combineTypes(usage.candidateThisTypes || ts.emptyArray);
-            }
-            function inferTypesFromReferencesSingle(references) {
-                var usage = createEmptyUsage();
-                for (var _i = 0, references_4 = references; _i < references_4.length; _i++) {
-                    var reference = references_4[_i];
-                    cancellationToken.throwIfCancellationRequested();
-                    calculateUsageOfNode(reference, usage);
-                }
-                return inferTypes(usage);
-            }
-            function calculateUsageOfNode(node, usage) {
-                while (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
-                    node = node.parent;
-                }
-                switch (node.parent.kind) {
-                    case 227 /* ExpressionStatement */:
-                        addCandidateType(usage, checker.getVoidType());
-                        break;
-                    case 209 /* PostfixUnaryExpression */:
-                        usage.isNumber = true;
-                        break;
-                    case 208 /* PrefixUnaryExpression */:
-                        inferTypeFromPrefixUnaryExpression(node.parent, usage);
-                        break;
-                    case 210 /* BinaryExpression */:
-                        inferTypeFromBinaryExpression(node, node.parent, usage);
-                        break;
-                    case 278 /* CaseClause */:
-                    case 279 /* DefaultClause */:
-                        inferTypeFromSwitchStatementLabel(node.parent, usage);
-                        break;
-                    case 197 /* CallExpression */:
-                    case 198 /* NewExpression */:
-                        if (node.parent.expression === node) {
-                            inferTypeFromCallExpression(node.parent, usage);
-                        }
-                        else {
-                            inferTypeFromContextualType(node, usage);
-                        }
-                        break;
-                    case 195 /* PropertyAccessExpression */:
-                        inferTypeFromPropertyAccessExpression(node.parent, usage);
-                        break;
-                    case 196 /* ElementAccessExpression */:
-                        inferTypeFromPropertyElementExpression(node.parent, node, usage);
-                        break;
-                    case 282 /* PropertyAssignment */:
-                    case 283 /* ShorthandPropertyAssignment */:
-                        inferTypeFromPropertyAssignment(node.parent, usage);
-                        break;
-                    case 160 /* PropertyDeclaration */:
-                        inferTypeFromPropertyDeclaration(node.parent, usage);
-                        break;
-                    case 243 /* VariableDeclaration */: {
-                        var _a = node.parent, name = _a.name, initializer = _a.initializer;
-                        if (node === name) {
-                            if (initializer) { // This can happen for `let x = null;` which still has an implicit-any error.
-                                addCandidateType(usage, checker.getTypeAtLocation(initializer));
-                            }
-                            break;
-                        }
-                    }
-                    // falls through
-                    default:
-                        return inferTypeFromContextualType(node, usage);
-                }
-            }
-            function inferTypeFromContextualType(node, usage) {
-                if (ts.isExpressionNode(node)) {
-                    addCandidateType(usage, checker.getContextualType(node));
-                }
-            }
-            function inferTypeFromPrefixUnaryExpression(node, usage) {
-                switch (node.operator) {
-                    case 45 /* PlusPlusToken */:
-                    case 46 /* MinusMinusToken */:
-                    case 40 /* MinusToken */:
-                    case 54 /* TildeToken */:
-                        usage.isNumber = true;
-                        break;
-                    case 39 /* PlusToken */:
-                        usage.isNumberOrString = true;
-                        break;
-                    // case SyntaxKind.ExclamationToken:
-                    // no inferences here;
-                }
-            }
-            function inferTypeFromBinaryExpression(node, parent, usage) {
-                switch (parent.operatorToken.kind) {
-                    // ExponentiationOperator
-                    case 42 /* AsteriskAsteriskToken */:
-                    // MultiplicativeOperator
-                    // falls through
-                    case 41 /* AsteriskToken */:
-                    case 43 /* SlashToken */:
-                    case 44 /* PercentToken */:
-                    // ShiftOperator
-                    // falls through
-                    case 47 /* LessThanLessThanToken */:
-                    case 48 /* GreaterThanGreaterThanToken */:
-                    case 49 /* GreaterThanGreaterThanGreaterThanToken */:
-                    // BitwiseOperator
-                    // falls through
-                    case 50 /* AmpersandToken */:
-                    case 51 /* BarToken */:
-                    case 52 /* CaretToken */:
-                    // CompoundAssignmentOperator
-                    // falls through
-                    case 64 /* MinusEqualsToken */:
-                    case 66 /* AsteriskAsteriskEqualsToken */:
-                    case 65 /* AsteriskEqualsToken */:
-                    case 67 /* SlashEqualsToken */:
-                    case 68 /* PercentEqualsToken */:
-                    case 72 /* AmpersandEqualsToken */:
-                    case 73 /* BarEqualsToken */:
-                    case 74 /* CaretEqualsToken */:
-                    case 69 /* LessThanLessThanEqualsToken */:
-                    case 71 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                    case 70 /* GreaterThanGreaterThanEqualsToken */:
-                    // AdditiveOperator
-                    // falls through
-                    case 40 /* MinusToken */:
-                    // RelationalOperator
-                    // falls through
-                    case 29 /* LessThanToken */:
-                    case 32 /* LessThanEqualsToken */:
-                    case 31 /* GreaterThanToken */:
-                    case 33 /* GreaterThanEqualsToken */:
-                        var operandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
-                        if (operandType.flags & 1056 /* EnumLike */) {
-                            addCandidateType(usage, operandType);
-                        }
-                        else {
-                            usage.isNumber = true;
-                        }
-                        break;
-                    case 63 /* PlusEqualsToken */:
-                    case 39 /* PlusToken */:
-                        var otherOperandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
-                        if (otherOperandType.flags & 1056 /* EnumLike */) {
-                            addCandidateType(usage, otherOperandType);
-                        }
-                        else if (otherOperandType.flags & 296 /* NumberLike */) {
-                            usage.isNumber = true;
-                        }
-                        else if (otherOperandType.flags & 132 /* StringLike */) {
-                            usage.isString = true;
-                        }
-                        else if (otherOperandType.flags & 1 /* Any */) {
-                            // do nothing, maybe we'll learn something elsewhere
-                        }
-                        else {
-                            usage.isNumberOrString = true;
-                        }
-                        break;
-                    //  AssignmentOperators
-                    case 62 /* EqualsToken */:
-                    case 34 /* EqualsEqualsToken */:
-                    case 36 /* EqualsEqualsEqualsToken */:
-                    case 37 /* ExclamationEqualsEqualsToken */:
-                    case 35 /* ExclamationEqualsToken */:
-                        addCandidateType(usage, checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left));
-                        break;
-                    case 97 /* InKeyword */:
-                        if (node === parent.left) {
-                            usage.isString = true;
-                        }
-                        break;
-                    // LogicalOperator Or NullishCoalescing
-                    case 56 /* BarBarToken */:
-                    case 60 /* QuestionQuestionToken */:
-                        if (node === parent.left &&
-                            (node.parent.parent.kind === 243 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
-                            // var x = x || {};
-                            // TODO: use getFalsyflagsOfType
-                            addCandidateType(usage, checker.getTypeAtLocation(parent.right));
-                        }
-                        break;
-                    case 55 /* AmpersandAmpersandToken */:
-                    case 27 /* CommaToken */:
-                    case 98 /* InstanceOfKeyword */:
-                        // nothing to infer here
-                        break;
-                }
-            }
-            function inferTypeFromSwitchStatementLabel(parent, usage) {
-                addCandidateType(usage, checker.getTypeAtLocation(parent.parent.parent.expression));
-            }
-            function inferTypeFromCallExpression(parent, usage) {
-                var call = {
-                    argumentTypes: [],
-                    return_: createEmptyUsage()
-                };
-                if (parent.arguments) {
-                    for (var _i = 0, _a = parent.arguments; _i < _a.length; _i++) {
-                        var argument = _a[_i];
-                        call.argumentTypes.push(checker.getTypeAtLocation(argument));
-                    }
-                }
-                calculateUsageOfNode(parent, call.return_);
-                if (parent.kind === 197 /* CallExpression */) {
-                    (usage.calls || (usage.calls = [])).push(call);
-                }
-                else {
-                    (usage.constructs || (usage.constructs = [])).push(call);
-                }
-            }
-            function inferTypeFromPropertyAccessExpression(parent, usage) {
-                var name = ts.escapeLeadingUnderscores(parent.name.text);
-                if (!usage.properties) {
-                    usage.properties = ts.createUnderscoreEscapedMap();
-                }
-                var propertyUsage = usage.properties.get(name) || createEmptyUsage();
-                calculateUsageOfNode(parent, propertyUsage);
-                usage.properties.set(name, propertyUsage);
-            }
-            function inferTypeFromPropertyElementExpression(parent, node, usage) {
-                if (node === parent.argumentExpression) {
-                    usage.isNumberOrString = true;
-                    return;
-                }
-                else {
-                    var indexType = checker.getTypeAtLocation(parent.argumentExpression);
-                    var indexUsage = createEmptyUsage();
-                    calculateUsageOfNode(parent, indexUsage);
-                    if (indexType.flags & 296 /* NumberLike */) {
-                        usage.numberIndex = indexUsage;
-                    }
-                    else {
-                        usage.stringIndex = indexUsage;
-                    }
-                }
-            }
-            function inferTypeFromPropertyAssignment(assignment, usage) {
-                var nodeWithRealType = ts.isVariableDeclaration(assignment.parent.parent) ?
-                    assignment.parent.parent :
-                    assignment.parent;
-                addCandidateThisType(usage, checker.getTypeAtLocation(nodeWithRealType));
-            }
-            function inferTypeFromPropertyDeclaration(declaration, usage) {
-                addCandidateThisType(usage, checker.getTypeAtLocation(declaration.parent));
-            }
-            function removeLowPriorityInferences(inferences, priorities) {
-                var toRemove = [];
-                for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
-                    var i = inferences_1[_i];
-                    for (var _a = 0, priorities_1 = priorities; _a < priorities_1.length; _a++) {
-                        var _b = priorities_1[_a], high = _b.high, low = _b.low;
-                        if (high(i)) {
-                            ts.Debug.assert(!low(i), "Priority can't have both low and high");
-                            toRemove.push(low);
-                        }
-                    }
-                }
-                return inferences.filter(function (i) { return toRemove.every(function (f) { return !f(i); }); });
-            }
-            function combineFromUsage(usage) {
-                return combineTypes(inferTypes(usage));
-            }
-            function combineTypes(inferences) {
-                if (!inferences.length)
-                    return checker.getAnyType();
-                // 1. string or number individually override string | number
-                // 2. non-any, non-void overrides any or void
-                // 3. non-nullable, non-any, non-void, non-anonymous overrides anonymous types
-                var stringNumber = checker.getUnionType([checker.getStringType(), checker.getNumberType()]);
-                var priorities = [
-                    {
-                        high: function (t) { return t === checker.getStringType() || t === checker.getNumberType(); },
-                        low: function (t) { return t === stringNumber; }
-                    },
-                    {
-                        high: function (t) { return !(t.flags & (1 /* Any */ | 16384 /* Void */)); },
-                        low: function (t) { return !!(t.flags & (1 /* Any */ | 16384 /* Void */)); }
-                    },
-                    {
-                        high: function (t) { return !(t.flags & (98304 /* Nullable */ | 1 /* Any */ | 16384 /* Void */)) && !(ts.getObjectFlags(t) & 16 /* Anonymous */); },
-                        low: function (t) { return !!(ts.getObjectFlags(t) & 16 /* Anonymous */); }
-                    }
-                ];
-                var good = removeLowPriorityInferences(inferences, priorities);
-                var anons = good.filter(function (i) { return ts.getObjectFlags(i) & 16 /* Anonymous */; });
-                if (anons.length) {
-                    good = good.filter(function (i) { return !(ts.getObjectFlags(i) & 16 /* Anonymous */); });
-                    good.push(combineAnonymousTypes(anons));
-                }
-                return checker.getWidenedType(checker.getUnionType(good.map(checker.getBaseTypeOfLiteralType), 2 /* Subtype */));
-            }
-            function combineAnonymousTypes(anons) {
-                if (anons.length === 1) {
-                    return anons[0];
-                }
-                var calls = [];
-                var constructs = [];
-                var stringIndices = [];
-                var numberIndices = [];
-                var stringIndexReadonly = false;
-                var numberIndexReadonly = false;
-                var props = ts.createMultiMap();
-                for (var _i = 0, anons_1 = anons; _i < anons_1.length; _i++) {
-                    var anon = anons_1[_i];
-                    for (var _a = 0, _b = checker.getPropertiesOfType(anon); _a < _b.length; _a++) {
-                        var p = _b[_a];
-                        props.add(p.name, checker.getTypeOfSymbolAtLocation(p, p.valueDeclaration));
-                    }
-                    calls.push.apply(calls, checker.getSignaturesOfType(anon, 0 /* Call */));
-                    constructs.push.apply(constructs, checker.getSignaturesOfType(anon, 1 /* Construct */));
-                    if (anon.stringIndexInfo) {
-                        stringIndices.push(anon.stringIndexInfo.type);
-                        stringIndexReadonly = stringIndexReadonly || anon.stringIndexInfo.isReadonly;
-                    }
-                    if (anon.numberIndexInfo) {
-                        numberIndices.push(anon.numberIndexInfo.type);
-                        numberIndexReadonly = numberIndexReadonly || anon.numberIndexInfo.isReadonly;
-                    }
-                }
-                var members = ts.mapEntries(props, function (name, types) {
-                    var isOptional = types.length < anons.length ? 16777216 /* Optional */ : 0;
-                    var s = checker.createSymbol(4 /* Property */ | isOptional, name);
-                    s.type = checker.getUnionType(types);
-                    return [name, s];
-                });
-                return checker.createAnonymousType(anons[0].symbol, members, calls, constructs, stringIndices.length ? checker.createIndexInfo(checker.getUnionType(stringIndices), stringIndexReadonly) : undefined, numberIndices.length ? checker.createIndexInfo(checker.getUnionType(numberIndices), numberIndexReadonly) : undefined);
-            }
-            function inferTypes(usage) {
-                var types = [];
-                if (usage.isNumber) {
-                    types.push(checker.getNumberType());
-                }
-                if (usage.isString) {
-                    types.push(checker.getStringType());
-                }
-                if (usage.isNumberOrString) {
-                    types.push(checker.getUnionType([checker.getStringType(), checker.getNumberType()]));
-                }
-                if (usage.numberIndex) {
-                    types.push(checker.createArrayType(combineFromUsage(usage.numberIndex)));
-                }
-                if (usage.properties && usage.properties.size
-                    || usage.calls && usage.calls.length
-                    || usage.constructs && usage.constructs.length
-                    || usage.stringIndex) {
-                    types.push(inferStructuralType(usage));
-                }
-                types.push.apply(types, (usage.candidateTypes || []).map(function (t) { return checker.getBaseTypeOfLiteralType(t); }));
-                types.push.apply(types, inferNamedTypesFromProperties(usage));
-                return types;
-            }
-            function inferStructuralType(usage) {
-                var members = ts.createUnderscoreEscapedMap();
-                if (usage.properties) {
-                    usage.properties.forEach(function (u, name) {
-                        var symbol = checker.createSymbol(4 /* Property */, name);
-                        symbol.type = combineFromUsage(u);
-                        members.set(name, symbol);
-                    });
-                }
-                var callSignatures = usage.calls ? [getSignatureFromCalls(usage.calls)] : [];
-                var constructSignatures = usage.constructs ? [getSignatureFromCalls(usage.constructs)] : [];
-                var stringIndexInfo = usage.stringIndex && checker.createIndexInfo(combineFromUsage(usage.stringIndex), /*isReadonly*/ false);
-                return checker.createAnonymousType(/*symbol*/ undefined, members, callSignatures, constructSignatures, stringIndexInfo, /*numberIndexInfo*/ undefined);
-            }
-            function inferNamedTypesFromProperties(usage) {
-                if (!usage.properties || !usage.properties.size)
-                    return [];
-                var types = builtins.filter(function (t) { return allPropertiesAreAssignableToUsage(t, usage); });
-                if (0 < types.length && types.length < 3) {
-                    return types.map(function (t) { return inferInstantiationFromUsage(t, usage); });
-                }
-                return [];
-            }
-            function allPropertiesAreAssignableToUsage(type, usage) {
-                if (!usage.properties)
-                    return false;
-                return !ts.forEachEntry(usage.properties, function (propUsage, name) {
-                    var source = checker.getTypeOfPropertyOfType(type, name);
-                    if (!source) {
-                        return true;
-                    }
-                    if (propUsage.calls) {
-                        var sigs = checker.getSignaturesOfType(source, 0 /* Call */);
-                        return !sigs.length || !checker.isTypeAssignableTo(source, getFunctionFromCalls(propUsage.calls));
-                    }
-                    else {
-                        return !checker.isTypeAssignableTo(source, combineFromUsage(propUsage));
-                    }
-                });
-            }
-            /**
-             * inference is limited to
-             * 1. generic types with a single parameter
-             * 2. inference to/from calls with a single signature
-             */
-            function inferInstantiationFromUsage(type, usage) {
-                if (!(ts.getObjectFlags(type) & 4 /* Reference */) || !usage.properties) {
-                    return type;
-                }
-                var generic = type.target;
-                var singleTypeParameter = ts.singleOrUndefined(generic.typeParameters);
-                if (!singleTypeParameter)
-                    return type;
-                var types = [];
-                usage.properties.forEach(function (propUsage, name) {
-                    var genericPropertyType = checker.getTypeOfPropertyOfType(generic, name);
-                    ts.Debug.assert(!!genericPropertyType, "generic should have all the properties of its reference.");
-                    types.push.apply(types, inferTypeParameters(genericPropertyType, combineFromUsage(propUsage), singleTypeParameter));
-                });
-                return builtinConstructors[type.symbol.escapedName](combineTypes(types));
-            }
-            function inferTypeParameters(genericType, usageType, typeParameter) {
-                if (genericType === typeParameter) {
-                    return [usageType];
-                }
-                else if (genericType.flags & 3145728 /* UnionOrIntersection */) {
-                    return ts.flatMap(genericType.types, function (t) { return inferTypeParameters(t, usageType, typeParameter); });
-                }
-                else if (genericType.flags & 134217728 /* Awaited */) {
-                    return inferTypeParameters(genericType.awaitedType, usageType, typeParameter);
-                }
-                else if (ts.getObjectFlags(genericType) & 4 /* Reference */ && ts.getObjectFlags(usageType) & 4 /* Reference */) {
-                    // this is wrong because we need a reference to the targetType to, so we can check that it's also a reference
-                    var genericArgs = checker.getTypeArguments(genericType);
-                    var usageArgs = checker.getTypeArguments(usageType);
-                    var types = [];
-                    if (genericArgs && usageArgs) {
-                        for (var i = 0; i < genericArgs.length; i++) {
-                            if (usageArgs[i]) {
-                                types.push.apply(types, inferTypeParameters(genericArgs[i], usageArgs[i], typeParameter));
-                            }
-                        }
-                    }
-                    return types;
-                }
-                var genericSigs = checker.getSignaturesOfType(genericType, 0 /* Call */);
-                var usageSigs = checker.getSignaturesOfType(usageType, 0 /* Call */);
-                if (genericSigs.length === 1 && usageSigs.length === 1) {
-                    return inferFromSignatures(genericSigs[0], usageSigs[0], typeParameter);
-                }
-                return [];
-            }
-            function inferFromSignatures(genericSig, usageSig, typeParameter) {
-                var types = [];
-                for (var i = 0; i < genericSig.parameters.length; i++) {
-                    var genericParam = genericSig.parameters[i];
-                    var usageParam = usageSig.parameters[i];
-                    var isRest = genericSig.declaration && ts.isRestParameter(genericSig.declaration.parameters[i]);
-                    if (!usageParam) {
-                        break;
-                    }
-                    var genericParamType = checker.getTypeOfSymbolAtLocation(genericParam, genericParam.valueDeclaration);
-                    var elementType = isRest && checker.getElementTypeOfArrayType(genericParamType);
-                    if (elementType) {
-                        genericParamType = elementType;
-                    }
-                    var targetType = usageParam.type || checker.getTypeOfSymbolAtLocation(usageParam, usageParam.valueDeclaration);
-                    types.push.apply(types, inferTypeParameters(genericParamType, targetType, typeParameter));
-                }
-                var genericReturn = checker.getReturnTypeOfSignature(genericSig);
-                var usageReturn = checker.getReturnTypeOfSignature(usageSig);
-                types.push.apply(types, inferTypeParameters(genericReturn, usageReturn, typeParameter));
-                return types;
-            }
-            function getFunctionFromCalls(calls) {
-                return checker.createAnonymousType(/*symbol*/ undefined, ts.createSymbolTable(), [getSignatureFromCalls(calls)], ts.emptyArray, /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined);
-            }
-            function getSignatureFromCalls(calls) {
-                var parameters = [];
-                var length = Math.max.apply(Math, calls.map(function (c) { return c.argumentTypes.length; }));
-                var _loop_12 = function (i) {
-                    var symbol = checker.createSymbol(1 /* FunctionScopedVariable */, ts.escapeLeadingUnderscores("arg" + i));
-                    symbol.type = combineTypes(calls.map(function (call) { return call.argumentTypes[i] || checker.getUndefinedType(); }));
-                    if (calls.some(function (call) { return call.argumentTypes[i] === undefined; })) {
-                        symbol.flags |= 16777216 /* Optional */;
-                    }
-                    parameters.push(symbol);
-                };
-                for (var i = 0; i < length; i++) {
-                    _loop_12(i);
-                }
-                var returnType = combineFromUsage(combineUsages(calls.map(function (call) { return call.return_; })));
-                // TODO: GH#18217
-                return checker.createSignature(/*declaration*/ undefined, /*typeParameters*/ undefined, /*thisParameter*/ undefined, parameters, returnType, /*typePredicate*/ undefined, length, 0 /* None */);
-            }
-            function addCandidateType(usage, type) {
-                if (type && !(type.flags & 1 /* Any */) && !(type.flags & 131072 /* Never */)) {
-                    (usage.candidateTypes || (usage.candidateTypes = [])).push(type);
-                }
-            }
-            function addCandidateThisType(usage, type) {
-                if (type && !(type.flags & 1 /* Any */) && !(type.flags & 131072 /* Never */)) {
-                    (usage.candidateThisTypes || (usage.candidateThisTypes = [])).push(type);
-                }
-            }
-        }
-    })(codefix = ts.codefix || (ts.codefix = {}));
-})(ts || (ts = {}));
-/* @internal */
-var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -128412,7 +127730,7 @@ var ts;
             }
             // add the async keyword
             changes.insertLastModifierBefore(sourceFile, 126 /* AsyncKeyword */, functionToConvert);
-            var _loop_13 = function (returnStatement) {
+            var _loop_12 = function (returnStatement) {
                 ts.forEachChild(returnStatement, function visit(node) {
                     if (ts.isCallExpression(node)) {
                         var newNodes = transformExpression(node, transformer);
@@ -128425,7 +127743,7 @@ var ts;
             };
             for (var _i = 0, returnStatements_1 = returnStatements; _i < returnStatements_1.length; _i++) {
                 var returnStatement = returnStatements_1[_i];
-                _loop_13(returnStatement);
+                _loop_12(returnStatement);
             }
         }
         function getReturnStatementsWithPromiseHandlers(body) {
@@ -129404,6 +128722,54 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var errorCodes = [ts.Diagnostics.This_import_is_never_used_as_a_value_and_must_use_import_type_because_the_importsNotUsedAsValues_is_set_to_error.code];
+        var fixId = "convertToTypeOnlyImport";
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) {
+                    var importDeclaration = getImportDeclarationForDiagnosticSpan(context.span, context.sourceFile);
+                    fixSingleImportDeclaration(t, importDeclaration, context);
+                });
+                if (changes.length) {
+                    return [codefix.createCodeFixAction(fixId, changes, ts.Diagnostics.Convert_to_type_only_import, fixId, ts.Diagnostics.Convert_all_imports_not_used_as_a_value_to_type_only_imports)];
+                }
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                    var importDeclaration = getImportDeclarationForDiagnosticSpan(diag, context.sourceFile);
+                    fixSingleImportDeclaration(changes, importDeclaration, context);
+                });
+            }
+        });
+        function getImportDeclarationForDiagnosticSpan(span, sourceFile) {
+            return ts.tryCast(ts.getTokenAtPosition(sourceFile, span.start).parent, ts.isImportDeclaration);
+        }
+        function fixSingleImportDeclaration(changes, importDeclaration, context) {
+            if (!(importDeclaration === null || importDeclaration === void 0 ? void 0 : importDeclaration.importClause)) {
+                return;
+            }
+            var importClause = importDeclaration.importClause;
+            // `changes.insertModifierBefore` produces a range that might overlap further changes
+            changes.insertText(context.sourceFile, importDeclaration.getStart() + "import".length, " type");
+            // `import type foo, { Bar }` is not allowed, so move `foo` to new declaration
+            if (importClause.name && importClause.namedBindings) {
+                changes.deleteNodeRangeExcludingEnd(context.sourceFile, importClause.name, importDeclaration.importClause.namedBindings);
+                changes.insertNodeBefore(context.sourceFile, importDeclaration, ts.updateImportDeclaration(importDeclaration, 
+                /*decorators*/ undefined, 
+                /*modifiers*/ undefined, ts.createImportClause(importClause.name, 
+                /*namedBindings*/ undefined, 
+                /*isTypeOnly*/ true), importDeclaration.moduleSpecifier));
+            }
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -129793,7 +129159,7 @@ var ts;
             var allowsImportingSpecifier = createAutoImportFilter(sourceFile, program, host).allowsImportingSpecifier;
             var choicesForEachExportingModule = ts.flatMap(moduleSymbols, function (_a) {
                 var moduleSymbol = _a.moduleSymbol, importKind = _a.importKind, exportedSymbolIsTypeOnly = _a.exportedSymbolIsTypeOnly;
-                return ts.moduleSpecifiers.getModuleSpecifiers(moduleSymbol, compilerOptions, sourceFile, host, program.getSourceFiles(), preferences, program.redirectTargetsMap)
+                return ts.moduleSpecifiers.getModuleSpecifiers(moduleSymbol, compilerOptions, sourceFile, ts.createModuleSpecifierResolutionHost(program, host), preferences)
                     .map(function (moduleSpecifier) {
                     // `position` should only be undefined at a missing jsx namespace, in which case we shouldn't be looking for pure types.
                     return exportedSymbolIsTypeOnly && isJs
@@ -130143,12 +129509,11 @@ var ts;
         }
         function forEachExternalModuleToImportFrom(program, host, from, filterByPackageJson, cb) {
             var filteredCount = 0;
-            var moduleSpecifierResolutionHost = createModuleSpecifierResolutionHost(program, host);
+            var moduleSpecifierResolutionHost = ts.createModuleSpecifierResolutionHost(program, host);
             var packageJson = filterByPackageJson && createAutoImportFilter(from, program, host, moduleSpecifierResolutionHost);
-            var allSourceFiles = program.getSourceFiles();
-            forEachExternalModule(program.getTypeChecker(), allSourceFiles, function (module, sourceFile) {
+            forEachExternalModule(program.getTypeChecker(), program.getSourceFiles(), function (module, sourceFile) {
                 if (sourceFile === undefined) {
-                    if (!packageJson || packageJson.allowsImportingAmbientModule(module, allSourceFiles)) {
+                    if (!packageJson || packageJson.allowsImportingAmbientModule(module)) {
                         cb(module);
                     }
                     else if (packageJson) {
@@ -130158,7 +129523,7 @@ var ts;
                 else if (sourceFile &&
                     sourceFile !== from &&
                     isImportableFile(program, from, sourceFile, moduleSpecifierResolutionHost)) {
-                    if (!packageJson || packageJson.allowsImportingSourceFile(sourceFile, allSourceFiles)) {
+                    if (!packageJson || packageJson.allowsImportingSourceFile(sourceFile)) {
                         cb(module);
                     }
                     else if (packageJson) {
@@ -130187,7 +129552,7 @@ var ts;
             var _a;
             var getCanonicalFileName = ts.hostGetCanonicalFileName(moduleSpecifierResolutionHost);
             var globalTypingsCache = (_a = moduleSpecifierResolutionHost.getGlobalTypingsCacheLocation) === null || _a === void 0 ? void 0 : _a.call(moduleSpecifierResolutionHost);
-            return !!ts.moduleSpecifiers.forEachFileNameOfModule(program.getSourceFiles(), from.fileName, to.fileName, ts.hostGetCanonicalFileName(moduleSpecifierResolutionHost), moduleSpecifierResolutionHost, program.redirectTargetsMap, 
+            return !!ts.moduleSpecifiers.forEachFileNameOfModule(from.fileName, to.fileName, moduleSpecifierResolutionHost, 
             /*preferSymlinks*/ false, function (toPath) {
                 var toFile = program.getSourceFile(toPath);
                 // Determine to import using toPath only if toPath is what we were looking at
@@ -130239,21 +129604,8 @@ var ts;
             return !ts.isStringANonContextualKeyword(res) ? res || "_" : "_" + res;
         }
         codefix.moduleSpecifierToValidIdentifier = moduleSpecifierToValidIdentifier;
-        function createModuleSpecifierResolutionHost(program, host) {
-            // Mix in `getProbablySymlinks` from Program when host doesn't have it
-            // in order for non-Project hosts to have a symlinks cache.
-            return {
-                directoryExists: ts.maybeBind(host, host.directoryExists),
-                fileExists: ts.maybeBind(host, host.fileExists),
-                getCurrentDirectory: ts.maybeBind(host, host.getCurrentDirectory),
-                readFile: ts.maybeBind(host, host.readFile),
-                useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames),
-                getProbableSymlinks: ts.maybeBind(host, host.getProbableSymlinks) || program.getProbableSymlinks,
-                getGlobalTypingsCacheLocation: ts.maybeBind(host, host.getGlobalTypingsCacheLocation),
-            };
-        }
         function createAutoImportFilter(fromFile, program, host, moduleSpecifierResolutionHost) {
-            if (moduleSpecifierResolutionHost === void 0) { moduleSpecifierResolutionHost = createModuleSpecifierResolutionHost(program, host); }
+            if (moduleSpecifierResolutionHost === void 0) { moduleSpecifierResolutionHost = ts.createModuleSpecifierResolutionHost(program, host); }
             var packageJsons = host.getPackageJsonsVisibleToFile && host.getPackageJsonsVisibleToFile(fromFile.fileName) || ts.getPackageJsonsVisibleToFile(fromFile.fileName, host);
             var dependencyGroups = 1 /* Dependencies */ | 2 /* DevDependencies */ | 8 /* OptionalDependencies */;
             var usesNodeCoreModules;
@@ -130268,12 +129620,12 @@ var ts;
                 }
                 return false;
             }
-            function allowsImportingAmbientModule(moduleSymbol, allSourceFiles) {
+            function allowsImportingAmbientModule(moduleSymbol) {
                 if (!packageJsons.length) {
                     return true;
                 }
                 var declaringSourceFile = moduleSymbol.valueDeclaration.getSourceFile();
-                var declaringNodeModuleName = getNodeModulesPackageNameFromFileName(declaringSourceFile.fileName, allSourceFiles);
+                var declaringNodeModuleName = getNodeModulesPackageNameFromFileName(declaringSourceFile.fileName);
                 if (typeof declaringNodeModuleName === "undefined") {
                     return true;
                 }
@@ -130284,11 +129636,11 @@ var ts;
                 return moduleSpecifierIsCoveredByPackageJson(declaringNodeModuleName)
                     || moduleSpecifierIsCoveredByPackageJson(declaredModuleSpecifier);
             }
-            function allowsImportingSourceFile(sourceFile, allSourceFiles) {
+            function allowsImportingSourceFile(sourceFile) {
                 if (!packageJsons.length) {
                     return true;
                 }
-                var moduleSpecifier = getNodeModulesPackageNameFromFileName(sourceFile.fileName, allSourceFiles);
+                var moduleSpecifier = getNodeModulesPackageNameFromFileName(sourceFile.fileName);
                 if (!moduleSpecifier) {
                     return true;
                 }
@@ -130323,11 +129675,11 @@ var ts;
                 }
                 return false;
             }
-            function getNodeModulesPackageNameFromFileName(importedFileName, allSourceFiles) {
+            function getNodeModulesPackageNameFromFileName(importedFileName) {
                 if (!ts.stringContains(importedFileName, "node_modules")) {
                     return undefined;
                 }
-                var specifier = ts.moduleSpecifiers.getNodeModulesPackageName(host.getCompilationSettings(), fromFile.path, importedFileName, moduleSpecifierResolutionHost, allSourceFiles, program.redirectTargetsMap);
+                var specifier = ts.moduleSpecifiers.getNodeModulesPackageName(host.getCompilationSettings(), fromFile.path, importedFileName, moduleSpecifierResolutionHost);
                 if (!specifier) {
                     return undefined;
                 }
@@ -130350,6 +129702,68 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "fixImplicitThis";
+        var errorCodes = [ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, program = context.program, span = context.span;
+                var diagnostic;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (t) {
+                    diagnostic = doChange(t, sourceFile, span.start, program.getTypeChecker());
+                });
+                return diagnostic ? [codefix.createCodeFixAction(fixId, changes, diagnostic, fixId, ts.Diagnostics.Fix_all_implicit_this_errors)] : ts.emptyArray;
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) { return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                doChange(changes, diag.file, diag.start, context.program.getTypeChecker());
+            }); },
+        });
+        function doChange(changes, sourceFile, pos, checker) {
+            var token = ts.getTokenAtPosition(sourceFile, pos);
+            ts.Debug.assert(token.kind === 104 /* ThisKeyword */);
+            var fn = ts.getThisContainer(token, /*includeArrowFunctions*/ false);
+            if (!ts.isFunctionDeclaration(fn) && !ts.isFunctionExpression(fn))
+                return undefined;
+            if (!ts.isSourceFile(ts.getThisContainer(fn, /*includeArrowFunctions*/ false))) { // 'this' is defined outside, convert to arrow function
+                var fnKeyword = ts.Debug.assertDefined(ts.findChildOfKind(fn, 94 /* FunctionKeyword */, sourceFile));
+                var name = fn.name;
+                var body = ts.Debug.assertDefined(fn.body); // Should be defined because the function contained a 'this' expression
+                if (ts.isFunctionExpression(fn)) {
+                    if (name && ts.FindAllReferences.Core.isSymbolReferencedInFile(name, checker, sourceFile, body)) {
+                        // Function expression references itself. To fix we would have to extract it to a const.
+                        return undefined;
+                    }
+                    // `function() {}` --> `() => {}`
+                    changes.delete(sourceFile, fnKeyword);
+                    if (name) {
+                        changes.delete(sourceFile, name);
+                    }
+                    changes.insertText(sourceFile, body.pos, " =>");
+                    return [ts.Diagnostics.Convert_function_expression_0_to_arrow_function, name ? name.text : ts.ANONYMOUS];
+                }
+                else {
+                    // `function f() {}` => `const f = () => {}`
+                    // `name` should be defined because we only do this in inner contexts, and name is only undefined for `export default function() {}`.
+                    changes.replaceNode(sourceFile, fnKeyword, ts.createToken(81 /* ConstKeyword */));
+                    changes.insertText(sourceFile, name.end, " = ");
+                    changes.insertText(sourceFile, body.pos, " =>");
+                    return [ts.Diagnostics.Convert_function_declaration_0_to_arrow_function, name.text];
+                }
+            }
+            // No outer 'this', add a @class tag if in a JS constructor function
+            else if (ts.isSourceFileJS(sourceFile) && ts.isPropertyAccessExpression(token.parent) && ts.isAssignmentExpression(token.parent.parent)) {
+                codefix.addJSDocTags(changes, sourceFile, fn, [ts.createJSDocClassTag()]);
+                return ts.Diagnostics.Add_class_tag;
+            }
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -130508,7 +129922,7 @@ var ts;
                     });
                     typeDeclToMembers.forEach(function (infos, classDeclaration) {
                         var supers = getAllSupers(classDeclaration, checker);
-                        var _loop_14 = function (info) {
+                        var _loop_13 = function (info) {
                             // If some superclass added this property, don't add it again.
                             if (supers.some(function (superClassOrInterface) {
                                 var superInfos = typeDeclToMembers.get(superClassOrInterface);
@@ -130535,7 +129949,7 @@ var ts;
                         };
                         for (var _i = 0, infos_1 = infos; _i < infos_1.length; _i++) {
                             var info = infos_1[_i];
-                            _loop_14(info);
+                            _loop_13(info);
                         }
                     });
                 }));
@@ -131202,21 +130616,27 @@ var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
-        var fixIdHtmlEntity = "invalidJsxCharactersConvertToHtmlEntity";
-        var fixIdExpression = "invalidJsxCharactersConvertToExpression";
-        var errorCodes = [ts.Diagnostics.Unexpected_token_Did_you_mean_or_gt.code, ts.Diagnostics.Unexpected_token_Did_you_mean_or_rbrace.code];
+        var fixIdExpression = "fixInvalidJsxCharacters_expression";
+        var fixIdHtmlEntity = "fixInvalidJsxCharacters_htmlEntity";
+        var errorCodes = [
+            ts.Diagnostics.Unexpected_token_Did_you_mean_or_gt.code,
+            ts.Diagnostics.Unexpected_token_Did_you_mean_or_rbrace.code
+        ];
         codefix.registerCodeFix({
             errorCodes: errorCodes,
+            fixIds: [fixIdExpression, fixIdHtmlEntity],
             getCodeActions: function (context) {
-                var sourceFile = context.sourceFile, span = context.span;
-                var changeToExpression = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, span.start, /* useHtmlEntity */ false); });
-                var changeToHtmlEntity = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, sourceFile, span.start, /* useHtmlEntity */ true); });
+                var sourceFile = context.sourceFile, preferences = context.preferences, span = context.span;
+                var changeToExpression = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, preferences, sourceFile, span.start, /* useHtmlEntity */ false); });
+                var changeToHtmlEntity = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(t, preferences, sourceFile, span.start, /* useHtmlEntity */ true); });
                 return [
-                    codefix.createCodeFixActionWithoutFixAll(fixIdExpression, changeToExpression, ts.Diagnostics.Wrap_invalid_character_in_an_expression_container),
-                    codefix.createCodeFixAction(fixIdHtmlEntity, changeToHtmlEntity, ts.Diagnostics.Convert_invalid_character_to_its_html_entity_code, fixIdHtmlEntity, ts.Diagnostics.Convert_invalid_character_to_its_html_entity_code),
+                    codefix.createCodeFixAction(fixIdExpression, changeToExpression, ts.Diagnostics.Wrap_invalid_character_in_an_expression_container, fixIdExpression, ts.Diagnostics.Wrap_all_invalid_characters_in_an_expression_container),
+                    codefix.createCodeFixAction(fixIdHtmlEntity, changeToHtmlEntity, ts.Diagnostics.Convert_invalid_character_to_its_html_entity_code, fixIdHtmlEntity, ts.Diagnostics.Convert_all_invalid_characters_to_HTML_entity_code)
                 ];
             },
-            fixIds: [fixIdExpression, fixIdHtmlEntity],
+            getAllCodeActions: function (context) {
+                return codefix.codeFixAll(context, errorCodes, function (changes, diagnostic) { return doChange(changes, context.preferences, diagnostic.file, diagnostic.start, context.fixId === fixIdHtmlEntity); });
+            }
         });
         var htmlEntity = {
             ">": "&gt;",
@@ -131225,15 +130645,13 @@ var ts;
         function isValidCharacter(character) {
             return ts.hasProperty(htmlEntity, character);
         }
-        function doChange(changes, sourceFile, start, useHtmlEntity) {
+        function doChange(changes, preferences, sourceFile, start, useHtmlEntity) {
             var character = sourceFile.getText()[start];
             // sanity check
             if (!isValidCharacter(character)) {
                 return;
             }
-            var replacement = useHtmlEntity
-                ? htmlEntity[character]
-                : "{'" + character + "'}";
+            var replacement = useHtmlEntity ? htmlEntity[character] : "{" + ts.quote(character, preferences) + "}";
             changes.replaceRangeWithText(sourceFile, { pos: start, end: start + 1 }, replacement);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
@@ -131786,6 +131204,989 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "inferFromUsage";
+        var errorCodes = [
+            // Variable declarations
+            ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code,
+            // Variable uses
+            ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code,
+            // Parameter declarations
+            ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code,
+            ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code,
+            // Get Accessor declarations
+            ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code,
+            ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code,
+            // Set Accessor declarations
+            ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code,
+            // Property declarations
+            ts.Diagnostics.Member_0_implicitly_has_an_1_type.code,
+            //// Suggestions
+            // Variable declarations
+            ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage.code,
+            // Variable uses
+            ts.Diagnostics.Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Parameter declarations
+            ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
+            ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Get Accessor declarations
+            ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_get_accessor_may_be_inferred_from_usage.code,
+            ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Set Accessor declarations
+            ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code,
+            // Property declarations
+            ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code,
+            // Function expressions and declarations
+            ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code,
+        ];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var sourceFile = context.sourceFile, program = context.program, start = context.span.start, errorCode = context.errorCode, cancellationToken = context.cancellationToken, host = context.host, preferences = context.preferences;
+                var token = ts.getTokenAtPosition(sourceFile, start);
+                var declaration;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (changes) { declaration = doChange(changes, sourceFile, token, errorCode, program, cancellationToken, /*markSeen*/ ts.returnTrue, host, preferences); });
+                var name = declaration && ts.getNameOfDeclaration(declaration);
+                return !name || changes.length === 0 ? undefined
+                    : [codefix.createCodeFixAction(fixId, changes, [getDiagnostic(errorCode, token), name.getText(sourceFile)], fixId, ts.Diagnostics.Infer_all_types_from_usage)];
+            },
+            fixIds: [fixId],
+            getAllCodeActions: function (context) {
+                var sourceFile = context.sourceFile, program = context.program, cancellationToken = context.cancellationToken, host = context.host, preferences = context.preferences;
+                var markSeen = ts.nodeSeenTracker();
+                return codefix.codeFixAll(context, errorCodes, function (changes, err) {
+                    doChange(changes, sourceFile, ts.getTokenAtPosition(err.file, err.start), err.code, program, cancellationToken, markSeen, host, preferences);
+                });
+            },
+        });
+        function getDiagnostic(errorCode, token) {
+            switch (errorCode) {
+                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code:
+                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.isSetAccessorDeclaration(ts.getContainingFunction(token)) ? ts.Diagnostics.Infer_type_of_0_from_usage : ts.Diagnostics.Infer_parameter_types_from_usage; // TODO: GH#18217
+                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
+                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Infer_parameter_types_from_usage;
+                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
+                    return ts.Diagnostics.Infer_this_type_of_0_from_usage;
+                default:
+                    return ts.Diagnostics.Infer_type_of_0_from_usage;
+            }
+        }
+        /** Map suggestion code to error code */
+        function mapSuggestionDiagnostic(errorCode) {
+            switch (errorCode) {
+                case ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code;
+                case ts.Diagnostics.Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code;
+                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code;
+                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code;
+                case ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_get_accessor_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code;
+                case ts.Diagnostics._0_implicitly_has_an_1_return_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code;
+                case ts.Diagnostics.Property_0_implicitly_has_type_any_but_a_better_type_for_its_set_accessor_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code;
+                case ts.Diagnostics.Member_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage.code:
+                    return ts.Diagnostics.Member_0_implicitly_has_an_1_type.code;
+            }
+            return errorCode;
+        }
+        function doChange(changes, sourceFile, token, errorCode, program, cancellationToken, markSeen, host, preferences) {
+            if (!ts.isParameterPropertyModifier(token.kind) && token.kind !== 75 /* Identifier */ && token.kind !== 25 /* DotDotDotToken */ && token.kind !== 104 /* ThisKeyword */) {
+                return undefined;
+            }
+            var parent = token.parent;
+            var importAdder = codefix.createImportAdder(sourceFile, program, preferences, host);
+            errorCode = mapSuggestionDiagnostic(errorCode);
+            switch (errorCode) {
+                // Variable and Property declarations
+                case ts.Diagnostics.Member_0_implicitly_has_an_1_type.code:
+                case ts.Diagnostics.Variable_0_implicitly_has_type_1_in_some_locations_where_its_type_cannot_be_determined.code:
+                    if ((ts.isVariableDeclaration(parent) && markSeen(parent)) || ts.isPropertyDeclaration(parent) || ts.isPropertySignature(parent)) { // handle bad location
+                        annotateVariableDeclaration(changes, importAdder, sourceFile, parent, program, host, cancellationToken);
+                        importAdder.writeFixes(changes);
+                        return parent;
+                    }
+                    if (ts.isPropertyAccessExpression(parent)) {
+                        var type = inferTypeForVariableFromUsage(parent.name, program, cancellationToken);
+                        var typeNode = ts.getTypeNodeIfAccessible(type, parent, program, host);
+                        if (typeNode) {
+                            // Note that the codefix will never fire with an existing `@type` tag, so there is no need to merge tags
+                            var typeTag = ts.createJSDocTypeTag(ts.createJSDocTypeExpression(typeNode), /*comment*/ "");
+                            addJSDocTags(changes, sourceFile, ts.cast(parent.parent.parent, ts.isExpressionStatement), [typeTag]);
+                        }
+                        importAdder.writeFixes(changes);
+                        return parent;
+                    }
+                    return undefined;
+                case ts.Diagnostics.Variable_0_implicitly_has_an_1_type.code: {
+                    var symbol = program.getTypeChecker().getSymbolAtLocation(token);
+                    if (symbol && symbol.valueDeclaration && ts.isVariableDeclaration(symbol.valueDeclaration) && markSeen(symbol.valueDeclaration)) {
+                        annotateVariableDeclaration(changes, importAdder, sourceFile, symbol.valueDeclaration, program, host, cancellationToken);
+                        importAdder.writeFixes(changes);
+                        return symbol.valueDeclaration;
+                    }
+                    return undefined;
+                }
+            }
+            var containingFunction = ts.getContainingFunction(token);
+            if (containingFunction === undefined) {
+                return undefined;
+            }
+            var declaration;
+            switch (errorCode) {
+                // Parameter declarations
+                case ts.Diagnostics.Parameter_0_implicitly_has_an_1_type.code:
+                    if (ts.isSetAccessorDeclaration(containingFunction)) {
+                        annotateSetAccessor(changes, importAdder, sourceFile, containingFunction, program, host, cancellationToken);
+                        declaration = containingFunction;
+                        break;
+                    }
+                // falls through
+                case ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type.code:
+                    if (markSeen(containingFunction)) {
+                        var param = ts.cast(parent, ts.isParameter);
+                        annotateParameters(changes, importAdder, sourceFile, param, containingFunction, program, host, cancellationToken);
+                        declaration = param;
+                    }
+                    break;
+                // Get Accessor declarations
+                case ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation.code:
+                case ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type.code:
+                    if (ts.isGetAccessorDeclaration(containingFunction) && ts.isIdentifier(containingFunction.name)) {
+                        annotate(changes, importAdder, sourceFile, containingFunction, inferTypeForVariableFromUsage(containingFunction.name, program, cancellationToken), program, host);
+                        declaration = containingFunction;
+                    }
+                    break;
+                // Set Accessor declarations
+                case ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation.code:
+                    if (ts.isSetAccessorDeclaration(containingFunction)) {
+                        annotateSetAccessor(changes, importAdder, sourceFile, containingFunction, program, host, cancellationToken);
+                        declaration = containingFunction;
+                    }
+                    break;
+                // Function 'this'
+                case ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation.code:
+                    if (ts.textChanges.isThisTypeAnnotatable(containingFunction) && markSeen(containingFunction)) {
+                        annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken);
+                        declaration = containingFunction;
+                    }
+                    break;
+                default:
+                    return ts.Debug.fail(String(errorCode));
+            }
+            importAdder.writeFixes(changes);
+            return declaration;
+        }
+        function annotateVariableDeclaration(changes, importAdder, sourceFile, declaration, program, host, cancellationToken) {
+            if (ts.isIdentifier(declaration.name)) {
+                annotate(changes, importAdder, sourceFile, declaration, inferTypeForVariableFromUsage(declaration.name, program, cancellationToken), program, host);
+            }
+        }
+        function annotateParameters(changes, importAdder, sourceFile, parameterDeclaration, containingFunction, program, host, cancellationToken) {
+            if (!ts.isIdentifier(parameterDeclaration.name)) {
+                return;
+            }
+            var parameterInferences = inferTypeForParametersFromUsage(containingFunction, sourceFile, program, cancellationToken);
+            ts.Debug.assert(containingFunction.parameters.length === parameterInferences.length, "Parameter count and inference count should match");
+            if (ts.isInJSFile(containingFunction)) {
+                annotateJSDocParameters(changes, sourceFile, parameterInferences, program, host);
+            }
+            else {
+                var needParens = ts.isArrowFunction(containingFunction) && !ts.findChildOfKind(containingFunction, 20 /* OpenParenToken */, sourceFile);
+                if (needParens)
+                    changes.insertNodeBefore(sourceFile, ts.first(containingFunction.parameters), ts.createToken(20 /* OpenParenToken */));
+                for (var _i = 0, parameterInferences_1 = parameterInferences; _i < parameterInferences_1.length; _i++) {
+                    var _a = parameterInferences_1[_i], declaration = _a.declaration, type = _a.type;
+                    if (declaration && !declaration.type && !declaration.initializer) {
+                        annotate(changes, importAdder, sourceFile, declaration, type, program, host);
+                    }
+                }
+                if (needParens)
+                    changes.insertNodeAfter(sourceFile, ts.last(containingFunction.parameters), ts.createToken(21 /* CloseParenToken */));
+            }
+        }
+        function annotateThis(changes, sourceFile, containingFunction, program, host, cancellationToken) {
+            var references = getFunctionReferences(containingFunction, sourceFile, program, cancellationToken);
+            if (!references || !references.length) {
+                return;
+            }
+            var thisInference = inferTypeFromReferences(program, references, cancellationToken).thisParameter();
+            var typeNode = ts.getTypeNodeIfAccessible(thisInference, containingFunction, program, host);
+            if (!typeNode) {
+                return;
+            }
+            if (ts.isInJSFile(containingFunction)) {
+                annotateJSDocThis(changes, sourceFile, containingFunction, typeNode);
+            }
+            else {
+                changes.tryInsertThisTypeAnnotation(sourceFile, containingFunction, typeNode);
+            }
+        }
+        function annotateJSDocThis(changes, sourceFile, containingFunction, typeNode) {
+            addJSDocTags(changes, sourceFile, containingFunction, [
+                ts.createJSDocThisTag(ts.createJSDocTypeExpression(typeNode)),
+            ]);
+        }
+        function annotateSetAccessor(changes, importAdder, sourceFile, setAccessorDeclaration, program, host, cancellationToken) {
+            var param = ts.firstOrUndefined(setAccessorDeclaration.parameters);
+            if (param && ts.isIdentifier(setAccessorDeclaration.name) && ts.isIdentifier(param.name)) {
+                var type = inferTypeForVariableFromUsage(setAccessorDeclaration.name, program, cancellationToken);
+                if (type === program.getTypeChecker().getAnyType()) {
+                    type = inferTypeForVariableFromUsage(param.name, program, cancellationToken);
+                }
+                if (ts.isInJSFile(setAccessorDeclaration)) {
+                    annotateJSDocParameters(changes, sourceFile, [{ declaration: param, type: type }], program, host);
+                }
+                else {
+                    annotate(changes, importAdder, sourceFile, param, type, program, host);
+                }
+            }
+        }
+        function annotate(changes, importAdder, sourceFile, declaration, type, program, host) {
+            var typeNode = ts.getTypeNodeIfAccessible(type, declaration, program, host);
+            if (typeNode) {
+                if (ts.isInJSFile(sourceFile) && declaration.kind !== 159 /* PropertySignature */) {
+                    var parent = ts.isVariableDeclaration(declaration) ? ts.tryCast(declaration.parent.parent, ts.isVariableStatement) : declaration;
+                    if (!parent) {
+                        return;
+                    }
+                    var typeExpression = ts.createJSDocTypeExpression(typeNode);
+                    var typeTag = ts.isGetAccessorDeclaration(declaration) ? ts.createJSDocReturnTag(typeExpression, "") : ts.createJSDocTypeTag(typeExpression, "");
+                    addJSDocTags(changes, sourceFile, parent, [typeTag]);
+                }
+                else if (!tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, type, sourceFile, changes, importAdder, ts.getEmitScriptTarget(program.getCompilerOptions()))) {
+                    changes.tryInsertTypeAnnotation(sourceFile, declaration, typeNode);
+                }
+            }
+        }
+        function tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, type, sourceFile, changes, importAdder, scriptTarget) {
+            var importableReference = codefix.tryGetAutoImportableReferenceFromImportTypeNode(typeNode, type, scriptTarget);
+            if (importableReference && changes.tryInsertTypeAnnotation(sourceFile, declaration, importableReference.typeReference)) {
+                ts.forEach(importableReference.symbols, function (s) { return importAdder.addImportFromExportedSymbol(s, /*usageIsTypeOnly*/ true); });
+                return true;
+            }
+            return false;
+        }
+        function annotateJSDocParameters(changes, sourceFile, parameterInferences, program, host) {
+            var signature = parameterInferences.length && parameterInferences[0].declaration.parent;
+            if (!signature) {
+                return;
+            }
+            var paramTags = ts.mapDefined(parameterInferences, function (inference) {
+                var param = inference.declaration;
+                // only infer parameters that have (1) no type and (2) an accessible inferred type
+                if (param.initializer || ts.getJSDocType(param) || !ts.isIdentifier(param.name))
+                    return;
+                var typeNode = inference.type && ts.getTypeNodeIfAccessible(inference.type, param, program, host);
+                var name = ts.getSynthesizedClone(param.name);
+                ts.setEmitFlags(name, 1536 /* NoComments */ | 2048 /* NoNestedComments */);
+                return typeNode && ts.createJSDocParamTag(name, !!inference.isOptional, ts.createJSDocTypeExpression(typeNode), "");
+            });
+            addJSDocTags(changes, sourceFile, signature, paramTags);
+        }
+        function addJSDocTags(changes, sourceFile, parent, newTags) {
+            var comments = ts.mapDefined(parent.jsDoc, function (j) { return j.comment; });
+            var oldTags = ts.flatMapToMutable(parent.jsDoc, function (j) { return j.tags; });
+            var unmergedNewTags = newTags.filter(function (newTag) { return !oldTags || !oldTags.some(function (tag, i) {
+                var merged = tryMergeJsdocTags(tag, newTag);
+                if (merged)
+                    oldTags[i] = merged;
+                return !!merged;
+            }); });
+            var tag = ts.createJSDocComment(comments.join("\n"), ts.createNodeArray(__spreadArrays((oldTags || ts.emptyArray), unmergedNewTags)));
+            var jsDocNode = parent.kind === 203 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
+            jsDocNode.jsDoc = parent.jsDoc;
+            jsDocNode.jsDocCache = parent.jsDocCache;
+            changes.insertJsdocCommentBefore(sourceFile, jsDocNode, tag);
+        }
+        codefix.addJSDocTags = addJSDocTags;
+        function getJsDocNodeForArrowFunction(signature) {
+            if (signature.parent.kind === 160 /* PropertyDeclaration */) {
+                return signature.parent;
+            }
+            return signature.parent.parent;
+        }
+        function tryMergeJsdocTags(oldTag, newTag) {
+            if (oldTag.kind !== newTag.kind) {
+                return undefined;
+            }
+            switch (oldTag.kind) {
+                case 318 /* JSDocParameterTag */: {
+                    var oldParam = oldTag;
+                    var newParam = newTag;
+                    return ts.isIdentifier(oldParam.name) && ts.isIdentifier(newParam.name) && oldParam.name.escapedText === newParam.name.escapedText
+                        ? ts.createJSDocParamTag(newParam.name, newParam.isBracketed, newParam.typeExpression, oldParam.comment)
+                        : undefined;
+                }
+                case 319 /* JSDocReturnTag */:
+                    return ts.createJSDocReturnTag(newTag.typeExpression, oldTag.comment);
+            }
+        }
+        function getReferences(token, program, cancellationToken) {
+            // Position shouldn't matter since token is not a SourceFile.
+            return ts.mapDefined(ts.FindAllReferences.getReferenceEntriesForNode(-1, token, program, program.getSourceFiles(), cancellationToken), function (entry) {
+                return entry.kind !== 0 /* Span */ ? ts.tryCast(entry.node, ts.isIdentifier) : undefined;
+            });
+        }
+        function inferTypeForVariableFromUsage(token, program, cancellationToken) {
+            var references = getReferences(token, program, cancellationToken);
+            return inferTypeFromReferences(program, references, cancellationToken).single();
+        }
+        function inferTypeForParametersFromUsage(func, sourceFile, program, cancellationToken) {
+            var references = getFunctionReferences(func, sourceFile, program, cancellationToken);
+            return references && inferTypeFromReferences(program, references, cancellationToken).parameters(func) ||
+                func.parameters.map(function (p) { return ({
+                    declaration: p,
+                    type: ts.isIdentifier(p.name) ? inferTypeForVariableFromUsage(p.name, program, cancellationToken) : program.getTypeChecker().getAnyType()
+                }); });
+        }
+        function getFunctionReferences(containingFunction, sourceFile, program, cancellationToken) {
+            var searchToken;
+            switch (containingFunction.kind) {
+                case 163 /* Constructor */:
+                    searchToken = ts.findChildOfKind(containingFunction, 130 /* ConstructorKeyword */, sourceFile);
+                    break;
+                case 203 /* ArrowFunction */:
+                case 202 /* FunctionExpression */:
+                    var parent = containingFunction.parent;
+                    searchToken = ts.isVariableDeclaration(parent) && ts.isIdentifier(parent.name) ?
+                        parent.name :
+                        containingFunction.name;
+                    break;
+                case 245 /* FunctionDeclaration */:
+                case 162 /* MethodDeclaration */:
+                    searchToken = containingFunction.name;
+                    break;
+            }
+            if (!searchToken) {
+                return undefined;
+            }
+            return getReferences(searchToken, program, cancellationToken);
+        }
+        function inferTypeFromReferences(program, references, cancellationToken) {
+            var checker = program.getTypeChecker();
+            var builtinConstructors = {
+                string: function () { return checker.getStringType(); },
+                number: function () { return checker.getNumberType(); },
+                Array: function (t) { return checker.createArrayType(t); },
+                Promise: function (t) { return checker.createPromiseType(t); },
+            };
+            var builtins = [
+                checker.getStringType(),
+                checker.getNumberType(),
+                checker.createArrayType(checker.getAnyType()),
+                checker.createPromiseType(checker.getAnyType()),
+            ];
+            return {
+                single: single,
+                parameters: parameters,
+                thisParameter: thisParameter,
+            };
+            function createEmptyUsage() {
+                return {
+                    isNumber: undefined,
+                    isString: undefined,
+                    isNumberOrString: undefined,
+                    candidateTypes: undefined,
+                    properties: undefined,
+                    calls: undefined,
+                    constructs: undefined,
+                    numberIndex: undefined,
+                    stringIndex: undefined,
+                    candidateThisTypes: undefined,
+                    inferredTypes: undefined,
+                };
+            }
+            function combineUsages(usages) {
+                var combinedProperties = ts.createUnderscoreEscapedMap();
+                for (var _i = 0, usages_1 = usages; _i < usages_1.length; _i++) {
+                    var u = usages_1[_i];
+                    if (u.properties) {
+                        u.properties.forEach(function (p, name) {
+                            if (!combinedProperties.has(name)) {
+                                combinedProperties.set(name, []);
+                            }
+                            combinedProperties.get(name).push(p);
+                        });
+                    }
+                }
+                var properties = ts.createUnderscoreEscapedMap();
+                combinedProperties.forEach(function (ps, name) {
+                    properties.set(name, combineUsages(ps));
+                });
+                return {
+                    isNumber: usages.some(function (u) { return u.isNumber; }),
+                    isString: usages.some(function (u) { return u.isString; }),
+                    isNumberOrString: usages.some(function (u) { return u.isNumberOrString; }),
+                    candidateTypes: ts.flatMap(usages, function (u) { return u.candidateTypes; }),
+                    properties: properties,
+                    calls: ts.flatMap(usages, function (u) { return u.calls; }),
+                    constructs: ts.flatMap(usages, function (u) { return u.constructs; }),
+                    numberIndex: ts.forEach(usages, function (u) { return u.numberIndex; }),
+                    stringIndex: ts.forEach(usages, function (u) { return u.stringIndex; }),
+                    candidateThisTypes: ts.flatMap(usages, function (u) { return u.candidateThisTypes; }),
+                    inferredTypes: undefined,
+                };
+            }
+            function single() {
+                return combineTypes(inferTypesFromReferencesSingle(references));
+            }
+            function parameters(declaration) {
+                if (references.length === 0 || !declaration.parameters) {
+                    return undefined;
+                }
+                var usage = createEmptyUsage();
+                for (var _i = 0, references_2 = references; _i < references_2.length; _i++) {
+                    var reference = references_2[_i];
+                    cancellationToken.throwIfCancellationRequested();
+                    calculateUsageOfNode(reference, usage);
+                }
+                var calls = __spreadArrays(usage.constructs || [], usage.calls || []);
+                return declaration.parameters.map(function (parameter, parameterIndex) {
+                    var types = [];
+                    var isRest = ts.isRestParameter(parameter);
+                    var isOptional = false;
+                    for (var _i = 0, calls_1 = calls; _i < calls_1.length; _i++) {
+                        var call = calls_1[_i];
+                        if (call.argumentTypes.length <= parameterIndex) {
+                            isOptional = ts.isInJSFile(declaration);
+                            types.push(checker.getUndefinedType());
+                        }
+                        else if (isRest) {
+                            for (var i = parameterIndex; i < call.argumentTypes.length; i++) {
+                                types.push(checker.getBaseTypeOfLiteralType(call.argumentTypes[i]));
+                            }
+                        }
+                        else {
+                            types.push(checker.getBaseTypeOfLiteralType(call.argumentTypes[parameterIndex]));
+                        }
+                    }
+                    if (ts.isIdentifier(parameter.name)) {
+                        var inferred = inferTypesFromReferencesSingle(getReferences(parameter.name, program, cancellationToken));
+                        types.push.apply(types, (isRest ? ts.mapDefined(inferred, checker.getElementTypeOfArrayType) : inferred));
+                    }
+                    var type = combineTypes(types);
+                    return {
+                        type: isRest ? checker.createArrayType(type) : type,
+                        isOptional: isOptional && !isRest,
+                        declaration: parameter
+                    };
+                });
+            }
+            function thisParameter() {
+                var usage = createEmptyUsage();
+                for (var _i = 0, references_3 = references; _i < references_3.length; _i++) {
+                    var reference = references_3[_i];
+                    cancellationToken.throwIfCancellationRequested();
+                    calculateUsageOfNode(reference, usage);
+                }
+                return combineTypes(usage.candidateThisTypes || ts.emptyArray);
+            }
+            function inferTypesFromReferencesSingle(references) {
+                var usage = createEmptyUsage();
+                for (var _i = 0, references_4 = references; _i < references_4.length; _i++) {
+                    var reference = references_4[_i];
+                    cancellationToken.throwIfCancellationRequested();
+                    calculateUsageOfNode(reference, usage);
+                }
+                return inferTypes(usage);
+            }
+            function calculateUsageOfNode(node, usage) {
+                while (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
+                    node = node.parent;
+                }
+                switch (node.parent.kind) {
+                    case 227 /* ExpressionStatement */:
+                        addCandidateType(usage, checker.getVoidType());
+                        break;
+                    case 209 /* PostfixUnaryExpression */:
+                        usage.isNumber = true;
+                        break;
+                    case 208 /* PrefixUnaryExpression */:
+                        inferTypeFromPrefixUnaryExpression(node.parent, usage);
+                        break;
+                    case 210 /* BinaryExpression */:
+                        inferTypeFromBinaryExpression(node, node.parent, usage);
+                        break;
+                    case 278 /* CaseClause */:
+                    case 279 /* DefaultClause */:
+                        inferTypeFromSwitchStatementLabel(node.parent, usage);
+                        break;
+                    case 197 /* CallExpression */:
+                    case 198 /* NewExpression */:
+                        if (node.parent.expression === node) {
+                            inferTypeFromCallExpression(node.parent, usage);
+                        }
+                        else {
+                            inferTypeFromContextualType(node, usage);
+                        }
+                        break;
+                    case 195 /* PropertyAccessExpression */:
+                        inferTypeFromPropertyAccessExpression(node.parent, usage);
+                        break;
+                    case 196 /* ElementAccessExpression */:
+                        inferTypeFromPropertyElementExpression(node.parent, node, usage);
+                        break;
+                    case 282 /* PropertyAssignment */:
+                    case 283 /* ShorthandPropertyAssignment */:
+                        inferTypeFromPropertyAssignment(node.parent, usage);
+                        break;
+                    case 160 /* PropertyDeclaration */:
+                        inferTypeFromPropertyDeclaration(node.parent, usage);
+                        break;
+                    case 243 /* VariableDeclaration */: {
+                        var _a = node.parent, name = _a.name, initializer = _a.initializer;
+                        if (node === name) {
+                            if (initializer) { // This can happen for `let x = null;` which still has an implicit-any error.
+                                addCandidateType(usage, checker.getTypeAtLocation(initializer));
+                            }
+                            break;
+                        }
+                    }
+                    // falls through
+                    default:
+                        return inferTypeFromContextualType(node, usage);
+                }
+            }
+            function inferTypeFromContextualType(node, usage) {
+                if (ts.isExpressionNode(node)) {
+                    addCandidateType(usage, checker.getContextualType(node));
+                }
+            }
+            function inferTypeFromPrefixUnaryExpression(node, usage) {
+                switch (node.operator) {
+                    case 45 /* PlusPlusToken */:
+                    case 46 /* MinusMinusToken */:
+                    case 40 /* MinusToken */:
+                    case 54 /* TildeToken */:
+                        usage.isNumber = true;
+                        break;
+                    case 39 /* PlusToken */:
+                        usage.isNumberOrString = true;
+                        break;
+                    // case SyntaxKind.ExclamationToken:
+                    // no inferences here;
+                }
+            }
+            function inferTypeFromBinaryExpression(node, parent, usage) {
+                switch (parent.operatorToken.kind) {
+                    // ExponentiationOperator
+                    case 42 /* AsteriskAsteriskToken */:
+                    // MultiplicativeOperator
+                    // falls through
+                    case 41 /* AsteriskToken */:
+                    case 43 /* SlashToken */:
+                    case 44 /* PercentToken */:
+                    // ShiftOperator
+                    // falls through
+                    case 47 /* LessThanLessThanToken */:
+                    case 48 /* GreaterThanGreaterThanToken */:
+                    case 49 /* GreaterThanGreaterThanGreaterThanToken */:
+                    // BitwiseOperator
+                    // falls through
+                    case 50 /* AmpersandToken */:
+                    case 51 /* BarToken */:
+                    case 52 /* CaretToken */:
+                    // CompoundAssignmentOperator
+                    // falls through
+                    case 64 /* MinusEqualsToken */:
+                    case 66 /* AsteriskAsteriskEqualsToken */:
+                    case 65 /* AsteriskEqualsToken */:
+                    case 67 /* SlashEqualsToken */:
+                    case 68 /* PercentEqualsToken */:
+                    case 72 /* AmpersandEqualsToken */:
+                    case 73 /* BarEqualsToken */:
+                    case 74 /* CaretEqualsToken */:
+                    case 69 /* LessThanLessThanEqualsToken */:
+                    case 71 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
+                    case 70 /* GreaterThanGreaterThanEqualsToken */:
+                    // AdditiveOperator
+                    // falls through
+                    case 40 /* MinusToken */:
+                    // RelationalOperator
+                    // falls through
+                    case 29 /* LessThanToken */:
+                    case 32 /* LessThanEqualsToken */:
+                    case 31 /* GreaterThanToken */:
+                    case 33 /* GreaterThanEqualsToken */:
+                        var operandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
+                        if (operandType.flags & 1056 /* EnumLike */) {
+                            addCandidateType(usage, operandType);
+                        }
+                        else {
+                            usage.isNumber = true;
+                        }
+                        break;
+                    case 63 /* PlusEqualsToken */:
+                    case 39 /* PlusToken */:
+                        var otherOperandType = checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left);
+                        if (otherOperandType.flags & 1056 /* EnumLike */) {
+                            addCandidateType(usage, otherOperandType);
+                        }
+                        else if (otherOperandType.flags & 296 /* NumberLike */) {
+                            usage.isNumber = true;
+                        }
+                        else if (otherOperandType.flags & 132 /* StringLike */) {
+                            usage.isString = true;
+                        }
+                        else if (otherOperandType.flags & 1 /* Any */) {
+                            // do nothing, maybe we'll learn something elsewhere
+                        }
+                        else {
+                            usage.isNumberOrString = true;
+                        }
+                        break;
+                    //  AssignmentOperators
+                    case 62 /* EqualsToken */:
+                    case 34 /* EqualsEqualsToken */:
+                    case 36 /* EqualsEqualsEqualsToken */:
+                    case 37 /* ExclamationEqualsEqualsToken */:
+                    case 35 /* ExclamationEqualsToken */:
+                        addCandidateType(usage, checker.getTypeAtLocation(parent.left === node ? parent.right : parent.left));
+                        break;
+                    case 97 /* InKeyword */:
+                        if (node === parent.left) {
+                            usage.isString = true;
+                        }
+                        break;
+                    // LogicalOperator Or NullishCoalescing
+                    case 56 /* BarBarToken */:
+                    case 60 /* QuestionQuestionToken */:
+                        if (node === parent.left &&
+                            (node.parent.parent.kind === 243 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
+                            // var x = x || {};
+                            // TODO: use getFalsyflagsOfType
+                            addCandidateType(usage, checker.getTypeAtLocation(parent.right));
+                        }
+                        break;
+                    case 55 /* AmpersandAmpersandToken */:
+                    case 27 /* CommaToken */:
+                    case 98 /* InstanceOfKeyword */:
+                        // nothing to infer here
+                        break;
+                }
+            }
+            function inferTypeFromSwitchStatementLabel(parent, usage) {
+                addCandidateType(usage, checker.getTypeAtLocation(parent.parent.parent.expression));
+            }
+            function inferTypeFromCallExpression(parent, usage) {
+                var call = {
+                    argumentTypes: [],
+                    return_: createEmptyUsage()
+                };
+                if (parent.arguments) {
+                    for (var _i = 0, _a = parent.arguments; _i < _a.length; _i++) {
+                        var argument = _a[_i];
+                        call.argumentTypes.push(checker.getTypeAtLocation(argument));
+                    }
+                }
+                calculateUsageOfNode(parent, call.return_);
+                if (parent.kind === 197 /* CallExpression */) {
+                    (usage.calls || (usage.calls = [])).push(call);
+                }
+                else {
+                    (usage.constructs || (usage.constructs = [])).push(call);
+                }
+            }
+            function inferTypeFromPropertyAccessExpression(parent, usage) {
+                var name = ts.escapeLeadingUnderscores(parent.name.text);
+                if (!usage.properties) {
+                    usage.properties = ts.createUnderscoreEscapedMap();
+                }
+                var propertyUsage = usage.properties.get(name) || createEmptyUsage();
+                calculateUsageOfNode(parent, propertyUsage);
+                usage.properties.set(name, propertyUsage);
+            }
+            function inferTypeFromPropertyElementExpression(parent, node, usage) {
+                if (node === parent.argumentExpression) {
+                    usage.isNumberOrString = true;
+                    return;
+                }
+                else {
+                    var indexType = checker.getTypeAtLocation(parent.argumentExpression);
+                    var indexUsage = createEmptyUsage();
+                    calculateUsageOfNode(parent, indexUsage);
+                    if (indexType.flags & 296 /* NumberLike */) {
+                        usage.numberIndex = indexUsage;
+                    }
+                    else {
+                        usage.stringIndex = indexUsage;
+                    }
+                }
+            }
+            function inferTypeFromPropertyAssignment(assignment, usage) {
+                var nodeWithRealType = ts.isVariableDeclaration(assignment.parent.parent) ?
+                    assignment.parent.parent :
+                    assignment.parent;
+                addCandidateThisType(usage, checker.getTypeAtLocation(nodeWithRealType));
+            }
+            function inferTypeFromPropertyDeclaration(declaration, usage) {
+                addCandidateThisType(usage, checker.getTypeAtLocation(declaration.parent));
+            }
+            function removeLowPriorityInferences(inferences, priorities) {
+                var toRemove = [];
+                for (var _i = 0, inferences_1 = inferences; _i < inferences_1.length; _i++) {
+                    var i = inferences_1[_i];
+                    for (var _a = 0, priorities_1 = priorities; _a < priorities_1.length; _a++) {
+                        var _b = priorities_1[_a], high = _b.high, low = _b.low;
+                        if (high(i)) {
+                            ts.Debug.assert(!low(i), "Priority can't have both low and high");
+                            toRemove.push(low);
+                        }
+                    }
+                }
+                return inferences.filter(function (i) { return toRemove.every(function (f) { return !f(i); }); });
+            }
+            function combineFromUsage(usage) {
+                return combineTypes(inferTypes(usage));
+            }
+            function combineTypes(inferences) {
+                if (!inferences.length)
+                    return checker.getAnyType();
+                // 1. string or number individually override string | number
+                // 2. non-any, non-void overrides any or void
+                // 3. non-nullable, non-any, non-void, non-anonymous overrides anonymous types
+                var stringNumber = checker.getUnionType([checker.getStringType(), checker.getNumberType()]);
+                var priorities = [
+                    {
+                        high: function (t) { return t === checker.getStringType() || t === checker.getNumberType(); },
+                        low: function (t) { return t === stringNumber; }
+                    },
+                    {
+                        high: function (t) { return !(t.flags & (1 /* Any */ | 16384 /* Void */)); },
+                        low: function (t) { return !!(t.flags & (1 /* Any */ | 16384 /* Void */)); }
+                    },
+                    {
+                        high: function (t) { return !(t.flags & (98304 /* Nullable */ | 1 /* Any */ | 16384 /* Void */)) && !(ts.getObjectFlags(t) & 16 /* Anonymous */); },
+                        low: function (t) { return !!(ts.getObjectFlags(t) & 16 /* Anonymous */); }
+                    }
+                ];
+                var good = removeLowPriorityInferences(inferences, priorities);
+                var anons = good.filter(function (i) { return ts.getObjectFlags(i) & 16 /* Anonymous */; });
+                if (anons.length) {
+                    good = good.filter(function (i) { return !(ts.getObjectFlags(i) & 16 /* Anonymous */); });
+                    good.push(combineAnonymousTypes(anons));
+                }
+                return checker.getWidenedType(checker.getUnionType(good.map(checker.getBaseTypeOfLiteralType), 2 /* Subtype */));
+            }
+            function combineAnonymousTypes(anons) {
+                if (anons.length === 1) {
+                    return anons[0];
+                }
+                var calls = [];
+                var constructs = [];
+                var stringIndices = [];
+                var numberIndices = [];
+                var stringIndexReadonly = false;
+                var numberIndexReadonly = false;
+                var props = ts.createMultiMap();
+                for (var _i = 0, anons_1 = anons; _i < anons_1.length; _i++) {
+                    var anon = anons_1[_i];
+                    for (var _a = 0, _b = checker.getPropertiesOfType(anon); _a < _b.length; _a++) {
+                        var p = _b[_a];
+                        props.add(p.name, checker.getTypeOfSymbolAtLocation(p, p.valueDeclaration));
+                    }
+                    calls.push.apply(calls, checker.getSignaturesOfType(anon, 0 /* Call */));
+                    constructs.push.apply(constructs, checker.getSignaturesOfType(anon, 1 /* Construct */));
+                    if (anon.stringIndexInfo) {
+                        stringIndices.push(anon.stringIndexInfo.type);
+                        stringIndexReadonly = stringIndexReadonly || anon.stringIndexInfo.isReadonly;
+                    }
+                    if (anon.numberIndexInfo) {
+                        numberIndices.push(anon.numberIndexInfo.type);
+                        numberIndexReadonly = numberIndexReadonly || anon.numberIndexInfo.isReadonly;
+                    }
+                }
+                var members = ts.mapEntries(props, function (name, types) {
+                    var isOptional = types.length < anons.length ? 16777216 /* Optional */ : 0;
+                    var s = checker.createSymbol(4 /* Property */ | isOptional, name);
+                    s.type = checker.getUnionType(types);
+                    return [name, s];
+                });
+                return checker.createAnonymousType(anons[0].symbol, members, calls, constructs, stringIndices.length ? checker.createIndexInfo(checker.getUnionType(stringIndices), stringIndexReadonly) : undefined, numberIndices.length ? checker.createIndexInfo(checker.getUnionType(numberIndices), numberIndexReadonly) : undefined);
+            }
+            function inferTypes(usage) {
+                var types = [];
+                if (usage.isNumber) {
+                    types.push(checker.getNumberType());
+                }
+                if (usage.isString) {
+                    types.push(checker.getStringType());
+                }
+                if (usage.isNumberOrString) {
+                    types.push(checker.getUnionType([checker.getStringType(), checker.getNumberType()]));
+                }
+                if (usage.numberIndex) {
+                    types.push(checker.createArrayType(combineFromUsage(usage.numberIndex)));
+                }
+                if (usage.properties && usage.properties.size
+                    || usage.calls && usage.calls.length
+                    || usage.constructs && usage.constructs.length
+                    || usage.stringIndex) {
+                    types.push(inferStructuralType(usage));
+                }
+                types.push.apply(types, (usage.candidateTypes || []).map(function (t) { return checker.getBaseTypeOfLiteralType(t); }));
+                types.push.apply(types, inferNamedTypesFromProperties(usage));
+                return types;
+            }
+            function inferStructuralType(usage) {
+                var members = ts.createUnderscoreEscapedMap();
+                if (usage.properties) {
+                    usage.properties.forEach(function (u, name) {
+                        var symbol = checker.createSymbol(4 /* Property */, name);
+                        symbol.type = combineFromUsage(u);
+                        members.set(name, symbol);
+                    });
+                }
+                var callSignatures = usage.calls ? [getSignatureFromCalls(usage.calls)] : [];
+                var constructSignatures = usage.constructs ? [getSignatureFromCalls(usage.constructs)] : [];
+                var stringIndexInfo = usage.stringIndex && checker.createIndexInfo(combineFromUsage(usage.stringIndex), /*isReadonly*/ false);
+                return checker.createAnonymousType(/*symbol*/ undefined, members, callSignatures, constructSignatures, stringIndexInfo, /*numberIndexInfo*/ undefined);
+            }
+            function inferNamedTypesFromProperties(usage) {
+                if (!usage.properties || !usage.properties.size)
+                    return [];
+                var types = builtins.filter(function (t) { return allPropertiesAreAssignableToUsage(t, usage); });
+                if (0 < types.length && types.length < 3) {
+                    return types.map(function (t) { return inferInstantiationFromUsage(t, usage); });
+                }
+                return [];
+            }
+            function allPropertiesAreAssignableToUsage(type, usage) {
+                if (!usage.properties)
+                    return false;
+                return !ts.forEachEntry(usage.properties, function (propUsage, name) {
+                    var source = checker.getTypeOfPropertyOfType(type, name);
+                    if (!source) {
+                        return true;
+                    }
+                    if (propUsage.calls) {
+                        var sigs = checker.getSignaturesOfType(source, 0 /* Call */);
+                        return !sigs.length || !checker.isTypeAssignableTo(source, getFunctionFromCalls(propUsage.calls));
+                    }
+                    else {
+                        return !checker.isTypeAssignableTo(source, combineFromUsage(propUsage));
+                    }
+                });
+            }
+            /**
+             * inference is limited to
+             * 1. generic types with a single parameter
+             * 2. inference to/from calls with a single signature
+             */
+            function inferInstantiationFromUsage(type, usage) {
+                if (!(ts.getObjectFlags(type) & 4 /* Reference */) || !usage.properties) {
+                    return type;
+                }
+                var generic = type.target;
+                var singleTypeParameter = ts.singleOrUndefined(generic.typeParameters);
+                if (!singleTypeParameter)
+                    return type;
+                var types = [];
+                usage.properties.forEach(function (propUsage, name) {
+                    var genericPropertyType = checker.getTypeOfPropertyOfType(generic, name);
+                    ts.Debug.assert(!!genericPropertyType, "generic should have all the properties of its reference.");
+                    types.push.apply(types, inferTypeParameters(genericPropertyType, combineFromUsage(propUsage), singleTypeParameter));
+                });
+                return builtinConstructors[type.symbol.escapedName](combineTypes(types));
+            }
+            function inferTypeParameters(genericType, usageType, typeParameter) {
+                if (genericType === typeParameter) {
+                    return [usageType];
+                }
+                else if (genericType.flags & 3145728 /* UnionOrIntersection */) {
+                    return ts.flatMap(genericType.types, function (t) { return inferTypeParameters(t, usageType, typeParameter); });
+                }
+                else if (genericType.flags & 134217728 /* Awaited */) {
+                    return inferTypeParameters(genericType.awaitedType, usageType, typeParameter);
+                }
+                else if (ts.getObjectFlags(genericType) & 4 /* Reference */ && ts.getObjectFlags(usageType) & 4 /* Reference */) {
+                    // this is wrong because we need a reference to the targetType to, so we can check that it's also a reference
+                    var genericArgs = checker.getTypeArguments(genericType);
+                    var usageArgs = checker.getTypeArguments(usageType);
+                    var types = [];
+                    if (genericArgs && usageArgs) {
+                        for (var i = 0; i < genericArgs.length; i++) {
+                            if (usageArgs[i]) {
+                                types.push.apply(types, inferTypeParameters(genericArgs[i], usageArgs[i], typeParameter));
+                            }
+                        }
+                    }
+                    return types;
+                }
+                var genericSigs = checker.getSignaturesOfType(genericType, 0 /* Call */);
+                var usageSigs = checker.getSignaturesOfType(usageType, 0 /* Call */);
+                // allow for multiple overloads of `then`.
+                if (genericSigs.length === 1 && usageSigs.length === 1) {
+                    return inferFromSignatures(genericSigs[0], usageSigs[0], typeParameter);
+                }
+                return [];
+            }
+            function inferFromSignatures(genericSig, usageSig, typeParameter) {
+                var types = [];
+                for (var i = 0; i < genericSig.parameters.length; i++) {
+                    var genericParam = genericSig.parameters[i];
+                    var usageParam = usageSig.parameters[i];
+                    var isRest = genericSig.declaration && ts.isRestParameter(genericSig.declaration.parameters[i]);
+                    if (!usageParam) {
+                        break;
+                    }
+                    var genericParamType = checker.getTypeOfSymbolAtLocation(genericParam, genericParam.valueDeclaration);
+                    var elementType = isRest && checker.getElementTypeOfArrayType(genericParamType);
+                    if (elementType) {
+                        genericParamType = elementType;
+                    }
+                    var targetType = usageParam.type || checker.getTypeOfSymbolAtLocation(usageParam, usageParam.valueDeclaration);
+                    types.push.apply(types, inferTypeParameters(genericParamType, targetType, typeParameter));
+                }
+                var genericReturn = checker.getReturnTypeOfSignature(genericSig);
+                var usageReturn = checker.getReturnTypeOfSignature(usageSig);
+                types.push.apply(types, inferTypeParameters(genericReturn, usageReturn, typeParameter));
+                return types;
+            }
+            function getFunctionFromCalls(calls) {
+                return checker.createAnonymousType(/*symbol*/ undefined, ts.createSymbolTable(), [getSignatureFromCalls(calls)], ts.emptyArray, /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined);
+            }
+            function getSignatureFromCalls(calls) {
+                var parameters = [];
+                var length = Math.max.apply(Math, calls.map(function (c) { return c.argumentTypes.length; }));
+                var _loop_14 = function (i) {
+                    var symbol = checker.createSymbol(1 /* FunctionScopedVariable */, ts.escapeLeadingUnderscores("arg" + i));
+                    symbol.type = combineTypes(calls.map(function (call) { return call.argumentTypes[i] || checker.getUndefinedType(); }));
+                    if (calls.some(function (call) { return call.argumentTypes[i] === undefined; })) {
+                        symbol.flags |= 16777216 /* Optional */;
+                    }
+                    parameters.push(symbol);
+                };
+                for (var i = 0; i < length; i++) {
+                    _loop_14(i);
+                }
+                var returnType = combineFromUsage(combineUsages(calls.map(function (call) { return call.return_; })));
+                // TODO: GH#18217
+                return checker.createSignature(/*declaration*/ undefined, /*typeParameters*/ undefined, /*thisParameter*/ undefined, parameters, returnType, /*typePredicate*/ undefined, length, 0 /* None */);
+            }
+            function addCandidateType(usage, type) {
+                if (type && !(type.flags & 1 /* Any */) && !(type.flags & 131072 /* Never */)) {
+                    (usage.candidateTypes || (usage.candidateTypes = [])).push(type);
+                }
+            }
+            function addCandidateThisType(usage, type) {
+                if (type && !(type.flags & 1 /* Any */) && !(type.flags & 131072 /* Never */)) {
+                    (usage.candidateThisTypes || (usage.candidateThisTypes = [])).push(type);
+                }
+            }
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -131856,21 +132257,10 @@ var ts;
             }
         }
         codefix.createMissingMemberNodes = createMissingMemberNodes;
-        function getModuleSpecifierResolverHost(context) {
-            return {
-                directoryExists: context.host.directoryExists ? function (d) { return context.host.directoryExists(d); } : undefined,
-                fileExists: context.host.fileExists ? function (f) { return context.host.fileExists(f); } : undefined,
-                getCurrentDirectory: context.host.getCurrentDirectory ? function () { return context.host.getCurrentDirectory(); } : undefined,
-                readFile: context.host.readFile ? function (f) { return context.host.readFile(f); } : undefined,
-                useCaseSensitiveFileNames: context.host.useCaseSensitiveFileNames ? function () { return context.host.useCaseSensitiveFileNames(); } : undefined,
-                getSourceFiles: function () { return context.program.getSourceFiles(); },
-                getCommonSourceDirectory: function () { return context.program.getCommonSourceDirectory(); },
-            };
-        }
         function getNoopSymbolTrackerWithResolver(context) {
             return {
                 trackSymbol: ts.noop,
-                moduleResolverHost: getModuleSpecifierResolverHost(context),
+                moduleResolverHost: ts.getModuleSpecifierResolverHost(context.program, context.host),
             };
         }
         codefix.getNoopSymbolTrackerWithResolver = getNoopSymbolTrackerWithResolver;
@@ -133656,7 +134046,7 @@ var ts;
                     case 245 /* FunctionDeclaration */:
                         return scope.name
                             ? "function '" + scope.name.text + "'"
-                            : "anonymous function";
+                            : ts.ANONYMOUS;
                     case 203 /* ArrowFunction */:
                         return "arrow function";
                     case 162 /* MethodDeclaration */:
@@ -134785,7 +135175,7 @@ var ts;
             var newTypeNode = ts.createTypeAliasDeclaration(
             /* decorators */ undefined, 
             /* modifiers */ undefined, name, typeParameters.map(function (id) { return ts.updateTypeParameterDeclaration(id, id.name, id.constraint, /* defaultType */ undefined); }), selection);
-            changes.insertNodeBefore(file, firstStatement, newTypeNode, /* blankLineBetween */ true);
+            changes.insertNodeBefore(file, firstStatement, ts.ignoreSourceNewlines(newTypeNode), /* blankLineBetween */ true);
             changes.replaceNode(file, selection, ts.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })));
         }
         function doInterfaceChange(changes, file, name, info) {
@@ -134794,7 +135184,7 @@ var ts;
             /* decorators */ undefined, 
             /* modifiers */ undefined, name, typeParameters, 
             /* heritageClauses */ undefined, typeElements);
-            changes.insertNodeBefore(file, firstStatement, newTypeNode, /* blankLineBetween */ true);
+            changes.insertNodeBefore(file, firstStatement, ts.ignoreSourceNewlines(newTypeNode), /* blankLineBetween */ true);
             changes.replaceNode(file, selection, ts.createTypeReferenceNode(name, typeParameters.map(function (id) { return ts.createTypeReferenceNode(id.name, /* typeArguments */ undefined); })));
         }
         function doTypedefChange(changes, file, name, info) {
@@ -139565,7 +139955,10 @@ var ts;
         /// Emit
         LanguageServiceShimObject.prototype.getEmitOutput = function (fileName) {
             var _this = this;
-            return this.forwardJSONCall("getEmitOutput('" + fileName + "')", function () { return _this.languageService.getEmitOutput(fileName); });
+            return this.forwardJSONCall("getEmitOutput('" + fileName + "')", function () {
+                var _a = _this.languageService.getEmitOutput(fileName), diagnostics = _a.diagnostics, rest = __rest(_a, ["diagnostics"]);
+                return __assign(__assign({}, rest), { diagnostics: _this.realizeDiagnostics(diagnostics) });
+            });
         };
         LanguageServiceShimObject.prototype.getEmitOutputObject = function (fileName) {
             var _this = this;
diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
index b3343dddd59..93af1388141 100644
--- a/lib/typingsInstaller.js
+++ b/lib/typingsInstaller.js
@@ -83,7 +83,7 @@ var ts;
     // If changing the text in this section, be sure to test `configurePrerelease` too.
     ts.versionMajorMinor = "3.9";
     /** The version of the TypeScript compiler release */
-    ts.version = ts.versionMajorMinor + ".0-dev";
+    ts.version = ts.versionMajorMinor + ".0-beta";
     /**
      * Returns the native Map implementation if it is available and compatible (i.e. supports iteration).
      */
@@ -4434,6 +4434,7 @@ var ts;
         EmitFlags[EmitFlags["NoAsciiEscaping"] = 16777216] = "NoAsciiEscaping";
         /*@internal*/ EmitFlags[EmitFlags["TypeScriptClassWrapper"] = 33554432] = "TypeScriptClassWrapper";
         /*@internal*/ EmitFlags[EmitFlags["NeverApplyImportHelper"] = 67108864] = "NeverApplyImportHelper";
+        /*@internal*/ EmitFlags[EmitFlags["IgnoreSourceNewlines"] = 134217728] = "IgnoreSourceNewlines";
     })(EmitFlags = ts.EmitFlags || (ts.EmitFlags = {}));
     /**
      * Used by the checker, this enum keeps track of external emit helpers that should be type
@@ -7011,6 +7012,7 @@ var ts;
         Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: diag(2395, ts.DiagnosticCategory.Error, "Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local_2395", "Individual declarations in merged declaration '{0}' must be all exported or all local."),
         Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: diag(2396, ts.DiagnosticCategory.Error, "Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters_2396", "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters."),
         Declaration_name_conflicts_with_built_in_global_identifier_0: diag(2397, ts.DiagnosticCategory.Error, "Declaration_name_conflicts_with_built_in_global_identifier_0_2397", "Declaration name conflicts with built-in global identifier '{0}'."),
+        constructor_cannot_be_used_as_a_parameter_property_name: diag(2398, ts.DiagnosticCategory.Error, "constructor_cannot_be_used_as_a_parameter_property_name_2398", "'constructor' cannot be used as a parameter property name."),
         Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: diag(2399, ts.DiagnosticCategory.Error, "Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference_2399", "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference."),
         Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: diag(2400, ts.DiagnosticCategory.Error, "Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference_2400", "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference."),
         Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: diag(2401, ts.DiagnosticCategory.Error, "Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference_2401", "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference."),
@@ -7345,6 +7347,7 @@ var ts;
         _0_needs_an_explicit_type_annotation: diag(2782, ts.DiagnosticCategory.Message, "_0_needs_an_explicit_type_annotation_2782", "'{0}' needs an explicit type annotation."),
         _0_is_specified_more_than_once_so_this_usage_will_be_overwritten: diag(2783, ts.DiagnosticCategory.Error, "_0_is_specified_more_than_once_so_this_usage_will_be_overwritten_2783", "'{0}' is specified more than once, so this usage will be overwritten."),
         get_and_set_accessors_cannot_declare_this_parameters: diag(2784, ts.DiagnosticCategory.Error, "get_and_set_accessors_cannot_declare_this_parameters_2784", "'get' and 'set' accessors cannot declare 'this' parameters."),
+        This_spread_always_overwrites_this_property: diag(2785, ts.DiagnosticCategory.Error, "This_spread_always_overwrites_this_property_2785", "This spread always overwrites this property."),
         Import_declaration_0_is_using_private_name_1: diag(4000, ts.DiagnosticCategory.Error, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -7696,6 +7699,7 @@ var ts;
         Synchronously_call_callbacks_and_update_the_state_of_directory_watchers_on_platforms_that_don_t_support_recursive_watching_natively: diag(6228, ts.DiagnosticCategory.Message, "Synchronously_call_callbacks_and_update_the_state_of_directory_watchers_on_platforms_that_don_t_supp_6228", "Synchronously call callbacks and update the state of directory watchers on platforms that don't support recursive watching natively."),
         Tag_0_expects_at_least_1_arguments_but_the_JSX_factory_2_provides_at_most_3: diag(6229, ts.DiagnosticCategory.Error, "Tag_0_expects_at_least_1_arguments_but_the_JSX_factory_2_provides_at_most_3_6229", "Tag '{0}' expects at least '{1}' arguments, but the JSX factory '{2}' provides at most '{3}'."),
         Option_0_can_only_be_specified_in_tsconfig_json_file_or_set_to_false_or_null_on_command_line: diag(6230, ts.DiagnosticCategory.Error, "Option_0_can_only_be_specified_in_tsconfig_json_file_or_set_to_false_or_null_on_command_line_6230", "Option '{0}' can only be specified in 'tsconfig.json' file or set to 'false' or 'null' on command line."),
+        Could_not_resolve_the_path_0_with_the_extensions_Colon_1: diag(6231, ts.DiagnosticCategory.Error, "Could_not_resolve_the_path_0_with_the_extensions_Colon_1_6231", "Could not resolve the path '{0}' with the extensions: {1}."),
         Projects_to_reference: diag(6300, ts.DiagnosticCategory.Message, "Projects_to_reference_6300", "Projects to reference"),
         Enable_project_compilation: diag(6302, ts.DiagnosticCategory.Message, "Enable_project_compilation_6302", "Enable project compilation"),
         Composite_projects_may_not_disable_declaration_emit: diag(6304, ts.DiagnosticCategory.Error, "Composite_projects_may_not_disable_declaration_emit_6304", "Composite projects may not disable declaration emit."),
@@ -7992,7 +7996,15 @@ var ts;
         Set_the_target_option_in_your_configuration_file_to_0: diag(95098, ts.DiagnosticCategory.Message, "Set_the_target_option_in_your_configuration_file_to_0_95098", "Set the 'target' option in your configuration file to '{0}'"),
         Set_the_module_option_in_your_configuration_file_to_0: diag(95099, ts.DiagnosticCategory.Message, "Set_the_module_option_in_your_configuration_file_to_0_95099", "Set the 'module' option in your configuration file to '{0}'"),
         Convert_invalid_character_to_its_html_entity_code: diag(95100, ts.DiagnosticCategory.Message, "Convert_invalid_character_to_its_html_entity_code_95100", "Convert invalid character to its html entity code"),
-        Wrap_invalid_character_in_an_expression_container: diag(95101, ts.DiagnosticCategory.Message, "Wrap_invalid_character_in_an_expression_container_95101", "Wrap invalid character in an expression container"),
+        Convert_all_invalid_characters_to_HTML_entity_code: diag(95101, ts.DiagnosticCategory.Message, "Convert_all_invalid_characters_to_HTML_entity_code_95101", "Convert all invalid characters to HTML entity code"),
+        Add_class_tag: diag(95102, ts.DiagnosticCategory.Message, "Add_class_tag_95102", "Add '@class' tag"),
+        Add_this_tag: diag(95103, ts.DiagnosticCategory.Message, "Add_this_tag_95103", "Add '@this' tag"),
+        Add_this_parameter: diag(95104, ts.DiagnosticCategory.Message, "Add_this_parameter_95104", "Add 'this' parameter."),
+        Convert_function_expression_0_to_arrow_function: diag(95105, ts.DiagnosticCategory.Message, "Convert_function_expression_0_to_arrow_function_95105", "Convert function expression '{0}' to arrow function"),
+        Convert_function_declaration_0_to_arrow_function: diag(95106, ts.DiagnosticCategory.Message, "Convert_function_declaration_0_to_arrow_function_95106", "Convert function declaration '{0}' to arrow function"),
+        Fix_all_implicit_this_errors: diag(95107, ts.DiagnosticCategory.Message, "Fix_all_implicit_this_errors_95107", "Fix all implicit-'this' errors"),
+        Wrap_invalid_character_in_an_expression_container: diag(95108, ts.DiagnosticCategory.Message, "Wrap_invalid_character_in_an_expression_container_95108", "Wrap invalid character in an expression container"),
+        Wrap_all_invalid_characters_in_an_expression_container: diag(95109, ts.DiagnosticCategory.Message, "Wrap_all_invalid_characters_in_an_expression_container_95109", "Wrap all invalid characters in an expression container"),
         No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, ts.DiagnosticCategory.Error, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
         Classes_may_not_have_a_field_named_constructor: diag(18006, ts.DiagnosticCategory.Error, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
         JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, ts.DiagnosticCategory.Error, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
@@ -8294,11 +8306,20 @@ var ts;
     }
     ts.getLineStarts = getLineStarts;
     /* @internal */
+    function computeLineAndCharacterOfPosition(lineStarts, position) {
+        var lineNumber = computeLineOfPosition(lineStarts, position);
+        return {
+            line: lineNumber,
+            character: position - lineStarts[lineNumber]
+        };
+    }
+    ts.computeLineAndCharacterOfPosition = computeLineAndCharacterOfPosition;
     /**
+     * @internal
      * We assume the first line starts at position 0 and 'position' is non-negative.
      */
-    function computeLineAndCharacterOfPosition(lineStarts, position) {
-        var lineNumber = ts.binarySearch(lineStarts, position, ts.identity, ts.compareValues);
+    function computeLineOfPosition(lineStarts, position, lowerBound) {
+        var lineNumber = ts.binarySearch(lineStarts, position, ts.identity, ts.compareValues, lowerBound);
         if (lineNumber < 0) {
             // If the actual position was not found,
             // the binary search returns the 2's-complement of the next line start
@@ -8310,12 +8331,22 @@ var ts;
             lineNumber = ~lineNumber - 1;
             ts.Debug.assert(lineNumber !== -1, "position cannot precede the beginning of the file");
         }
-        return {
-            line: lineNumber,
-            character: position - lineStarts[lineNumber]
-        };
+        return lineNumber;
     }
-    ts.computeLineAndCharacterOfPosition = computeLineAndCharacterOfPosition;
+    ts.computeLineOfPosition = computeLineOfPosition;
+    /** @internal */
+    function getLinesBetweenPositions(sourceFile, pos1, pos2) {
+        if (pos1 === pos2)
+            return 0;
+        var lineStarts = getLineStarts(sourceFile);
+        var lower = Math.min(pos1, pos2);
+        var isNegative = lower === pos2;
+        var upper = isNegative ? pos1 : pos2;
+        var lowerLine = computeLineOfPosition(lineStarts, lower);
+        var upperLine = computeLineOfPosition(lineStarts, upper, lowerLine);
+        return isNegative ? lowerLine - upperLine : upperLine - lowerLine;
+    }
+    ts.getLinesBetweenPositions = getLinesBetweenPositions;
     function getLineAndCharacterOfPosition(sourceFile, position) {
         return computeLineAndCharacterOfPosition(getLineStarts(sourceFile), position);
     }
@@ -12687,6 +12718,7 @@ var ts;
     ts.emptyUnderscoreEscapedMap = ts.emptyMap;
     ts.externalHelpersModuleNameText = "tslib";
     ts.defaultMaximumTruncationLength = 160;
+    ts.noTruncationMaximumTruncationLength = 1000000;
     function getDeclarationOfKind(symbol, kind) {
         var declarations = symbol.declarations;
         if (declarations) {
@@ -13140,7 +13172,7 @@ var ts;
             return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos, /*stopAfterLineBreak*/ false, /*stopAtComments*/ true);
         }
         if (includeJsDoc && ts.hasJSDocNodes(node)) {
-            return getTokenPosOfNode(node.jsDoc[0]);
+            return getTokenPosOfNode(node.jsDoc[0], sourceFile);
         }
         // For a syntax list, it is possible that one of its children has JSDocComment nodes, while
         // the syntax list itself considers them as normal trivia. Therefore if we simply skip
@@ -16100,8 +16132,8 @@ var ts;
                 write(s);
             }
         }
-        function writeLine() {
-            if (!lineStart) {
+        function writeLine(force) {
+            if (!lineStart || force) {
                 output += newLine;
                 lineCount++;
                 linePos = output.length;
@@ -16212,6 +16244,14 @@ var ts;
             } });
     }
     ts.getTrailingSemicolonDeferringWriter = getTrailingSemicolonDeferringWriter;
+    function hostUsesCaseSensitiveFileNames(host) {
+        return host.useCaseSensitiveFileNames ? host.useCaseSensitiveFileNames() : false;
+    }
+    ts.hostUsesCaseSensitiveFileNames = hostUsesCaseSensitiveFileNames;
+    function hostGetCanonicalFileName(host) {
+        return ts.createGetCanonicalFileName(hostUsesCaseSensitiveFileNames(host));
+    }
+    ts.hostGetCanonicalFileName = hostGetCanonicalFileName;
     function getResolvedExternalModuleName(host, file, referenceFile) {
         return file.moduleName || getExternalModuleNameFromPath(host, file.fileName, referenceFile && referenceFile.fileName);
     }
@@ -16332,12 +16372,13 @@ var ts;
         }
     }
     ts.writeFileEnsuringDirectories = writeFileEnsuringDirectories;
-    function getLineOfLocalPosition(currentSourceFile, pos) {
-        return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line;
+    function getLineOfLocalPosition(sourceFile, pos) {
+        var lineStarts = ts.getLineStarts(sourceFile);
+        return ts.computeLineOfPosition(lineStarts, pos);
     }
     ts.getLineOfLocalPosition = getLineOfLocalPosition;
     function getLineOfLocalPositionFromLineMap(lineMap, pos) {
-        return ts.computeLineAndCharacterOfPosition(lineMap, pos).line;
+        return ts.computeLineOfPosition(lineMap, pos);
     }
     ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
     function getFirstConstructorWithBody(node) {
@@ -17108,7 +17149,7 @@ var ts;
     }
     ts.rangeIsOnSingleLine = rangeIsOnSingleLine;
     function rangeStartPositionsAreOnSameLine(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), getStartPositionOfRange(range2, sourceFile), sourceFile);
+        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile, /*includeComments*/ false), getStartPositionOfRange(range2, sourceFile, /*includeComments*/ false), sourceFile);
     }
     ts.rangeStartPositionsAreOnSameLine = rangeStartPositionsAreOnSameLine;
     function rangeEndPositionsAreOnSameLine(range1, range2, sourceFile) {
@@ -17116,26 +17157,52 @@ var ts;
     }
     ts.rangeEndPositionsAreOnSameLine = rangeEndPositionsAreOnSameLine;
     function rangeStartIsOnSameLineAsRangeEnd(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile), range2.end, sourceFile);
+        return positionsAreOnSameLine(getStartPositionOfRange(range1, sourceFile, /*includeComments*/ false), range2.end, sourceFile);
     }
     ts.rangeStartIsOnSameLineAsRangeEnd = rangeStartIsOnSameLineAsRangeEnd;
     function rangeEndIsOnSameLineAsRangeStart(range1, range2, sourceFile) {
-        return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile), sourceFile);
+        return positionsAreOnSameLine(range1.end, getStartPositionOfRange(range2, sourceFile, /*includeComments*/ false), sourceFile);
     }
     ts.rangeEndIsOnSameLineAsRangeStart = rangeEndIsOnSameLineAsRangeStart;
+    function getLinesBetweenRangeEndAndRangeStart(range1, range2, sourceFile, includeSecondRangeComments) {
+        var range2Start = getStartPositionOfRange(range2, sourceFile, includeSecondRangeComments);
+        return ts.getLinesBetweenPositions(sourceFile, range1.end, range2Start);
+    }
+    ts.getLinesBetweenRangeEndAndRangeStart = getLinesBetweenRangeEndAndRangeStart;
+    function getLinesBetweenRangeEndPositions(range1, range2, sourceFile) {
+        return ts.getLinesBetweenPositions(sourceFile, range1.end, range2.end);
+    }
+    ts.getLinesBetweenRangeEndPositions = getLinesBetweenRangeEndPositions;
     function isNodeArrayMultiLine(list, sourceFile) {
         return !positionsAreOnSameLine(list.pos, list.end, sourceFile);
     }
     ts.isNodeArrayMultiLine = isNodeArrayMultiLine;
     function positionsAreOnSameLine(pos1, pos2, sourceFile) {
-        return pos1 === pos2 ||
-            getLineOfLocalPosition(sourceFile, pos1) === getLineOfLocalPosition(sourceFile, pos2);
+        return ts.getLinesBetweenPositions(sourceFile, pos1, pos2) === 0;
     }
     ts.positionsAreOnSameLine = positionsAreOnSameLine;
-    function getStartPositionOfRange(range, sourceFile) {
-        return positionIsSynthesized(range.pos) ? -1 : ts.skipTrivia(sourceFile.text, range.pos);
+    function getStartPositionOfRange(range, sourceFile, includeComments) {
+        return positionIsSynthesized(range.pos) ? -1 : ts.skipTrivia(sourceFile.text, range.pos, /*stopAfterLineBreak*/ false, includeComments);
     }
     ts.getStartPositionOfRange = getStartPositionOfRange;
+    function getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter(pos, sourceFile, includeComments) {
+        var startPos = ts.skipTrivia(sourceFile.text, pos, /*stopAfterLineBreak*/ false, includeComments);
+        var prevPos = getPreviousNonWhitespacePosition(startPos, sourceFile);
+        return ts.getLinesBetweenPositions(sourceFile, prevPos || 0, startPos);
+    }
+    ts.getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter = getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter;
+    function getLinesBetweenPositionAndNextNonWhitespaceCharacter(pos, sourceFile, includeComments) {
+        var nextPos = ts.skipTrivia(sourceFile.text, pos, /*stopAfterLineBreak*/ false, includeComments);
+        return ts.getLinesBetweenPositions(sourceFile, pos, nextPos);
+    }
+    ts.getLinesBetweenPositionAndNextNonWhitespaceCharacter = getLinesBetweenPositionAndNextNonWhitespaceCharacter;
+    function getPreviousNonWhitespacePosition(pos, sourceFile) {
+        while (pos-- > 0) {
+            if (!ts.isWhiteSpaceLike(sourceFile.text.charCodeAt(pos))) {
+                return pos;
+            }
+        }
+    }
     /**
      * Determines whether a name was originally the declaration name of an enum or namespace
      * declaration.
@@ -22645,7 +22712,11 @@ var ts;
                         parseErrorAtRange(openingTag, ts.Diagnostics.JSX_fragment_has_no_corresponding_closing_tag);
                     }
                     else {
-                        parseErrorAtRange(openingTag.tagName, ts.Diagnostics.JSX_element_0_has_no_corresponding_closing_tag, ts.getTextOfNodeFromSourceText(sourceText, openingTag.tagName));
+                        // We want the error span to cover only 'Foo.Bar' in < Foo.Bar >
+                        // or to cover only 'Foo' in < Foo >
+                        var tag = openingTag.tagName;
+                        var start = ts.skipTrivia(sourceText, tag.pos);
+                        parseErrorAt(start, tag.end, ts.Diagnostics.JSX_element_0_has_no_corresponding_closing_tag, ts.getTextOfNodeFromSourceText(sourceText, openingTag.tagName));
                     }
                     return undefined;
                 case 30 /* LessThanSlashToken */:
@@ -35680,7 +35751,7 @@ var ts;
                 return true;
             }
             if (isUsedInFunctionOrInstanceProperty(usage, declaration, container)) {
-                if (compilerOptions.target === 99 /* ESNext */ && !!compilerOptions.useDefineForClassFields) {
+                if (compilerOptions.target === 99 /* ESNext */ && !!compilerOptions.useDefineForClassFields && ts.getContainingClass(declaration)) {
                     return (ts.isPropertyDeclaration(declaration) || ts.isParameterPropertyDeclaration(declaration, declaration.parent)) &&
                         !isPropertyImmediatelyReferencedWithinDeclaration(declaration, usage, /*stopAtAnyPropertyDeclaration*/ true);
                 }
@@ -37191,7 +37262,7 @@ var ts;
             return getPackagesSet().has(ts.getTypesPackageName(packageName));
         }
         function resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias) {
-            if (moduleSymbol) {
+            if (moduleSymbol === null || moduleSymbol === void 0 ? void 0 : moduleSymbol.exports) {
                 var exportEquals = resolveSymbol(moduleSymbol.exports.get("export=" /* ExportEquals */), dontResolveAlias);
                 var exported = getCommonJsExportEquals(getMergedSymbol(exportEquals), getMergedSymbol(moduleSymbol));
                 return getMergedSymbol(exported) || moduleSymbol;
@@ -38021,7 +38092,7 @@ var ts;
             var sourceFile = enclosingDeclaration && ts.getSourceFileOfNode(enclosingDeclaration);
             printer.writeNode(4 /* Unspecified */, typeNode, /*sourceFile*/ sourceFile, writer);
             var result = writer.getText();
-            var maxLength = noTruncation ? undefined : ts.defaultMaximumTruncationLength * 2;
+            var maxLength = noTruncation ? ts.noTruncationMaximumTruncationLength * 2 : ts.defaultMaximumTruncationLength * 2;
             if (maxLength && result && result.length >= maxLength) {
                 return result.substr(0, maxLength - "...".length) + "...";
             }
@@ -38082,9 +38153,13 @@ var ts;
                     tracker: tracker && tracker.trackSymbol ? tracker : { trackSymbol: ts.noop, moduleResolverHost: flags & 134217728 /* DoNotIncludeSymbolChain */ ? {
                             getCommonSourceDirectory: host.getCommonSourceDirectory ? function () { return host.getCommonSourceDirectory(); } : function () { return ""; },
                             getSourceFiles: function () { return host.getSourceFiles(); },
-                            getCurrentDirectory: ts.maybeBind(host, host.getCurrentDirectory),
+                            getCurrentDirectory: function () { return host.getCurrentDirectory(); },
                             getProbableSymlinks: ts.maybeBind(host, host.getProbableSymlinks),
-                            useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames)
+                            useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames),
+                            redirectTargetsMap: host.redirectTargetsMap,
+                            getProjectReferenceRedirect: function (fileName) { return host.getProjectReferenceRedirect(fileName); },
+                            isSourceOfProjectReferenceRedirect: function (fileName) { return host.isSourceOfProjectReferenceRedirect(fileName); },
+                            fileExists: function (fileName) { return host.fileExists(fileName); },
                         } : undefined },
                     encounteredError: false,
                     visitedTypes: undefined,
@@ -38098,7 +38173,7 @@ var ts;
             function checkTruncationLength(context) {
                 if (context.truncating)
                     return context.truncating;
-                return context.truncating = !(context.flags & 1 /* NoTruncation */) && context.approximateLength > ts.defaultMaximumTruncationLength;
+                return context.truncating = context.approximateLength > ((context.flags & 1 /* NoTruncation */) ? ts.noTruncationMaximumTruncationLength : ts.defaultMaximumTruncationLength);
             }
             function typeToTypeNodeHelper(type, context) {
                 if (cancellationToken && cancellationToken.throwIfCancellationRequested) {
@@ -38984,7 +39059,7 @@ var ts;
                     // specifier preference
                     var moduleResolverHost = context.tracker.moduleResolverHost;
                     var specifierCompilerOptions = isBundle_1 ? __assign(__assign({}, compilerOptions), { baseUrl: moduleResolverHost.getCommonSourceDirectory() }) : compilerOptions;
-                    specifier = ts.first(ts.moduleSpecifiers.getModuleSpecifiers(symbol, specifierCompilerOptions, contextFile, moduleResolverHost, host.getSourceFiles(), { importModuleSpecifierPreference: isBundle_1 ? "non-relative" : "relative" }, host.redirectTargetsMap));
+                    specifier = ts.first(ts.moduleSpecifiers.getModuleSpecifiers(symbol, specifierCompilerOptions, contextFile, moduleResolverHost, { importModuleSpecifierPreference: isBundle_1 ? "non-relative" : "relative" }));
                     links.specifierCache = links.specifierCache || ts.createMap();
                     links.specifierCache.set(contextFile.path, specifier);
                 }
@@ -40175,7 +40250,7 @@ var ts;
                                     var getCanonicalFileName = ts.createGetCanonicalFileName(!!host.useCaseSensitiveFileNames);
                                     var resolverHost = {
                                         getCanonicalFileName: getCanonicalFileName,
-                                        getCurrentDirectory: context.tracker.moduleResolverHost.getCurrentDirectory ? function () { return context.tracker.moduleResolverHost.getCurrentDirectory(); } : function () { return ""; },
+                                        getCurrentDirectory: function () { return context.tracker.moduleResolverHost.getCurrentDirectory(); },
                                         getCommonSourceDirectory: function () { return context.tracker.moduleResolverHost.getCommonSourceDirectory(); }
                                     };
                                     var newName = ts.getResolvedExternalModuleName(resolverHost, targetFile);
@@ -40920,7 +40995,7 @@ var ts;
                 // [Symbol.iterator] or next). This may be because we accessed properties from anyType,
                 // or it may have led to an error inside getElementTypeOfIterable.
                 var forOfStatement = declaration.parent.parent;
-                return checkRightHandSideOfForOf(forOfStatement.expression, forOfStatement.awaitModifier) || anyType;
+                return checkRightHandSideOfForOf(forOfStatement) || anyType;
             }
             if (ts.isBindingPattern(declaration.parent)) {
                 return getTypeForBindingElement(declaration);
@@ -44132,7 +44207,10 @@ var ts;
             return true;
         }
         function getSignatureOfTypeTag(node) {
-            var typeTag = ts.isInJSFile(node) ? ts.getJSDocTypeTag(node) : undefined;
+            // should be attached to a function declaration or expression
+            if (!(ts.isInJSFile(node) && ts.isFunctionLikeDeclaration(node)))
+                return undefined;
+            var typeTag = ts.getJSDocTypeTag(node);
             var signature = typeTag && typeTag.typeExpression && getSingleCallSignature(getTypeFromTypeNode(typeTag.typeExpression));
             return signature && getErasedSignature(signature);
         }
@@ -46146,65 +46224,89 @@ var ts;
             return type;
         }
         function getConditionalType(root, mapper) {
-            var checkType = instantiateType(root.checkType, mapper);
-            var extendsType = instantiateType(root.extendsType, mapper);
-            if (checkType === wildcardType || extendsType === wildcardType) {
-                return wildcardType;
+            var result;
+            var extraTypes;
+            var _loop_11 = function () {
+                var checkType = instantiateType(root.checkType, mapper);
+                var checkTypeInstantiable = isGenericObjectType(checkType) || isGenericIndexType(checkType);
+                var extendsType = instantiateType(root.extendsType, mapper);
+                if (checkType === wildcardType || extendsType === wildcardType) {
+                    return { value: wildcardType };
+                }
+                var combinedMapper = void 0;
+                if (root.inferTypeParameters) {
+                    var context = createInferenceContext(root.inferTypeParameters, /*signature*/ undefined, 0 /* None */);
+                    // We skip inference of the possible `infer` types unles the `extendsType` _is_ an infer type
+                    // if it was, it's trivial to say that extendsType = checkType, however such a pattern is used to
+                    // "reset" the type being build up during constraint calculation and avoid making an apparently "infinite" constraint
+                    // so in those cases we refain from performing inference and retain the uninfered type parameter
+                    if (!checkTypeInstantiable || !ts.some(root.inferTypeParameters, function (t) { return t === extendsType; })) {
+                        // We don't want inferences from constraints as they may cause us to eagerly resolve the
+                        // conditional type instead of deferring resolution. Also, we always want strict function
+                        // types rules (i.e. proper contravariance) for inferences.
+                        inferTypes(context.inferences, checkType, extendsType, 128 /* NoConstraints */ | 256 /* AlwaysStrict */);
+                    }
+                    combinedMapper = mergeTypeMappers(mapper, context.mapper);
+                }
+                // Instantiate the extends type including inferences for 'infer T' type parameters
+                var inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
+                // We attempt to resolve the conditional type only when the check and extends types are non-generic
+                if (!checkTypeInstantiable && !isGenericObjectType(inferredExtendsType) && !isGenericIndexType(inferredExtendsType)) {
+                    // Return falseType for a definitely false extends check. We check an instantiations of the two
+                    // types with type parameters mapped to the wildcard type, the most permissive instantiations
+                    // possible (the wildcard type is assignable to and from all types). If those are not related,
+                    // then no instantiations will be and we can just return the false branch type.
+                    if (!(inferredExtendsType.flags & 3 /* AnyOrUnknown */) && (checkType.flags & 1 /* Any */ || !isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType)))) {
+                        // Return union of trueType and falseType for 'any' since it matches anything
+                        if (checkType.flags & 1 /* Any */) {
+                            (extraTypes || (extraTypes = [])).push(instantiateTypeWithoutDepthIncrease(root.trueType, combinedMapper || mapper));
+                        }
+                        // If falseType is an immediately nested conditional type that isn't distributive or has an
+                        // identical checkType, switch to that type and loop.
+                        var falseType_1 = root.falseType;
+                        if (falseType_1.flags & 16777216 /* Conditional */) {
+                            var newRoot = falseType_1.root;
+                            if (newRoot.node.parent === root.node && (!newRoot.isDistributive || newRoot.checkType === root.checkType)) {
+                                root = newRoot;
+                                return "continue";
+                            }
+                        }
+                        result = instantiateTypeWithoutDepthIncrease(falseType_1, mapper);
+                        return "break";
+                    }
+                    // Return trueType for a definitely true extends check. We check instantiations of the two
+                    // types with type parameters mapped to their restrictive form, i.e. a form of the type parameter
+                    // that has no constraint. This ensures that, for example, the type
+                    //   type Foo<T extends { x: any }> = T extends { x: string } ? string : number
+                    // doesn't immediately resolve to 'string' instead of being deferred.
+                    if (inferredExtendsType.flags & 3 /* AnyOrUnknown */ || isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(inferredExtendsType))) {
+                        result = instantiateTypeWithoutDepthIncrease(root.trueType, combinedMapper || mapper);
+                        return "break";
+                    }
+                }
+                // Return a deferred type for a check that is neither definitely true nor definitely false
+                var erasedCheckType = getActualTypeVariable(checkType);
+                result = createType(16777216 /* Conditional */);
+                result.root = root;
+                result.checkType = erasedCheckType;
+                result.extendsType = extendsType;
+                result.mapper = mapper;
+                result.combinedMapper = combinedMapper;
+                result.aliasSymbol = root.aliasSymbol;
+                result.aliasTypeArguments = instantiateTypes(root.aliasTypeArguments, mapper); // TODO: GH#18217
+                return "break";
+            };
+            // We loop here for an immediately nested conditional type in the false position, effectively treating
+            // types of the form 'A extends B ? X : C extends D ? Y : E extends F ? Z : ...' as a single construct for
+            // purposes of resolution. This means such types aren't subject to the instatiation depth limiter.
+            while (true) {
+                var state_4 = _loop_11();
+                if (typeof state_4 === "object")
+                    return state_4.value;
+                if (state_4 === "break")
+                    break;
             }
-            var checkTypeInstantiable = isGenericObjectType(checkType) || isGenericIndexType(checkType);
-            var combinedMapper;
-            if (root.inferTypeParameters) {
-                var context = createInferenceContext(root.inferTypeParameters, /*signature*/ undefined, 0 /* None */);
-                // We skip inference of the possible `infer` types unles the `extendsType` _is_ an infer type
-                // if it was, it's trivial to say that extendsType = checkType, however such a pattern is used to
-                // "reset" the type being build up during constraint calculation and avoid making an apparently "infinite" constraint
-                // so in those cases we refain from performing inference and retain the uninfered type parameter
-                if (!checkTypeInstantiable || !ts.some(root.inferTypeParameters, function (t) { return t === extendsType; })) {
-                    // We don't want inferences from constraints as they may cause us to eagerly resolve the
-                    // conditional type instead of deferring resolution. Also, we always want strict function
-                    // types rules (i.e. proper contravariance) for inferences.
-                    inferTypes(context.inferences, checkType, extendsType, 128 /* NoConstraints */ | 256 /* AlwaysStrict */);
-                }
-                combinedMapper = mergeTypeMappers(mapper, context.mapper);
-            }
-            // Instantiate the extends type including inferences for 'infer T' type parameters
-            var inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
-            // We attempt to resolve the conditional type only when the check and extends types are non-generic
-            if (!checkTypeInstantiable && !isGenericObjectType(inferredExtendsType) && !isGenericIndexType(inferredExtendsType)) {
-                if (inferredExtendsType.flags & 3 /* AnyOrUnknown */) {
-                    return instantiateType(root.trueType, combinedMapper || mapper);
-                }
-                // Return union of trueType and falseType for 'any' since it matches anything
-                if (checkType.flags & 1 /* Any */) {
-                    return getUnionType([instantiateType(root.trueType, combinedMapper || mapper), instantiateType(root.falseType, mapper)]);
-                }
-                // Return falseType for a definitely false extends check. We check an instantiations of the two
-                // types with type parameters mapped to the wildcard type, the most permissive instantiations
-                // possible (the wildcard type is assignable to and from all types). If those are not related,
-                // then no instantiations will be and we can just return the false branch type.
-                if (!isTypeAssignableTo(getPermissiveInstantiation(checkType), getPermissiveInstantiation(inferredExtendsType))) {
-                    return instantiateType(root.falseType, mapper);
-                }
-                // Return trueType for a definitely true extends check. We check instantiations of the two
-                // types with type parameters mapped to their restrictive form, i.e. a form of the type parameter
-                // that has no constraint. This ensures that, for example, the type
-                //   type Foo<T extends { x: any }> = T extends { x: string } ? string : number
-                // doesn't immediately resolve to 'string' instead of being deferred.
-                if (isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(inferredExtendsType))) {
-                    return instantiateType(root.trueType, combinedMapper || mapper);
-                }
-            }
-            // Return a deferred type for a check that is neither definitely true nor definitely false
-            var erasedCheckType = getActualTypeVariable(checkType);
-            var result = createType(16777216 /* Conditional */);
-            result.root = root;
-            result.checkType = erasedCheckType;
-            result.extendsType = extendsType;
-            result.mapper = mapper;
-            result.combinedMapper = combinedMapper;
-            result.aliasSymbol = root.aliasSymbol;
-            result.aliasTypeArguments = instantiateTypes(root.aliasTypeArguments, mapper); // TODO: GH#18217
-            return result;
+            return extraTypes ? getUnionType(ts.append(extraTypes, result)) : result;
         }
         function getTrueTypeFromConditionalType(type) {
             return type.resolvedTrueType || (type.resolvedTrueType = instantiateType(type.root.trueType, type.mapper));
@@ -47092,6 +47194,16 @@ var ts;
             instantiationDepth--;
             return result;
         }
+        /**
+         * This can be used to avoid the penalty on instantiation depth for types which result from immediate
+         * simplification. It essentially removes the depth increase done in `instantiateType`.
+         */
+        function instantiateTypeWithoutDepthIncrease(type, mapper) {
+            instantiationDepth--;
+            var result = instantiateType(type, mapper);
+            instantiationDepth++;
+            return result;
+        }
         function instantiateTypeWorker(type, mapper) {
             var _a;
             var flags = type.flags;
@@ -48577,7 +48689,7 @@ var ts;
                     reducedTarget = findMatchingDiscriminantType(source, target, isRelatedTo) || filterPrimitivesIfContainsNonPrimitive(target);
                     checkTypes = reducedTarget.flags & 1048576 /* Union */ ? reducedTarget.types : [reducedTarget];
                 }
-                var _loop_11 = function (prop) {
+                var _loop_12 = function (prop) {
                     if (shouldCheckAsExcessProperty(prop, source.symbol) && !isIgnoredJsxProperty(source, prop)) {
                         if (!isKnownProperty(reducedTarget, prop.escapedName, isComparingJsxAttributes)) {
                             if (reportErrors) {
@@ -48633,9 +48745,9 @@ var ts;
                 };
                 for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
                     var prop = _a[_i];
-                    var state_4 = _loop_11(prop);
-                    if (typeof state_4 === "object")
-                        return state_4.value;
+                    var state_5 = _loop_12(prop);
+                    if (typeof state_5 === "object")
+                        return state_5.value;
                 }
                 return false;
             }
@@ -49071,6 +49183,8 @@ var ts;
                         }
                     }
                     else {
+                        // conditionals aren't related to one another via distributive constraint as it is much too inaccurate and allows way
+                        // more assignments than are desirable (since it maps the source check type to its constraint, it loses information)
                         var distributiveConstraint = getConstraintOfDistributiveConditionalType(source);
                         if (distributiveConstraint) {
                             if (result = isRelatedTo(distributiveConstraint, target, reportErrors)) {
@@ -49078,12 +49192,14 @@ var ts;
                                 return result;
                             }
                         }
-                        var defaultConstraint = getDefaultConstraintOfConditionalType(source);
-                        if (defaultConstraint) {
-                            if (result = isRelatedTo(defaultConstraint, target, reportErrors)) {
-                                resetErrorInfo(saveErrorInfo);
-                                return result;
-                            }
+                    }
+                    // conditionals _can_ be related to one another via normal constraint, as, eg, `A extends B ? O : never` should be assignable to `O`
+                    // when `O` is a conditional (`never` is trivially aissgnable to `O`, as is `O`!).
+                    var defaultConstraint = getDefaultConstraintOfConditionalType(source);
+                    if (defaultConstraint) {
+                        if (result = isRelatedTo(defaultConstraint, target, reportErrors)) {
+                            resetErrorInfo(saveErrorInfo);
+                            return result;
                         }
                     }
                 }
@@ -49312,11 +49428,11 @@ var ts;
                 // constituents of 'target'. If any combination does not have a match then 'source' is not relatable.
                 var discriminantCombinations = ts.cartesianProduct(sourceDiscriminantTypes);
                 var matchingTypes = [];
-                var _loop_12 = function (combination) {
+                var _loop_13 = function (combination) {
                     var hasMatch = false;
                     outer: for (var _i = 0, _a = target.types; _i < _a.length; _i++) {
                         var type = _a[_i];
-                        var _loop_13 = function (i) {
+                        var _loop_14 = function (i) {
                             var sourceProperty = sourcePropertiesFiltered[i];
                             var targetProperty = getPropertyOfType(type, sourceProperty.escapedName);
                             if (!targetProperty)
@@ -49332,8 +49448,8 @@ var ts;
                             }
                         };
                         for (var i = 0; i < sourcePropertiesFiltered.length; i++) {
-                            var state_6 = _loop_13(i);
-                            switch (state_6) {
+                            var state_7 = _loop_14(i);
+                            switch (state_7) {
                                 case "continue-outer": continue outer;
                             }
                         }
@@ -49346,9 +49462,9 @@ var ts;
                 };
                 for (var _a = 0, discriminantCombinations_1 = discriminantCombinations; _a < discriminantCombinations_1.length; _a++) {
                     var combination = discriminantCombinations_1[_a];
-                    var state_5 = _loop_12(combination);
-                    if (typeof state_5 === "object")
-                        return state_5.value;
+                    var state_6 = _loop_13(combination);
+                    if (typeof state_6 === "object")
+                        return state_6.value;
                 }
                 // Compare the remaining non-discriminant properties of each match.
                 var result = -1 /* True */;
@@ -49933,7 +50049,7 @@ var ts;
                 // The emptyArray singleton is used to signal a recursive invocation.
                 cache.variances = ts.emptyArray;
                 variances = [];
-                var _loop_14 = function (tp) {
+                var _loop_15 = function (tp) {
                     var unmeasurable = false;
                     var unreliable = false;
                     var oldHandler = outofbandVarianceMarkerHandler;
@@ -49963,7 +50079,7 @@ var ts;
                 };
                 for (var _i = 0, typeParameters_1 = typeParameters; _i < typeParameters_1.length; _i++) {
                     var tp = typeParameters_1[_i];
-                    _loop_14(tp);
+                    _loop_15(tp);
                 }
                 cache.variances = variances;
             }
@@ -51071,7 +51187,7 @@ var ts;
         function inferTypes(inferences, originalSource, originalTarget, priority, contravariant) {
             if (priority === void 0) { priority = 0; }
             if (contravariant === void 0) { contravariant = false; }
-            var symbolStack;
+            var symbolOrTypeStack;
             var visited;
             var bivariant = false;
             var propagationType;
@@ -51250,8 +51366,8 @@ var ts;
                     priority = savePriority;
                 }
                 else if (target.flags & 134217728 /* Awaited */) {
-                    var targetTypes = [target.awaitedType, createPromiseLikeType(target.awaitedType)];
-                    inferToMultipleTypes(source, targetTypes, target.flags);
+                    inferFromTypes(source, target.awaitedType);
+                    inferFromTypes(source, createPromiseLikeType(target.awaitedType));
                 }
                 else if (target.flags & 3145728 /* UnionOrIntersection */) {
                     inferToMultipleTypes(source, target.types, target.flags);
@@ -51378,10 +51494,34 @@ var ts;
                 }
                 return typeVariable;
             }
+            function isPromiseForType(promiseType, promisedType) {
+                var _a;
+                return isThenableType(promiseType) && unwrapAwaitedType((_a = getPromisedTypeOfPromise(promiseType)) !== null && _a !== void 0 ? _a : errorType) === promisedType;
+            }
             function inferToMultipleTypes(source, targets, targetFlags) {
                 var typeVariableCount = 0;
                 if (targetFlags & 1048576 /* Union */) {
                     var nakedTypeVariable = void 0;
+                    for (var _i = 0, targets_2 = targets; _i < targets_2.length; _i++) {
+                        var t = targets_2[_i];
+                        if (getInferenceInfoForType(t)) {
+                            nakedTypeVariable = t;
+                            typeVariableCount++;
+                        }
+                    }
+                    // To better support backwards compatibility with the new `awaited` type, we detect a target
+                    // union of exactly `T | PromiseLike<T>` (for any compatible `PromiseLike`). When encountered,
+                    // we infer from source to the type parameter `T`, where each type of source is mapped to extract
+                    // the promised type of any promise (e.g., `string | Promise<number>` becomes `string | number`).
+                    if (typeVariableCount === 1 && targets.length === 2) {
+                        for (var _a = 0, targets_3 = targets; _a < targets_3.length; _a++) {
+                            var t = targets_3[_a];
+                            if (!getInferenceInfoForType(t) && isPromiseForType(t, nakedTypeVariable)) {
+                                inferFromTypes(mapType(source, function (s) { var _a; return (_a = getPromisedTypeOfPromise(s)) !== null && _a !== void 0 ? _a : s; }), nakedTypeVariable);
+                                return;
+                            }
+                        }
+                    }
                     var sources = source.flags & 1048576 /* Union */ ? source.types : [source];
                     var matched_1 = new Array(sources.length);
                     var inferenceCircularity = false;
@@ -51389,13 +51529,9 @@ var ts;
                     // track whether inferences were made from that particular type to some target with
                     // equal priority (i.e. of equal quality) to what we would infer for a naked type
                     // parameter.
-                    for (var _i = 0, targets_2 = targets; _i < targets_2.length; _i++) {
-                        var t = targets_2[_i];
-                        if (getInferenceInfoForType(t)) {
-                            nakedTypeVariable = t;
-                            typeVariableCount++;
-                        }
-                        else {
+                    for (var _b = 0, targets_4 = targets; _b < targets_4.length; _b++) {
+                        var t = targets_4[_b];
+                        if (!getInferenceInfoForType(t)) {
                             for (var i = 0; i < sources.length; i++) {
                                 var saveInferencePriority = inferencePriority;
                                 inferencePriority = 512 /* MaxValue */;
@@ -51433,8 +51569,8 @@ var ts;
                     // We infer from types that are not naked type variables first so that inferences we
                     // make from nested naked type variables and given slightly higher priority by virtue
                     // of being first in the candidates array.
-                    for (var _a = 0, targets_3 = targets; _a < targets_3.length; _a++) {
-                        var t = targets_3[_a];
+                    for (var _c = 0, targets_5 = targets; _c < targets_5.length; _c++) {
+                        var t = targets_5[_c];
                         if (getInferenceInfoForType(t)) {
                             typeVariableCount++;
                         }
@@ -51448,8 +51584,8 @@ var ts;
                 // we want to infer string for T, not Promise<string> | string. For intersection types
                 // we only infer to single naked type variables.
                 if (targetFlags & 2097152 /* Intersection */ ? typeVariableCount === 1 : typeVariableCount > 0) {
-                    for (var _b = 0, targets_4 = targets; _b < targets_4.length; _b++) {
-                        var t = targets_4[_b];
+                    for (var _d = 0, targets_6 = targets; _d < targets_6.length; _d++) {
+                        var t = targets_6[_d];
                         if (getInferenceInfoForType(t)) {
                             inferWithPriority(source, t, 1 /* NakedTypeVariable */);
                         }
@@ -51514,15 +51650,15 @@ var ts;
                 // its symbol with the instance side which would lead to false positives.
                 var isNonConstructorObject = target.flags & 524288 /* Object */ &&
                     !(ts.getObjectFlags(target) & 16 /* Anonymous */ && target.symbol && target.symbol.flags & 32 /* Class */);
-                var symbol = isNonConstructorObject ? target.symbol : undefined;
-                if (symbol) {
-                    if (ts.contains(symbolStack, symbol)) {
+                var symbolOrType = isNonConstructorObject ? isTupleType(target) ? target.target : target.symbol : undefined;
+                if (symbolOrType) {
+                    if (ts.contains(symbolOrTypeStack, symbolOrType)) {
                         inferencePriority = -1 /* Circularity */;
                         return;
                     }
-                    (symbolStack || (symbolStack = [])).push(symbol);
+                    (symbolOrTypeStack || (symbolOrTypeStack = [])).push(symbolOrType);
                     inferFromObjectTypesWorker(source, target);
-                    symbolStack.pop();
+                    symbolOrTypeStack.pop();
                 }
                 else {
                     inferFromObjectTypesWorker(source, target);
@@ -51851,6 +51987,12 @@ var ts;
             }
             return false;
         }
+        // Given a source x, check if target matches x or is an && operation with an operand that matches x.
+        function containsTruthyCheck(source, target) {
+            return isMatchingReference(source, target) ||
+                (target.kind === 210 /* BinaryExpression */ && target.operatorToken.kind === 55 /* AmpersandAmpersandToken */ &&
+                    (containsTruthyCheck(source, target.left) || containsTruthyCheck(source, target.right)));
+        }
         function getAccessedPropertyName(access) {
             return access.kind === 195 /* PropertyAccessExpression */ ? access.name.escapedText :
                 ts.isStringOrNumericLiteralLike(access.argumentExpression) ? ts.escapeLeadingUnderscores(access.argumentExpression.text) :
@@ -52097,7 +52239,7 @@ var ts;
                 case 232 /* ForInStatement */:
                     return stringType;
                 case 233 /* ForOfStatement */:
-                    return checkRightHandSideOfForOf(parent.expression, parent.awaitModifier) || errorType;
+                    return checkRightHandSideOfForOf(parent) || errorType;
                 case 210 /* BinaryExpression */:
                     return getAssignedTypeOfBinaryExpression(parent);
                 case 204 /* DeleteExpression */:
@@ -52138,7 +52280,7 @@ var ts;
                 return stringType;
             }
             if (node.parent.parent.kind === 233 /* ForOfStatement */) {
-                return checkRightHandSideOfForOf(node.parent.parent.expression, node.parent.parent.awaitModifier) || errorType;
+                return checkRightHandSideOfForOf(node.parent.parent) || errorType;
             }
             return errorType;
         }
@@ -52370,20 +52512,29 @@ var ts;
             return isLengthPushOrUnshift || isElementAssignment;
         }
         function isDeclarationWithExplicitTypeAnnotation(declaration) {
-            return !!(declaration && (declaration.kind === 243 /* VariableDeclaration */ || declaration.kind === 157 /* Parameter */ ||
+            return (declaration.kind === 243 /* VariableDeclaration */ || declaration.kind === 157 /* Parameter */ ||
                 declaration.kind === 160 /* PropertyDeclaration */ || declaration.kind === 159 /* PropertySignature */) &&
-                ts.getEffectiveTypeAnnotationNode(declaration));
+                !!ts.getEffectiveTypeAnnotationNode(declaration);
         }
         function getExplicitTypeOfSymbol(symbol, diagnostic) {
             if (symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 512 /* ValueModule */)) {
                 return getTypeOfSymbol(symbol);
             }
             if (symbol.flags & (3 /* Variable */ | 4 /* Property */)) {
-                if (isDeclarationWithExplicitTypeAnnotation(symbol.valueDeclaration)) {
-                    return getTypeOfSymbol(symbol);
-                }
-                if (diagnostic && symbol.valueDeclaration) {
-                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(symbol.valueDeclaration, ts.Diagnostics._0_needs_an_explicit_type_annotation, symbolToString(symbol)));
+                var declaration = symbol.valueDeclaration;
+                if (declaration) {
+                    if (isDeclarationWithExplicitTypeAnnotation(declaration)) {
+                        return getTypeOfSymbol(symbol);
+                    }
+                    if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 233 /* ForOfStatement */) {
+                        var expressionType = getTypeOfDottedName(declaration.parent.parent.expression, /*diagnostic*/ undefined);
+                        if (expressionType) {
+                            return getForOfIterationType(declaration.parent.parent, expressionType);
+                        }
+                    }
+                    if (diagnostic) {
+                        ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(declaration, ts.Diagnostics._0_needs_an_explicit_type_annotation, symbolToString(symbol)));
+                    }
                 }
             }
         }
@@ -53148,14 +53299,22 @@ var ts;
                 if (type.flags & 1 /* Any */ && literal.text === "function") {
                     return type;
                 }
+                if (assumeTrue && type.flags & 2 /* Unknown */ && literal.text === "object") {
+                    // The pattern x && typeof x === 'object', where x is of type unknown, narrows x to type object. We don't
+                    // need to check for the reverse typeof x === 'object' && x since that already narrows correctly.
+                    if (typeOfExpr.parent.parent.kind === 210 /* BinaryExpression */) {
+                        var expr = typeOfExpr.parent.parent;
+                        if (expr.operatorToken.kind === 55 /* AmpersandAmpersandToken */ && expr.right === typeOfExpr.parent && containsTruthyCheck(reference, expr.left)) {
+                            return nonPrimitiveType;
+                        }
+                    }
+                    return getUnionType([nonPrimitiveType, nullType]);
+                }
                 var facts = assumeTrue ?
                     typeofEQFacts.get(literal.text) || 128 /* TypeofEQHostObject */ :
                     typeofNEFacts.get(literal.text) || 32768 /* TypeofNEHostObject */;
                 return getTypeWithFacts(assumeTrue ? mapType(type, narrowTypeForTypeof) : type, facts);
                 function narrowTypeForTypeof(type) {
-                    if (type.flags & 2 /* Unknown */ && literal.text === "object") {
-                        return getUnionType([nonPrimitiveType, nullType]);
-                    }
                     // 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.
@@ -53430,7 +53589,10 @@ var ts;
                         }
                         if (strictNullChecks && assumeTrue && optionalChainContainsReference(predicateArgument, reference) &&
                             !(getTypeFacts(predicate.type) & 65536 /* EQUndefined */)) {
-                            return getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
+                            type = getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
+                        }
+                        if (isMatchingReferenceDiscriminant(predicateArgument, declaredType)) {
+                            return narrowTypeByDiscriminant(type, predicateArgument, function (t) { return getNarrowedType(t, predicate.type, assumeTrue, isTypeSubtypeOf); });
                         }
                     }
                 }
@@ -55312,8 +55474,8 @@ var ts;
             var inDestructuringPattern = ts.isAssignmentTarget(node);
             // Grammar checking
             checkGrammarObjectLiteralExpression(node, inDestructuringPattern);
-            var propertiesTable;
-            var allPropertiesTable = ts.createSymbolTable();
+            var allPropertiesTable = strictNullChecks ? ts.createSymbolTable() : undefined;
+            var propertiesTable = ts.createSymbolTable();
             var propertiesArray = [];
             var spread = emptyObjectType;
             var contextualType = getApparentTypeOfContextualType(node);
@@ -55328,7 +55490,6 @@ var ts;
             var patternWithComputedProperties = false;
             var hasComputedStringProperty = false;
             var hasComputedNumberProperty = false;
-            propertiesTable = ts.createSymbolTable();
             var offset = 0;
             for (var i = 0; i < node.properties.length; i++) {
                 var memberDecl = node.properties[i];
@@ -55387,7 +55548,7 @@ var ts;
                     prop.type = type;
                     prop.target = member;
                     member = prop;
-                    allPropertiesTable.set(prop.escapedName, prop);
+                    allPropertiesTable === null || allPropertiesTable === void 0 ? void 0 : allPropertiesTable.set(prop.escapedName, prop);
                 }
                 else if (memberDecl.kind === 284 /* SpreadAssignment */) {
                     if (languageVersion < 2 /* ES2015 */) {
@@ -55405,15 +55566,8 @@ var ts;
                         error(memberDecl, ts.Diagnostics.Spread_types_may_only_be_created_from_object_types);
                         return errorType;
                     }
-                    for (var _i = 0, _a = getPropertiesOfType(type); _i < _a.length; _i++) {
-                        var right = _a[_i];
-                        var rightType = getTypeOfSymbol(right);
-                        var left = allPropertiesTable.get(right.escapedName);
-                        if (strictNullChecks &&
-                            left &&
-                            !maybeTypeOfKind(rightType, 98304 /* Nullable */)) {
-                            error(left.valueDeclaration, ts.Diagnostics._0_is_specified_more_than_once_so_this_usage_will_be_overwritten, ts.unescapeLeadingUnderscores(left.escapedName));
-                        }
+                    if (allPropertiesTable) {
+                        checkSpreadPropOverrides(type, allPropertiesTable, memberDecl);
                     }
                     spread = getSpreadType(spread, type, node.symbol, objectFlags, inConstContext);
                     offset = i + 1;
@@ -55451,8 +55605,8 @@ var ts;
             // If the object literal is spread into another object literal, skip this step and let the top-level object
             // literal handle it instead.
             if (contextualTypeHasPattern && node.parent.kind !== 284 /* SpreadAssignment */) {
-                for (var _b = 0, _c = getPropertiesOfType(contextualType); _b < _c.length; _b++) {
-                    var prop = _c[_b];
+                for (var _i = 0, _a = getPropertiesOfType(contextualType); _i < _a.length; _i++) {
+                    var prop = _a[_i];
                     if (!propertiesTable.get(prop.escapedName) && !getPropertyOfType(spread, prop.escapedName)) {
                         if (!(prop.flags & 16777216 /* Optional */)) {
                             error(prop.valueDeclaration || prop.bindingElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
@@ -55565,6 +55719,7 @@ var ts;
          */
         function createJsxAttributesTypeFromAttributesProperty(openingLikeElement, checkMode) {
             var attributes = openingLikeElement.attributes;
+            var allAttributesTable = strictNullChecks ? ts.createSymbolTable() : undefined;
             var attributesTable = ts.createSymbolTable();
             var spread = emptyJsxObjectType;
             var hasSpreadAnyType = false;
@@ -55587,6 +55742,7 @@ var ts;
                     attributeSymbol.type = exprType;
                     attributeSymbol.target = member;
                     attributesTable.set(attributeSymbol.escapedName, attributeSymbol);
+                    allAttributesTable === null || allAttributesTable === void 0 ? void 0 : allAttributesTable.set(attributeSymbol.escapedName, attributeSymbol);
                     if (attributeDecl.name.escapedText === jsxChildrenPropertyName) {
                         explicitlySpecifyChildrenAttribute = true;
                     }
@@ -55603,6 +55759,9 @@ var ts;
                     }
                     if (isValidSpreadType(exprType)) {
                         spread = getSpreadType(spread, exprType, attributes.symbol, objectFlags, /*readonly*/ false);
+                        if (allAttributesTable) {
+                            checkSpreadPropOverrides(exprType, allAttributesTable, attributeDecl);
+                        }
                     }
                     else {
                         typeToIntersect = typeToIntersect ? getIntersectionType([typeToIntersect, exprType]) : exprType;
@@ -55678,6 +55837,16 @@ var ts;
             }
             return childrenTypes;
         }
+        function checkSpreadPropOverrides(type, props, spread) {
+            for (var _i = 0, _a = getPropertiesOfType(type); _i < _a.length; _i++) {
+                var right = _a[_i];
+                var left = props.get(right.escapedName);
+                if (left && !maybeTypeOfKind(getTypeOfSymbol(right), 98304 /* Nullable */)) {
+                    var diagnostic = error(left.valueDeclaration, ts.Diagnostics._0_is_specified_more_than_once_so_this_usage_will_be_overwritten, ts.unescapeLeadingUnderscores(left.escapedName));
+                    ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(spread, ts.Diagnostics.This_spread_always_overwrites_this_property));
+                }
+            }
+        }
         /**
          * Check attributes property of opening-like element. This function is called during chooseOverload to get call signature of a JSX opening-like element.
          * (See "checkApplicableSignatureForJsxOpeningLikeElement" for how the function is used)
@@ -57589,7 +57758,7 @@ var ts;
                         var min_3 = Number.MAX_VALUE;
                         var minIndex = 0;
                         var i_1 = 0;
-                        var _loop_15 = function (c) {
+                        var _loop_16 = function (c) {
                             var chain_2 = function () { return ts.chainDiagnosticMessages(/*details*/ undefined, ts.Diagnostics.Overload_0_of_1_2_gave_the_following_error, i_1 + 1, candidates.length, signatureToString(c)); };
                             var diags_2 = getSignatureApplicabilityError(node, args, c, assignableRelation, 0 /* Normal */, /*reportErrors*/ true, chain_2);
                             if (diags_2) {
@@ -57607,7 +57776,7 @@ var ts;
                         };
                         for (var _a = 0, candidatesForArgumentError_1 = candidatesForArgumentError; _a < candidatesForArgumentError_1.length; _a++) {
                             var c = candidatesForArgumentError_1[_a];
-                            _loop_15(c);
+                            _loop_16(c);
                         }
                         var diags_3 = max > 1 ? allDiagnostics[minIndex] : ts.flatten(allDiagnostics);
                         ts.Debug.assert(diags_3.length > 0, "No errors reported for 3 or fewer overload signatures");
@@ -57741,7 +57910,7 @@ var ts;
             }
             var _a = ts.minAndMax(candidates, getNumNonRestParameters), minArgumentCount = _a.min, maxNonRestParam = _a.max;
             var parameters = [];
-            var _loop_16 = function (i) {
+            var _loop_17 = function (i) {
                 var symbols = ts.mapDefined(candidates, function (s) { return signatureHasRestParameter(s) ?
                     i < s.parameters.length - 1 ? s.parameters[i] : ts.last(s.parameters) :
                     i < s.parameters.length ? s.parameters[i] : undefined; });
@@ -57749,7 +57918,7 @@ var ts;
                 parameters.push(createCombinedSymbolFromTypes(symbols, ts.mapDefined(candidates, function (candidate) { return tryGetTypeAtPosition(candidate, i); })));
             };
             for (var i = 0; i < maxNonRestParam; i++) {
-                _loop_16(i);
+                _loop_17(i);
             }
             var restParameterSymbols = ts.mapDefined(candidates, function (c) { return signatureHasRestParameter(c) ? ts.last(c.parameters) : undefined; });
             var flags = 0 /* None */;
@@ -58855,7 +59024,7 @@ var ts;
             var globalPromiseType = getGlobalPromiseType(/*reportErrors*/ true);
             if (globalPromiseType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || unknownType;
+                promisedType = unwrapAwaitedType(getAwaitedType(promisedType) || unknownType);
                 return createTypeReference(globalPromiseType, [promisedType]);
             }
             return unknownType;
@@ -58865,7 +59034,7 @@ var ts;
             var globalPromiseLikeType = getGlobalPromiseLikeType(/*reportErrors*/ true);
             if (globalPromiseLikeType !== emptyGenericType) {
                 // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType) || unknownType;
+                promisedType = unwrapAwaitedType(getAwaitedType(promisedType) || unknownType);
                 return createTypeReference(globalPromiseLikeType, [promisedType]);
             }
             return unknownType;
@@ -60920,6 +61089,9 @@ var ts;
                 if (!(func.kind === 163 /* Constructor */ && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
+                if (func.kind === 163 /* Constructor */ && ts.isIdentifier(node.name) && node.name.escapedText === "constructor") {
+                    error(node.name, ts.Diagnostics.constructor_cannot_be_used_as_a_parameter_property_name);
+                }
             }
             if (node.questionToken && ts.isBindingPattern(node.name) && func.body) {
                 error(node, ts.Diagnostics.A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature);
@@ -62039,6 +62211,9 @@ var ts;
          *   - The type has no base constraint,
          *   - OR The base constraint of the type is `any`, `unknown`, `object`, or the empty object `{}`,
          *   - OR The base constraint has a callable `then` member.
+         * This behavior is not entirely sound, as a `T extends { x: any }` could be instantiated with a
+         * subtype that has a callable `then`, however this is unlikely in practice and this slightly more unsound
+         * behavior is much more developer friendly.
          */
         function isGenericAwaitableType(type) {
             if (isGenericObjectType(type)) {
@@ -63399,7 +63574,7 @@ var ts;
             }
             else {
                 var varExpr = node.initializer;
-                var iteratedType = checkRightHandSideOfForOf(node.expression, node.awaitModifier);
+                var iteratedType = checkRightHandSideOfForOf(node);
                 // There may be a destructuring assignment on the left side
                 if (varExpr.kind === 193 /* ArrayLiteralExpression */ || varExpr.kind === 194 /* ObjectLiteralExpression */) {
                     // iteratedType may be undefined. In this case, we still want to check the structure of
@@ -63476,10 +63651,12 @@ var ts;
                 checkVariableDeclaration(decl);
             }
         }
-        function checkRightHandSideOfForOf(rhsExpression, awaitModifier) {
-            var expressionType = checkNonNullExpression(rhsExpression);
-            var use = awaitModifier ? 15 /* ForAwaitOf */ : 13 /* ForOf */;
-            return checkIteratedTypeOrElementType(use, expressionType, undefinedType, rhsExpression);
+        function checkRightHandSideOfForOf(statement) {
+            return getForOfIterationType(statement, checkNonNullExpression(statement.expression));
+        }
+        function getForOfIterationType(statement, expressionType) {
+            var use = statement.awaitModifier ? 15 /* ForAwaitOf */ : 13 /* ForOf */;
+            return checkIteratedTypeOrElementType(use, expressionType, undefinedType, statement.expression);
         }
         function checkIteratedTypeOrElementType(use, inputType, sentType, errorNode) {
             if (isTypeAny(inputType)) {
@@ -64599,7 +64776,7 @@ var ts;
         function issueMemberSpecificError(node, typeWithThis, baseWithThis, broadDiag) {
             // iterate over all implemented properties and issue errors on each one which isn't compatible, rather than the class as a whole, if possible
             var issuedMemberError = false;
-            var _loop_17 = function (member) {
+            var _loop_18 = function (member) {
                 if (ts.hasStaticModifier(member)) {
                     return "continue";
                 }
@@ -64618,7 +64795,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_17(member);
+                _loop_18(member);
             }
             if (!issuedMemberError) {
                 // check again with diagnostics to generate a less-specific error
@@ -66515,7 +66692,7 @@ var ts;
             //     for ( { a } of elems) {
             //     }
             if (expr.parent.kind === 233 /* ForOfStatement */) {
-                var iteratedType = checkRightHandSideOfForOf(expr.parent.expression, expr.parent.awaitModifier);
+                var iteratedType = checkRightHandSideOfForOf(expr.parent);
                 return checkDestructuringAssignment(expr, iteratedType || errorType);
             }
             // If this is from "for" initializer
@@ -71133,6 +71310,11 @@ var ts;
     }
     ts.createJSDocParamTag = createJSDocParamTag;
     /* @internal */
+    function createJSDocClassTag() {
+        return createJSDocTag(311 /* JSDocClassTag */, "class");
+    }
+    ts.createJSDocClassTag = createJSDocClassTag;
+    /* @internal */
     function createJSDocComment(comment, tags) {
         var node = createSynthesizedNode(304 /* JSDocComment */);
         node.comment = comment;
@@ -72151,6 +72333,12 @@ var ts;
         return node;
     }
     ts.moveSyntheticComments = moveSyntheticComments;
+    /** @internal */
+    function ignoreSourceNewlines(node) {
+        getOrCreateEmitNode(node).flags |= 134217728 /* IgnoreSourceNewlines */;
+        return node;
+    }
+    ts.ignoreSourceNewlines = ignoreSourceNewlines;
     /**
      * Gets the constant value to emit for an expression.
      */
@@ -91761,8 +91949,8 @@ var ts;
                         declFileName = paths.declarationFilePath || paths.jsFilePath || file.fileName;
                     }
                     if (declFileName) {
-                        var specifier = ts.moduleSpecifiers.getModuleSpecifier(__assign(__assign({}, options), { baseUrl: options.baseUrl && ts.toPath(options.baseUrl, host.getCurrentDirectory(), host.getCanonicalFileName) }), currentSourceFile, ts.toPath(outputFilePath, host.getCurrentDirectory(), host.getCanonicalFileName), ts.toPath(declFileName, host.getCurrentDirectory(), host.getCanonicalFileName), host, host.getSourceFiles(), 
-                        /*preferences*/ undefined, host.redirectTargetsMap);
+                        var specifier = ts.moduleSpecifiers.getModuleSpecifier(__assign(__assign({}, options), { baseUrl: options.baseUrl && ts.toPath(options.baseUrl, host.getCurrentDirectory(), host.getCanonicalFileName) }), currentSourceFile, ts.toPath(outputFilePath, host.getCurrentDirectory(), host.getCanonicalFileName), ts.toPath(declFileName, host.getCurrentDirectory(), host.getCanonicalFileName), host, 
+                        /*preferences*/ undefined);
                         if (!ts.pathIsRelative(specifier)) {
                             // If some compiler option/symlink/whatever allows access to the file containing the ambient module declaration
                             // via a non-relative name, emit a type reference directive to that non-relative name, rather than
@@ -91777,7 +91965,7 @@ var ts;
                         }
                         // omit references to files from node_modules (npm may disambiguate module
                         // references when installing this package, making the path is unreliable).
-                        if (ts.startsWith(fileName, "node_modules/") || fileName.indexOf("/node_modules/") !== -1) {
+                        if (ts.startsWith(fileName, "node_modules/") || ts.pathContainsNodeModules(fileName)) {
                             return;
                         }
                         references.push({ pos: -1, end: -1, fileName: fileName });
@@ -93816,6 +94004,7 @@ var ts;
             getLibFileFromReference: ts.notImplemented,
             isSourceFileFromExternalLibrary: ts.returnFalse,
             getResolvedProjectReferenceToRedirect: ts.returnUndefined,
+            getProjectReferenceRedirect: ts.returnUndefined,
             isSourceOfProjectReferenceRedirect: ts.returnFalse,
             writeFile: function (name, text, writeByteOrderMark) {
                 switch (name) {
@@ -93855,7 +94044,6 @@ var ts;
             isEmitBlocked: ts.returnFalse,
             readFile: function (f) { return host.readFile(f); },
             fileExists: function (f) { return host.fileExists(f); },
-            directoryExists: host.directoryExists && (function (f) { return host.directoryExists(f); }),
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
             getProgramBuildInfo: ts.returnUndefined,
             getSourceFileFromReference: ts.returnUndefined,
@@ -93890,6 +94078,7 @@ var ts;
         var tempFlags; // TempFlags for the current name generation scope.
         var reservedNamesStack; // Stack of TempFlags reserved in enclosing name generation scopes.
         var reservedNames; // TempFlags to reserve in nested name generation scopes.
+        var preserveSourceNewlines = printerOptions.preserveSourceNewlines; // Can be overridden inside nodes with the `IgnoreSourceNewlines` emit flag.
         var writer;
         var ownWriter; // Reusable `EmitTextWriter` for basic printing.
         var write = writeBase;
@@ -94172,14 +94361,19 @@ var ts;
         function pipelineEmit(emitHint, node) {
             var savedLastNode = lastNode;
             var savedLastSubstitution = lastSubstitution;
+            var savedPreserveSourceNewlines = preserveSourceNewlines;
             lastNode = node;
             lastSubstitution = undefined;
+            if (preserveSourceNewlines && !!(ts.getEmitFlags(node) & 134217728 /* IgnoreSourceNewlines */)) {
+                preserveSourceNewlines = false;
+            }
             var pipelinePhase = getPipelinePhase(0 /* Notification */, emitHint, node);
             pipelinePhase(emitHint, node);
             ts.Debug.assert(lastNode === node);
             var substitute = lastSubstitution;
             lastNode = savedLastNode;
             lastSubstitution = savedLastSubstitution;
+            preserveSourceNewlines = savedPreserveSourceNewlines;
             return substitute || node;
         }
         function getPipelinePhase(phase, emitHint, node) {
@@ -95166,9 +95360,9 @@ var ts;
         function emitPropertyAccessExpression(node) {
             var expression = ts.cast(emitExpression(node.expression), ts.isExpression);
             var token = node.questionDotToken || ts.createNode(24 /* DotToken */, node.expression.end, node.name.pos);
-            var indentBeforeDot = needsIndentation(node, node.expression, token);
-            var indentAfterDot = needsIndentation(node, token, node.name);
-            increaseIndentIf(indentBeforeDot, /*writeSpaceIfNotIndenting*/ false);
+            var linesBeforeDot = getLinesBetweenNodes(node, node.expression, token);
+            var linesAfterDot = getLinesBetweenNodes(node, token, node.name);
+            writeLinesAndIndent(linesBeforeDot, /*writeSpaceIfNotIndenting*/ false);
             var shouldEmitDotDot = token.kind !== 28 /* QuestionDotToken */ &&
                 mayNeedDotDotForPropertyAccess(expression) &&
                 !writer.hasTrailingComment() &&
@@ -95182,9 +95376,9 @@ var ts;
             else {
                 emitTokenWithComment(token.kind, node.expression.end, writePunctuation, node);
             }
-            increaseIndentIf(indentAfterDot, /*writeSpaceIfNotIndenting*/ false);
+            writeLinesAndIndent(linesAfterDot, /*writeSpaceIfNotIndenting*/ false);
             emit(node.name);
-            decreaseIndentIf(indentBeforeDot, indentAfterDot);
+            decreaseIndentIf(linesBeforeDot, linesAfterDot);
         }
         // 1..toString is a valid property access, emit a dot after the literal
         // Also emit a dot if expression is a integer const enum value - it will appear in generated code as numeric literal
@@ -95239,7 +95433,16 @@ var ts;
         }
         function emitParenthesizedExpression(node) {
             var openParenPos = emitTokenWithComment(20 /* OpenParenToken */, node.pos, writePunctuation, node);
+            var leadingNewlines = preserveSourceNewlines && getLeadingLineTerminatorCount(node, [node.expression], 0 /* None */);
+            if (leadingNewlines) {
+                writeLinesAndIndent(leadingNewlines, /*writeLinesIfNotIndenting*/ false);
+            }
             emitExpression(node.expression);
+            var trailingNewlines = preserveSourceNewlines && getClosingLineTerminatorCount(node, [node.expression], 0 /* None */);
+            if (trailingNewlines) {
+                writeLine(trailingNewlines);
+            }
+            decreaseIndentIf(leadingNewlines);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression ? node.expression.end : openParenPos, writePunctuation, node);
         }
         function emitFunctionExpression(node) {
@@ -95331,20 +95534,20 @@ var ts;
                     }
                     case 1 /* EmitRight */: {
                         var isCommaOperator = node.operatorToken.kind !== 27 /* CommaToken */;
-                        var indentBeforeOperator = needsIndentation(node, node.left, node.operatorToken);
-                        var indentAfterOperator = needsIndentation(node, node.operatorToken, node.right);
-                        increaseIndentIf(indentBeforeOperator, isCommaOperator);
+                        var linesBeforeOperator = getLinesBetweenNodes(node, node.left, node.operatorToken);
+                        var linesAfterOperator = getLinesBetweenNodes(node, node.operatorToken, node.right);
+                        writeLinesAndIndent(linesBeforeOperator, isCommaOperator);
                         emitLeadingCommentsOfPosition(node.operatorToken.pos);
                         writeTokenNode(node.operatorToken, node.operatorToken.kind === 97 /* InKeyword */ ? writeKeyword : writeOperator);
                         emitTrailingCommentsOfPosition(node.operatorToken.end, /*prefixSpace*/ true); // Binary operators should have a space before the comment starts
-                        increaseIndentIf(indentAfterOperator, /*writeSpaceIfNotIndenting*/ true);
+                        writeLinesAndIndent(linesAfterOperator, /*writeSpaceIfNotIndenting*/ true);
                         maybePipelineEmitExpression(node.right);
                         break;
                     }
                     case 2 /* FinishEmit */: {
-                        var indentBeforeOperator = needsIndentation(node, node.left, node.operatorToken);
-                        var indentAfterOperator = needsIndentation(node, node.operatorToken, node.right);
-                        decreaseIndentIf(indentBeforeOperator, indentAfterOperator);
+                        var linesBeforeOperator = getLinesBetweenNodes(node, node.left, node.operatorToken);
+                        var linesAfterOperator = getLinesBetweenNodes(node, node.operatorToken, node.right);
+                        decreaseIndentIf(linesBeforeOperator, linesAfterOperator);
                         stackIndex--;
                         break;
                     }
@@ -95380,21 +95583,21 @@ var ts;
             }
         }
         function emitConditionalExpression(node) {
-            var indentBeforeQuestion = needsIndentation(node, node.condition, node.questionToken);
-            var indentAfterQuestion = needsIndentation(node, node.questionToken, node.whenTrue);
-            var indentBeforeColon = needsIndentation(node, node.whenTrue, node.colonToken);
-            var indentAfterColon = needsIndentation(node, node.colonToken, node.whenFalse);
+            var linesBeforeQuestion = getLinesBetweenNodes(node, node.condition, node.questionToken);
+            var linesAfterQuestion = getLinesBetweenNodes(node, node.questionToken, node.whenTrue);
+            var linesBeforeColon = getLinesBetweenNodes(node, node.whenTrue, node.colonToken);
+            var linesAfterColon = getLinesBetweenNodes(node, node.colonToken, node.whenFalse);
             emitExpression(node.condition);
-            increaseIndentIf(indentBeforeQuestion, /*writeSpaceIfNotIndenting*/ true);
+            writeLinesAndIndent(linesBeforeQuestion, /*writeSpaceIfNotIndenting*/ true);
             emit(node.questionToken);
-            increaseIndentIf(indentAfterQuestion, /*writeSpaceIfNotIndenting*/ true);
+            writeLinesAndIndent(linesAfterQuestion, /*writeSpaceIfNotIndenting*/ true);
             emitExpression(node.whenTrue);
-            decreaseIndentIf(indentBeforeQuestion, indentAfterQuestion);
-            increaseIndentIf(indentBeforeColon, /*writeSpaceIfNotIndenting*/ true);
+            decreaseIndentIf(linesBeforeQuestion, linesAfterQuestion);
+            writeLinesAndIndent(linesBeforeColon, /*writeSpaceIfNotIndenting*/ true);
             emit(node.colonToken);
-            increaseIndentIf(indentAfterColon, /*writeSpaceIfNotIndenting*/ true);
+            writeLinesAndIndent(linesAfterColon, /*writeSpaceIfNotIndenting*/ true);
             emitExpression(node.whenFalse);
-            decreaseIndentIf(indentBeforeColon, indentAfterColon);
+            decreaseIndentIf(linesBeforeColon, linesAfterColon);
         }
         function emitTemplateExpression(node) {
             emit(node.head);
@@ -95735,14 +95938,14 @@ var ts;
             if (!ts.nodeIsSynthesized(body) && !ts.rangeIsOnSingleLine(body, currentSourceFile)) {
                 return false;
             }
-            if (shouldWriteLeadingLineTerminator(body, body.statements, 2 /* PreserveLines */)
-                || shouldWriteClosingLineTerminator(body, body.statements, 2 /* PreserveLines */)) {
+            if (getLeadingLineTerminatorCount(body, body.statements, 2 /* PreserveLines */)
+                || getClosingLineTerminatorCount(body, body.statements, 2 /* PreserveLines */)) {
                 return false;
             }
             var previousStatement;
             for (var _a = 0, _b = body.statements; _a < _b.length; _a++) {
                 var statement = _b[_a];
-                if (shouldWriteSeparatingLineTerminator(previousStatement, statement, 2 /* PreserveLines */)) {
+                if (getSeparatingLineTerminatorCount(previousStatement, statement, 2 /* PreserveLines */) > 0) {
                     return false;
                 }
                 previousStatement = statement;
@@ -96704,7 +96907,7 @@ var ts;
             }
             if (isEmpty) {
                 // Write a line terminator if the parent node was multi-line
-                if (format & 1 /* MultiLine */) {
+                if (format & 1 /* MultiLine */ && !(preserveSourceNewlines && ts.rangeIsOnSingleLine(parentNode, currentSourceFile))) {
                     writeLine();
                 }
                 else if (format & 256 /* SpaceBetweenBraces */ && !(format & 524288 /* NoSpaceIfEmpty */)) {
@@ -96715,8 +96918,9 @@ var ts;
                 // Write the opening line terminator or leading whitespace.
                 var mayEmitInterveningComments = (format & 262144 /* NoInterveningComments */) === 0;
                 var shouldEmitInterveningComments = mayEmitInterveningComments;
-                if (shouldWriteLeadingLineTerminator(parentNode, children, format)) { // TODO: GH#18217
-                    writeLine();
+                var leadingLineTerminatorCount = getLeadingLineTerminatorCount(parentNode, children, format); // TODO: GH#18217
+                if (leadingLineTerminatorCount) {
+                    writeLine(leadingLineTerminatorCount);
                     shouldEmitInterveningComments = false;
                 }
                 else if (format & 256 /* SpaceBetweenBraces */) {
@@ -96751,14 +96955,15 @@ var ts;
                         writeDelimiter(format);
                         recordBundleFileInternalSectionEnd(previousSourceFileTextKind);
                         // Write either a line terminator or whitespace to separate the elements.
-                        if (shouldWriteSeparatingLineTerminator(previousSibling, child, format)) {
+                        var separatingLineTerminatorCount = getSeparatingLineTerminatorCount(previousSibling, child, format);
+                        if (separatingLineTerminatorCount > 0) {
                             // If a synthesized node in a single-line list starts on a new
                             // line, we should increase the indent.
                             if ((format & (3 /* LinesMask */ | 128 /* Indented */)) === 0 /* SingleLine */) {
                                 increaseIndent();
                                 shouldDecreaseIndentAfterEmit = true;
                             }
-                            writeLine();
+                            writeLine(separatingLineTerminatorCount);
                             shouldEmitInterveningComments = false;
                         }
                         else if (previousSibling && format & 512 /* SpaceBetweenSiblings */) {
@@ -96803,8 +97008,9 @@ var ts;
                 }
                 recordBundleFileInternalSectionEnd(previousSourceFileTextKind);
                 // Write the closing line terminator or closing whitespace.
-                if (shouldWriteClosingLineTerminator(parentNode, children, format)) {
-                    writeLine();
+                var closingLineTerminatorCount = getClosingLineTerminatorCount(parentNode, children, format);
+                if (closingLineTerminatorCount) {
+                    writeLine(closingLineTerminatorCount);
                 }
                 else if (format & 256 /* SpaceBetweenBraces */) {
                     writeSpace();
@@ -96858,8 +97064,11 @@ var ts;
         function writeProperty(s) {
             writer.writeProperty(s);
         }
-        function writeLine() {
-            writer.writeLine();
+        function writeLine(count) {
+            if (count === void 0) { count = 1; }
+            for (var i = 0; i < count; i++) {
+                writer.writeLine(i > 0);
+            }
         }
         function increaseIndent() {
             writer.increaseIndent();
@@ -96906,10 +97115,10 @@ var ts;
                 }
             }
         }
-        function increaseIndentIf(value, writeSpaceIfNotIndenting) {
-            if (value) {
+        function writeLinesAndIndent(lineCount, writeSpaceIfNotIndenting) {
+            if (lineCount) {
                 increaseIndent();
-                writeLine();
+                writeLine(lineCount);
             }
             else if (writeSpaceIfNotIndenting) {
                 writeSpace();
@@ -96927,70 +97136,101 @@ var ts;
                 decreaseIndent();
             }
         }
-        function shouldWriteLeadingLineTerminator(parentNode, children, format) {
-            if (format & 1 /* MultiLine */) {
-                return true;
-            }
-            if (format & 2 /* PreserveLines */) {
+        function getLeadingLineTerminatorCount(parentNode, children, format) {
+            if (format & 2 /* PreserveLines */ || preserveSourceNewlines) {
                 if (format & 65536 /* PreferNewLine */) {
-                    return true;
+                    return 1;
                 }
-                var firstChild = children[0];
-                if (firstChild === undefined) {
-                    return !ts.rangeIsOnSingleLine(parentNode, currentSourceFile);
+                var firstChild_1 = children[0];
+                if (firstChild_1 === undefined) {
+                    return ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
                 }
-                else if (ts.positionIsSynthesized(parentNode.pos) || ts.nodeIsSynthesized(firstChild)) {
-                    return synthesizedNodeStartsOnNewLine(firstChild, format);
+                if (firstChild_1.kind === 11 /* JsxText */) {
+                    // JsxText will be written with its leading whitespace, so don't add more manually.
+                    return 0;
                 }
-                else {
-                    return !ts.rangeStartPositionsAreOnSameLine(parentNode, firstChild, currentSourceFile);
+                if (!ts.positionIsSynthesized(parentNode.pos) && !ts.nodeIsSynthesized(firstChild_1) && firstChild_1.parent === parentNode) {
+                    if (preserveSourceNewlines) {
+                        return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter(firstChild_1.pos, currentSourceFile, includeComments); });
+                    }
+                    return ts.rangeStartPositionsAreOnSameLine(parentNode, firstChild_1, currentSourceFile) ? 0 : 1;
+                }
+                if (synthesizedNodeStartsOnNewLine(firstChild_1, format)) {
+                    return 1;
                 }
             }
-            else {
-                return false;
-            }
+            return format & 1 /* MultiLine */ ? 1 : 0;
         }
-        function shouldWriteSeparatingLineTerminator(previousNode, nextNode, format) {
-            if (format & 1 /* MultiLine */) {
-                return true;
-            }
-            else if (format & 2 /* PreserveLines */) {
+        function getSeparatingLineTerminatorCount(previousNode, nextNode, format) {
+            if (format & 2 /* PreserveLines */ || preserveSourceNewlines) {
                 if (previousNode === undefined || nextNode === undefined) {
-                    return false;
+                    return 0;
                 }
-                else if (ts.nodeIsSynthesized(previousNode) || ts.nodeIsSynthesized(nextNode)) {
-                    return synthesizedNodeStartsOnNewLine(previousNode, format) || synthesizedNodeStartsOnNewLine(nextNode, format);
+                if (nextNode.kind === 11 /* JsxText */) {
+                    // JsxText will be written with its leading whitespace, so don't add more manually.
+                    return 0;
                 }
-                else {
-                    return !ts.rangeEndIsOnSameLineAsRangeStart(previousNode, nextNode, currentSourceFile);
+                else if (!ts.nodeIsSynthesized(previousNode) && !ts.nodeIsSynthesized(nextNode) && previousNode.parent === nextNode.parent) {
+                    if (preserveSourceNewlines) {
+                        return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenRangeEndAndRangeStart(previousNode, nextNode, currentSourceFile, includeComments); });
+                    }
+                    return ts.rangeEndIsOnSameLineAsRangeStart(previousNode, nextNode, currentSourceFile) ? 0 : 1;
+                }
+                else if (synthesizedNodeStartsOnNewLine(previousNode, format) || synthesizedNodeStartsOnNewLine(nextNode, format)) {
+                    return 1;
                 }
             }
-            else {
-                return ts.getStartsOnNewLine(nextNode);
+            else if (ts.getStartsOnNewLine(nextNode)) {
+                return 1;
             }
+            return format & 1 /* MultiLine */ ? 1 : 0;
         }
-        function shouldWriteClosingLineTerminator(parentNode, children, format) {
-            if (format & 1 /* MultiLine */) {
-                return (format & 131072 /* NoTrailingNewLine */) === 0;
-            }
-            else if (format & 2 /* PreserveLines */) {
+        function getClosingLineTerminatorCount(parentNode, children, format) {
+            if (format & 2 /* PreserveLines */ || preserveSourceNewlines) {
                 if (format & 65536 /* PreferNewLine */) {
-                    return true;
+                    return 1;
                 }
-                var lastChild = ts.lastOrUndefined(children);
-                if (lastChild === undefined) {
-                    return !ts.rangeIsOnSingleLine(parentNode, currentSourceFile);
+                var lastChild_1 = ts.lastOrUndefined(children);
+                if (lastChild_1 === undefined) {
+                    return ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
                 }
-                else if (ts.positionIsSynthesized(parentNode.pos) || ts.nodeIsSynthesized(lastChild)) {
-                    return synthesizedNodeStartsOnNewLine(lastChild, format);
+                if (!ts.positionIsSynthesized(parentNode.pos) && !ts.nodeIsSynthesized(lastChild_1) && lastChild_1.parent === parentNode) {
+                    if (preserveSourceNewlines) {
+                        return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenPositionAndNextNonWhitespaceCharacter(lastChild_1.end, currentSourceFile, includeComments); });
+                    }
+                    return ts.rangeEndPositionsAreOnSameLine(parentNode, lastChild_1, currentSourceFile) ? 0 : 1;
                 }
-                else {
-                    return !ts.rangeEndPositionsAreOnSameLine(parentNode, lastChild, currentSourceFile);
+                if (synthesizedNodeStartsOnNewLine(lastChild_1, format)) {
+                    return 1;
                 }
             }
-            else {
-                return false;
+            if (format & 1 /* MultiLine */ && !(format & 131072 /* NoTrailingNewLine */)) {
+                return 1;
             }
+            return 0;
+        }
+        function getEffectiveLines(getLineDifference) {
+            // If 'preserveSourceNewlines' is disabled, we should never call this function
+            // because it could be more expensive than alternative approximations.
+            ts.Debug.assert(!!preserveSourceNewlines);
+            // We start by measuring the line difference from a position to its adjacent comments,
+            // so that this is counted as a one-line difference, not two:
+            //
+            //   node1;
+            //   // NODE2 COMMENT
+            //   node2;
+            var lines = getLineDifference(/*includeComments*/ true);
+            if (lines === 0) {
+                // However, if the line difference considering comments was 0, we might have this:
+                //
+                //   node1; // NODE2 COMMENT
+                //   node2;
+                //
+                // in which case we should be ignoring node2's comment, so this too is counted as
+                // a one-line difference, not zero.
+                return getLineDifference(/*includeComments*/ false);
+            }
+            return lines;
         }
         function synthesizedNodeStartsOnNewLine(node, format) {
             if (ts.nodeIsSynthesized(node)) {
@@ -97002,21 +97242,24 @@ var ts;
             }
             return (format & 65536 /* PreferNewLine */) !== 0;
         }
-        function needsIndentation(parent, node1, node2) {
+        function getLinesBetweenNodes(parent, node1, node2) {
             if (ts.getEmitFlags(parent) & 131072 /* NoIndentation */) {
-                return false;
+                return 0;
             }
             parent = skipSynthesizedParentheses(parent);
             node1 = skipSynthesizedParentheses(node1);
             node2 = skipSynthesizedParentheses(node2);
             // Always use a newline for synthesized code if the synthesizer desires it.
             if (ts.getStartsOnNewLine(node2)) {
-                return true;
+                return 1;
             }
-            return !ts.nodeIsSynthesized(parent)
-                && !ts.nodeIsSynthesized(node1)
-                && !ts.nodeIsSynthesized(node2)
-                && !ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile);
+            if (!ts.nodeIsSynthesized(parent) && !ts.nodeIsSynthesized(node1) && !ts.nodeIsSynthesized(node2)) {
+                if (preserveSourceNewlines) {
+                    return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenRangeEndAndRangeStart(node1, node2, currentSourceFile, includeComments); });
+                }
+                return ts.rangeEndIsOnSameLineAsRangeStart(node1, node2, currentSourceFile) ? 0 : 1;
+            }
+            return 0;
         }
         function isEmptyBlock(block) {
             return block.statements.length === 0
@@ -98849,14 +99092,14 @@ var ts;
         var mapFromToProjectReferenceRedirectSource;
         var useSourceOfProjectReferenceRedirect = !!((_a = host.useSourceOfProjectReferenceRedirect) === null || _a === void 0 ? void 0 : _a.call(host)) &&
             !options.disableSourceOfProjectReferenceRedirect;
-        var onProgramCreateComplete = updateHostForUseSourceOfProjectReferenceRedirect({
+        var _b = updateHostForUseSourceOfProjectReferenceRedirect({
             compilerHost: host,
             useSourceOfProjectReferenceRedirect: useSourceOfProjectReferenceRedirect,
             toPath: toPath,
             getResolvedProjectReferences: getResolvedProjectReferences,
             getSourceOfProjectReferenceRedirect: getSourceOfProjectReferenceRedirect,
             forEachResolvedProjectReference: forEachResolvedProjectReference
-        });
+        }), onProgramCreateComplete = _b.onProgramCreateComplete, fileExists = _b.fileExists;
         var shouldCreateNewSourceFile = shouldProgramCreateNewSourceFiles(oldProgram, options);
         // We set `structuralIsReused` to `undefined` because `tryReuseStructureFromOldProgram` calls `tryReuseStructureFromOldProgram` which checks
         // `structuralIsReused`, which would be a TDZ violation if it was not set in advance to `undefined`.
@@ -98877,8 +99120,8 @@ var ts;
                         var out = parsedRef.commandLine.options.outFile || parsedRef.commandLine.options.out;
                         if (useSourceOfProjectReferenceRedirect) {
                             if (out || ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) {
-                                for (var _b = 0, _c = parsedRef.commandLine.fileNames; _b < _c.length; _b++) {
-                                    var fileName = _c[_b];
+                                for (var _c = 0, _d = parsedRef.commandLine.fileNames; _c < _d.length; _c++) {
+                                    var fileName = _d[_c];
                                     processSourceFile(fileName, /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
                                 }
                             }
@@ -98888,8 +99131,8 @@ var ts;
                                 processSourceFile(ts.changeExtension(out, ".d.ts"), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
                             }
                             else if (ts.getEmitModuleKind(parsedRef.commandLine.options) === ts.ModuleKind.None) {
-                                for (var _d = 0, _e = parsedRef.commandLine.fileNames; _d < _e.length; _d++) {
-                                    var fileName = _e[_d];
+                                for (var _e = 0, _f = parsedRef.commandLine.fileNames; _e < _f.length; _e++) {
+                                    var fileName = _f[_e];
                                     if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) && !ts.fileExtensionIs(fileName, ".json" /* Json */)) {
                                         processSourceFile(ts.getOutputDeclarationFileName(fileName, parsedRef.commandLine, !host.useCaseSensitiveFileNames()), /*isDefaultLib*/ false, /*ignoreNoDefaultLib*/ false, /*packageId*/ undefined);
                                     }
@@ -98941,8 +99184,8 @@ var ts;
         // not part of the new program.
         if (oldProgram && host.onReleaseOldSourceFile) {
             var oldSourceFiles = oldProgram.getSourceFiles();
-            for (var _f = 0, oldSourceFiles_1 = oldSourceFiles; _f < oldSourceFiles_1.length; _f++) {
-                var oldSourceFile = oldSourceFiles_1[_f];
+            for (var _g = 0, oldSourceFiles_1 = oldSourceFiles; _g < oldSourceFiles_1.length; _g++) {
+                var oldSourceFile = oldSourceFiles_1[_g];
                 var newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
                 if (shouldCreateNewSourceFile || !newFile ||
                     // old file wasnt redirect but new file is
@@ -99007,6 +99250,7 @@ var ts;
             forEachResolvedProjectReference: forEachResolvedProjectReference,
             isSourceOfProjectReferenceRedirect: isSourceOfProjectReferenceRedirect,
             emitBuildInfo: emitBuildInfo,
+            fileExists: fileExists,
             getProbableSymlinks: getProbableSymlinks,
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
         };
@@ -99450,11 +99694,26 @@ var ts;
             return oldProgram.structureIsReused = 2 /* Completely */;
         }
         function getEmitHost(writeFileCallback) {
-            return __assign(__assign({ getPrependNodes: getPrependNodes,
-                getCanonicalFileName: getCanonicalFileName, getCommonSourceDirectory: program.getCommonSourceDirectory, getCompilerOptions: program.getCompilerOptions, getCurrentDirectory: function () { return currentDirectory; }, getNewLine: function () { return host.getNewLine(); }, getSourceFile: program.getSourceFile, getSourceFileByPath: program.getSourceFileByPath, getSourceFiles: program.getSourceFiles, getLibFileFromReference: program.getLibFileFromReference, isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
+            return {
+                getPrependNodes: getPrependNodes,
+                getCanonicalFileName: getCanonicalFileName,
+                getCommonSourceDirectory: program.getCommonSourceDirectory,
+                getCompilerOptions: program.getCompilerOptions,
+                getCurrentDirectory: function () { return currentDirectory; },
+                getNewLine: function () { return host.getNewLine(); },
+                getSourceFile: program.getSourceFile,
+                getSourceFileByPath: program.getSourceFileByPath,
+                getSourceFiles: program.getSourceFiles,
+                getLibFileFromReference: program.getLibFileFromReference,
+                isSourceFileFromExternalLibrary: isSourceFileFromExternalLibrary,
                 getResolvedProjectReferenceToRedirect: getResolvedProjectReferenceToRedirect,
+                getProjectReferenceRedirect: getProjectReferenceRedirect,
                 isSourceOfProjectReferenceRedirect: isSourceOfProjectReferenceRedirect,
-                getProbableSymlinks: getProbableSymlinks, writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }), isEmitBlocked: isEmitBlocked, readFile: function (f) { return host.readFile(f); }, fileExists: function (f) {
+                getProbableSymlinks: getProbableSymlinks,
+                writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }),
+                isEmitBlocked: isEmitBlocked,
+                readFile: function (f) { return host.readFile(f); },
+                fileExists: function (f) {
                     // Use local caches
                     var path = toPath(f);
                     if (getSourceFileByPath(path))
@@ -99463,7 +99722,12 @@ var ts;
                         return false;
                     // Before falling back to the host
                     return host.fileExists(f);
-                } }, (host.directoryExists ? { directoryExists: function (f) { return host.directoryExists(f); } } : {})), { useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); }, getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); }, getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); }, redirectTargetsMap: redirectTargetsMap });
+                },
+                useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
+                getProgramBuildInfo: function () { return program.getProgramBuildInfo && program.getProgramBuildInfo(); },
+                getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); },
+                redirectTargetsMap: redirectTargetsMap,
+            };
         }
         function emitBuildInfo(writeFileCallback) {
             ts.Debug.assert(!options.out && !options.outFile);
@@ -100125,7 +100389,7 @@ var ts;
                 }
                 var sourceFileWithAddedExtension = ts.forEach(supportedExtensions, function (extension) { return getSourceFile(fileName + extension); });
                 if (fail && !sourceFileWithAddedExtension)
-                    fail(ts.Diagnostics.File_0_not_found, fileName + ".ts" /* Ts */);
+                    fail(ts.Diagnostics.Could_not_resolve_the_path_0_with_the_extensions_Colon_1, fileName, "'" + supportedExtensions.join("', '") + "'");
                 return sourceFileWithAddedExtension;
             }
         }
@@ -101129,20 +101393,8 @@ var ts;
         var originalGetDirectories = host.compilerHost.getDirectories;
         var originalRealpath = host.compilerHost.realpath;
         if (!host.useSourceOfProjectReferenceRedirect)
-            return ts.noop;
-        // This implementation of fileExists checks if the file being requested is
-        // .d.ts file for the referenced Project.
-        // If it is it returns true irrespective of whether that file exists on host
-        host.compilerHost.fileExists = function (file) {
-            if (originalFileExists.call(host.compilerHost, file))
-                return true;
-            if (!host.getResolvedProjectReferences())
-                return false;
-            if (!ts.isDeclarationFileName(file))
-                return false;
-            // Project references go to source file instead of .d.ts file
-            return fileOrDirectoryExistsUsingSource(file, /*isFile*/ true);
-        };
+            return { onProgramCreateComplete: ts.noop, fileExists: fileExists };
+        host.compilerHost.fileExists = fileExists;
         if (originalDirectoryExists) {
             // This implementation of directoryExists checks if the directory being requested is
             // directory of .d.ts file for the referenced Project.
@@ -101191,13 +101443,26 @@ var ts;
                     originalRealpath.call(host.compilerHost, s);
             };
         }
-        return onProgramCreateComplete;
+        return { onProgramCreateComplete: onProgramCreateComplete, fileExists: fileExists };
         function onProgramCreateComplete() {
             host.compilerHost.fileExists = originalFileExists;
             host.compilerHost.directoryExists = originalDirectoryExists;
             host.compilerHost.getDirectories = originalGetDirectories;
             // DO not revert realpath as it could be used later
         }
+        // This implementation of fileExists checks if the file being requested is
+        // .d.ts file for the referenced Project.
+        // If it is it returns true irrespective of whether that file exists on host
+        function fileExists(file) {
+            if (originalFileExists.call(host.compilerHost, file))
+                return true;
+            if (!host.getResolvedProjectReferences())
+                return false;
+            if (!ts.isDeclarationFileName(file))
+                return false;
+            // Project references go to source file instead of .d.ts file
+            return fileOrDirectoryExistsUsingSource(file, /*isFile*/ true);
+        }
         function fileExistsIfProjectReferenceDts(file) {
             var source = host.getSourceOfProjectReferenceRedirect(file);
             return source !== undefined ?
@@ -101383,8 +101648,8 @@ var ts;
 (function (ts) {
     function getFileEmitOutput(program, sourceFile, emitOnlyDtsFiles, cancellationToken, customTransformers, forceDtsEmit) {
         var outputFiles = [];
-        var emitResult = program.emit(sourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers, forceDtsEmit);
-        return { outputFiles: outputFiles, emitSkipped: emitResult.emitSkipped, exportedModulesFromDeclarationEmit: emitResult.exportedModulesFromDeclarationEmit };
+        var _a = program.emit(sourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers, forceDtsEmit), emitSkipped = _a.emitSkipped, diagnostics = _a.diagnostics, exportedModulesFromDeclarationEmit = _a.exportedModulesFromDeclarationEmit;
+        return { outputFiles: outputFiles, emitSkipped: emitSkipped, diagnostics: diagnostics, exportedModulesFromDeclarationEmit: exportedModulesFromDeclarationEmit };
         function writeFile(fileName, text, writeByteOrderMark) {
             outputFiles.push({ name: fileName, writeByteOrderMark: writeByteOrderMark, text: text });
         }
@@ -101592,12 +101857,14 @@ var ts;
          * This should be called whenever it is safe to commit the state of the builder
          */
         function updateSignaturesFromCache(state, signatureCache) {
-            signatureCache.forEach(function (signature, path) {
-                state.fileInfos.get(path).signature = signature;
-                state.hasCalledUpdateShapeSignature.set(path, true);
-            });
+            signatureCache.forEach(function (signature, path) { return updateSignatureOfFile(state, signature, path); });
         }
         BuilderState.updateSignaturesFromCache = updateSignaturesFromCache;
+        function updateSignatureOfFile(state, signature, path) {
+            state.fileInfos.get(path).signature = signature;
+            state.hasCalledUpdateShapeSignature.set(path, true);
+        }
+        BuilderState.updateSignatureOfFile = updateSignatureOfFile;
         /**
          * Returns if the shape of the signature has changed since last emit
          */
@@ -103471,39 +103738,39 @@ var ts;
                     ts.getEmitModuleResolutionKind(compilerOptions) !== ts.ModuleResolutionKind.NodeJs || ts.endsWith(oldImportSpecifier, "index") ? 1 /* Index */ : 0 /* Minimal */,
             };
         }
-        function updateModuleSpecifier(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, oldImportSpecifier) {
-            var res = getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, getPreferencesForUpdate(compilerOptions, oldImportSpecifier));
+        function updateModuleSpecifier(compilerOptions, importingSourceFileName, toFileName, host, oldImportSpecifier) {
+            var res = getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, getPreferencesForUpdate(compilerOptions, oldImportSpecifier));
             if (res === oldImportSpecifier)
                 return undefined;
             return res;
         }
         moduleSpecifiers.updateModuleSpecifier = updateModuleSpecifier;
         // Note: importingSourceFile is just for usesJsExtensionOnImports
-        function getModuleSpecifier(compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, files, preferences, redirectTargetsMap) {
+        function getModuleSpecifier(compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, preferences) {
             if (preferences === void 0) { preferences = {}; }
-            return getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, getPreferences(preferences, compilerOptions, importingSourceFile));
+            return getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, getPreferences(preferences, compilerOptions, importingSourceFile));
         }
         moduleSpecifiers.getModuleSpecifier = getModuleSpecifier;
-        function getNodeModulesPackageName(compilerOptions, importingSourceFileName, nodeModulesFileName, host, files, redirectTargetsMap) {
+        function getNodeModulesPackageName(compilerOptions, importingSourceFileName, nodeModulesFileName, host) {
             var info = getInfo(importingSourceFileName, host);
-            var modulePaths = getAllModulePaths(files, importingSourceFileName, nodeModulesFileName, info.getCanonicalFileName, host, redirectTargetsMap);
+            var modulePaths = getAllModulePaths(importingSourceFileName, nodeModulesFileName, host);
             return ts.firstDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions, /*packageNameOnly*/ true); });
         }
         moduleSpecifiers.getNodeModulesPackageName = getNodeModulesPackageName;
-        function getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, files, redirectTargetsMap, preferences) {
+        function getModuleSpecifierWorker(compilerOptions, importingSourceFileName, toFileName, host, preferences) {
             var info = getInfo(importingSourceFileName, host);
-            var modulePaths = getAllModulePaths(files, importingSourceFileName, toFileName, info.getCanonicalFileName, host, redirectTargetsMap);
+            var modulePaths = getAllModulePaths(importingSourceFileName, toFileName, host);
             return ts.firstDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions); }) ||
                 getLocalModuleSpecifier(toFileName, info, compilerOptions, preferences);
         }
         /** Returns an import for each symlink and for the realpath. */
-        function getModuleSpecifiers(moduleSymbol, compilerOptions, importingSourceFile, host, files, userPreferences, redirectTargetsMap) {
+        function getModuleSpecifiers(moduleSymbol, compilerOptions, importingSourceFile, host, userPreferences) {
             var ambient = tryGetModuleNameFromAmbientModule(moduleSymbol);
             if (ambient)
                 return [ambient];
             var info = getInfo(importingSourceFile.path, host);
             var moduleSourceFile = ts.getSourceFileOfNode(moduleSymbol.valueDeclaration || ts.getNonAugmentationDeclaration(moduleSymbol));
-            var modulePaths = getAllModulePaths(files, importingSourceFile.path, moduleSourceFile.originalFileName, info.getCanonicalFileName, host, redirectTargetsMap);
+            var modulePaths = getAllModulePaths(importingSourceFile.path, moduleSourceFile.originalFileName, host);
             var preferences = getPreferences(userPreferences, compilerOptions, importingSourceFile);
             var global = ts.mapDefined(modulePaths, function (moduleFileName) { return tryGetModuleNameAsNodeModule(moduleFileName, info, host, compilerOptions); });
             return global.length ? global : modulePaths.map(function (moduleFileName) { return getLocalModuleSpecifier(moduleFileName, info, compilerOptions, preferences); });
@@ -103562,10 +103829,12 @@ var ts;
         function comparePathsByNumberOfDirectorySeparators(a, b) {
             return ts.compareValues(numberOfDirectorySeparators(a), numberOfDirectorySeparators(b));
         }
-        function forEachFileNameOfModule(files, importingFileName, importedFileName, getCanonicalFileName, host, redirectTargetsMap, preferSymlinks, cb) {
-            var redirects = redirectTargetsMap.get(importedFileName);
-            var importedFileNames = redirects ? __spreadArrays(redirects, [importedFileName]) : [importedFileName];
-            var cwd = host.getCurrentDirectory ? host.getCurrentDirectory() : "";
+        function forEachFileNameOfModule(importingFileName, importedFileName, host, preferSymlinks, cb) {
+            var getCanonicalFileName = ts.hostGetCanonicalFileName(host);
+            var cwd = host.getCurrentDirectory();
+            var referenceRedirect = host.isSourceOfProjectReferenceRedirect(importedFileName) ? host.getProjectReferenceRedirect(importedFileName) : undefined;
+            var redirects = host.redirectTargetsMap.get(ts.toPath(importedFileName, cwd, getCanonicalFileName)) || ts.emptyArray;
+            var importedFileNames = __spreadArrays((referenceRedirect ? [referenceRedirect] : ts.emptyArray), [importedFileName], redirects);
             var targets = importedFileNames.map(function (f) { return ts.getNormalizedAbsolutePath(f, cwd); });
             if (!preferSymlinks) {
                 var result_10 = ts.forEach(targets, cb);
@@ -103573,8 +103842,8 @@ var ts;
                     return result_10;
             }
             var links = host.getProbableSymlinks
-                ? host.getProbableSymlinks(files)
-                : ts.discoverProbableSymlinks(files, getCanonicalFileName, cwd);
+                ? host.getProbableSymlinks(host.getSourceFiles())
+                : ts.discoverProbableSymlinks(host.getSourceFiles(), getCanonicalFileName, cwd);
             var compareStrings = (!host.useCaseSensitiveFileNames || host.useCaseSensitiveFileNames()) ? ts.compareStringsCaseSensitive : ts.compareStringsCaseInsensitive;
             var result = ts.forEachEntry(links, function (resolved, path) {
                 if (ts.startsWithDirectory(importingFileName, resolved, getCanonicalFileName)) {
@@ -103599,22 +103868,28 @@ var ts;
          * Looks for existing imports that use symlinks to this module.
          * Symlinks will be returned first so they are preferred over the real path.
          */
-        function getAllModulePaths(files, importingFileName, importedFileName, getCanonicalFileName, host, redirectTargetsMap) {
-            var cwd = host.getCurrentDirectory ? host.getCurrentDirectory() : "";
+        function getAllModulePaths(importingFileName, importedFileName, host) {
+            var cwd = host.getCurrentDirectory();
+            var getCanonicalFileName = ts.hostGetCanonicalFileName(host);
             var allFileNames = ts.createMap();
-            forEachFileNameOfModule(files, importingFileName, importedFileName, getCanonicalFileName, host, redirectTargetsMap, 
+            var importedFileFromNodeModules = false;
+            forEachFileNameOfModule(importingFileName, importedFileName, host, 
             /*preferSymlinks*/ true, function (path) {
                 // dont return value, so we collect everything
                 allFileNames.set(path, getCanonicalFileName(path));
+                importedFileFromNodeModules = importedFileFromNodeModules || ts.pathContainsNodeModules(path);
             });
             // Sort by paths closest to importing file Name directory
             var sortedPaths = [];
-            var _loop_18 = function (directory) {
+            var _loop_19 = function (directory) {
                 var directoryStart = ts.ensureTrailingDirectorySeparator(directory);
                 var pathsInDirectory;
                 allFileNames.forEach(function (canonicalFileName, fileName) {
                     if (ts.startsWith(canonicalFileName, directoryStart)) {
-                        (pathsInDirectory || (pathsInDirectory = [])).push(fileName);
+                        // If the importedFile is from node modules, use only paths in node_modules folder as option
+                        if (!importedFileFromNodeModules || ts.pathContainsNodeModules(fileName)) {
+                            (pathsInDirectory || (pathsInDirectory = [])).push(fileName);
+                        }
                         allFileNames.delete(fileName);
                     }
                 });
@@ -103632,9 +103907,9 @@ var ts;
             };
             var out_directory_1;
             for (var directory = ts.getDirectoryPath(ts.toPath(importingFileName, cwd, getCanonicalFileName)); allFileNames.size !== 0;) {
-                var state_7 = _loop_18(directory);
+                var state_8 = _loop_19(directory);
                 directory = out_directory_1;
-                if (state_7 === "break")
+                if (state_8 === "break")
                     break;
             }
             if (allFileNames.size) {
diff --git a/package.json b/package.json
index 53c251e1f1a..4bfa5862dba 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "3.9.0",
+    "version": "3.9.0-beta",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
diff --git a/src/compiler/corePublic.ts b/src/compiler/corePublic.ts
index c3a258cd84e..b4d5e8a4aa3 100644
--- a/src/compiler/corePublic.ts
+++ b/src/compiler/corePublic.ts
@@ -3,7 +3,7 @@ namespace ts {
     // If changing the text in this section, be sure to test `configurePrerelease` too.
     export const versionMajorMinor = "3.9";
     /** The version of the TypeScript compiler release */
-    export const version = `${versionMajorMinor}.0-dev`;
+    export const version = `${versionMajorMinor}.0-beta`;
 
     /**
      * Type of objects whose values are all of the same type.