typescript 5.0.0-dev.20230111 → 5.0.0-dev.20230113

package/lib/tsc.js

@@ -23,7 +23,7 @@ var __export = (target, all) => {
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.0";
-var version = `${versionMajorMinor}.0-dev.20230111`;
+var version = `${versionMajorMinor}.0-dev.20230113`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -3525,6 +3525,8 @@ var NodeFlags = /* @__PURE__ */ ((NodeFlags3) => {
   NodeFlags3[NodeFlags3["ContextFlags"] = 50720768] = "ContextFlags";
   NodeFlags3[NodeFlags3["TypeExcludesFlags"] = 40960] = "TypeExcludesFlags";
   NodeFlags3[NodeFlags3["PermanentlySetIncrementalFlags"] = 6291456] = "PermanentlySetIncrementalFlags";
+  NodeFlags3[NodeFlags3["IdentifierHasExtendedUnicodeEscape"] = 128 /* ContainsThis */] = "IdentifierHasExtendedUnicodeEscape";
+  NodeFlags3[NodeFlags3["IdentifierIsInJSDocNamespace"] = 2048 /* HasAsyncFunctions */] = "IdentifierIsInJSDocNamespace";
   return NodeFlags3;
 })(NodeFlags || {});
 var ModifierFlags = /* @__PURE__ */ ((ModifierFlags3) => {
@@ -7145,6 +7147,8 @@ var Diagnostics = {
   package_json_scope_0_explicitly_maps_specifier_1_to_null: diag(6274, 3 /* Message */, "package_json_scope_0_explicitly_maps_specifier_1_to_null_6274", "package.json scope '{0}' explicitly maps specifier '{1}' to null."),
   package_json_scope_0_has_invalid_type_for_target_of_specifier_1: diag(6275, 3 /* Message */, "package_json_scope_0_has_invalid_type_for_target_of_specifier_1_6275", "package.json scope '{0}' has invalid type for target of specifier '{1}'"),
   Export_specifier_0_does_not_exist_in_package_json_scope_at_path_1: diag(6276, 3 /* Message */, "Export_specifier_0_does_not_exist_in_package_json_scope_at_path_1_6276", "Export specifier '{0}' does not exist in package.json scope at path '{1}'."),
+  Resolution_of_non_relative_name_failed_trying_with_modern_Node_resolution_features_disabled_to_see_if_npm_library_needs_configuration_update: diag(6277, 3 /* Message */, "Resolution_of_non_relative_name_failed_trying_with_modern_Node_resolution_features_disabled_to_see_i_6277", "Resolution of non-relative name failed; trying with modern Node resolution features disabled to see if npm library needs configuration update."),
+  There_are_types_at_0_but_this_result_could_not_be_resolved_when_respecting_package_json_exports_The_1_library_may_need_to_update_its_package_json_or_typings: diag(6278, 3 /* Message */, "There_are_types_at_0_but_this_result_could_not_be_resolved_when_respecting_package_json_exports_The__6278", `There are types at '{0}', but this result could not be resolved when respecting package.json "exports". The '{1}' library may need to update its package.json or typings.`),
   Enable_project_compilation: diag(6302, 3 /* Message */, "Enable_project_compilation_6302", "Enable project compilation"),
   Composite_projects_may_not_disable_declaration_emit: diag(6304, 1 /* Error */, "Composite_projects_may_not_disable_declaration_emit_6304", "Composite projects may not disable declaration emit."),
   Output_file_0_has_not_been_built_from_source_file_1: diag(6305, 1 /* Error */, "Output_file_0_has_not_been_built_from_source_file_1_6305", "Output file '{0}' has not been built from source file '{1}'."),
@@ -8404,7 +8408,8 @@ function isIdentifierStart(ch, languageVersion) {
   return ch >= 65 /* A */ && ch <= 90 /* Z */ || ch >= 97 /* a */ && ch <= 122 /* z */ || ch === 36 /* $ */ || ch === 95 /* _ */ || ch > 127 /* maxAsciiCharacter */ && isUnicodeIdentifierStart(ch, languageVersion);
 }
 function isIdentifierPart(ch, languageVersion, identifierVariant) {
-  return ch >= 65 /* A */ && ch <= 90 /* Z */ || ch >= 97 /* a */ && ch <= 122 /* z */ || ch >= 48 /* _0 */ && ch <= 57 /* _9 */ || ch === 36 /* $ */ || ch === 95 /* _ */ || (identifierVariant === 1 /* JSX */ ? ch === 45 /* minus */ || ch === 58 /* colon */ : false) || ch > 127 /* maxAsciiCharacter */ && isUnicodeIdentifierPart(ch, languageVersion);
+  return ch >= 65 /* A */ && ch <= 90 /* Z */ || ch >= 97 /* a */ && ch <= 122 /* z */ || ch >= 48 /* _0 */ && ch <= 57 /* _9 */ || ch === 36 /* $ */ || ch === 95 /* _ */ || // "-" and ":" are valid in JSX Identifiers
+  (identifierVariant === 1 /* JSX */ ? ch === 45 /* minus */ || ch === 58 /* colon */ : false) || ch > 127 /* maxAsciiCharacter */ && isUnicodeIdentifierPart(ch, languageVersion);
 }
 function isIdentifierText(name, languageVersion, identifierVariant) {
   let ch = codePointAt(name, 0);
@@ -10107,6 +10112,10 @@ function unescapeLeadingUnderscores(identifier) {
 function idText(identifierOrPrivateName) {
   return unescapeLeadingUnderscores(identifierOrPrivateName.escapedText);
 }
+function identifierToKeywordKind(node) {
+  const token = stringToToken(node.escapedText);
+  return token ? tryCast(token, isKeyword) : void 0;
+}
 function symbolName(symbol) {
   if (symbol.valueDeclaration && isPrivateIdentifierClassElementDeclaration(symbol.valueDeclaration)) {
     return idText(symbol.valueDeclaration.name);
@@ -10399,15 +10408,17 @@ function getJSDocReturnType(node) {
   }
 }
 function getJSDocTagsWorker(node, noCache) {
+  var _a2, _b;
   if (!canHaveJSDoc(node))
     return emptyArray;
-  let tags = node.jsDocCache;
+  let tags = (_a2 = node.jsDoc) == null ? void 0 : _a2.jsDocCache;
   if (tags === void 0 || noCache) {
     const comments = getJSDocCommentsAndTags(node, noCache);
     Debug.assert(comments.length < 2 || comments[0] !== comments[1]);
     tags = flatMap(comments, (j) => isJSDoc(j) ? j.tags : j);
     if (!noCache) {
-      node.jsDocCache = tags;
+      (_b = node.jsDoc) != null ? _b : node.jsDoc = [];
+      node.jsDoc.jsDocCache = tags;
     }
   }
   return tags;
@@ -10584,10 +10595,12 @@ function isAssertionKey(node) {
   return isStringLiteral(node) || isIdentifier(node);
 }
 function isGeneratedIdentifier(node) {
-  return isIdentifier(node) && node.autoGenerate !== void 0;
+  var _a2;
+  return isIdentifier(node) && ((_a2 = node.emitNode) == null ? void 0 : _a2.autoGenerate) !== void 0;
 }
 function isGeneratedPrivateIdentifier(node) {
-  return isPrivateIdentifier(node) && node.autoGenerate !== void 0;
+  var _a2;
+  return isPrivateIdentifier(node) && ((_a2 = node.emitNode) == null ? void 0 : _a2.autoGenerate) !== void 0;
 }
 function isPrivateIdentifierClassElementDeclaration(node) {
   return (isPropertyDeclaration(node) || isMethodOrAccessor(node)) && isPrivateIdentifier(node.name);
@@ -11831,10 +11844,11 @@ function isComputedNonLiteralName(name) {
   return name.kind === 164 /* ComputedPropertyName */ && !isStringOrNumericLiteralLike(name.expression);
 }
 function tryGetTextOfPropertyName(name) {
+  var _a2;
   switch (name.kind) {
     case 79 /* Identifier */:
     case 80 /* PrivateIdentifier */:
-      return name.autoGenerate ? void 0 : name.escapedText;
+      return ((_a2 = name.emitNode) == null ? void 0 : _a2.autoGenerate) ? void 0 : name.escapedText;
     case 10 /* StringLiteral */:
     case 8 /* NumericLiteral */:
     case 14 /* NoSubstitutionTemplateLiteral */:
@@ -11952,6 +11966,20 @@ function getSpanOfTokenAtPosition(sourceFile, pos) {
   const start = scanner.getTokenPos();
   return createTextSpanFromBounds(start, scanner.getTextPos());
 }
+function scanTokenAtPosition(sourceFile, pos) {
+  const scanner = createScanner(
+    sourceFile.languageVersion,
+    /*skipTrivia*/
+    true,
+    sourceFile.languageVariant,
+    sourceFile.text,
+    /*onError:*/
+    void 0,
+    pos
+  );
+  scanner.scan();
+  return scanner.getToken();
+}
 function getErrorSpanForArrowFunction(sourceFile, node) {
   const pos = skipTrivia(sourceFile.text, node.pos);
   if (node.body && node.body.kind === 238 /* Block */) {
@@ -13552,7 +13580,8 @@ function isStringANonContextualKeyword(name) {
   const token = stringToToken(name);
   return token !== void 0 && isNonContextualKeyword(token);
 }
-function isIdentifierANonContextualKeyword({ originalKeywordKind }) {
+function isIdentifierANonContextualKeyword(node) {
+  const originalKeywordKind = identifierToKeywordKind(node);
   return !!originalKeywordKind && !isContextualKeyword(originalKeywordKind);
 }
 function getFunctionFlags(node) {
@@ -14364,7 +14393,7 @@ function isThisInTypeQuery(node) {
   return node.parent.kind === 183 /* TypeQuery */;
 }
 function identifierIsThisKeyword(id) {
-  return id.originalKeywordKind === 108 /* ThisKeyword */;
+  return id.escapedText === "this";
 }
 function getAllAccessorDeclarations(declarations, accessor) {
   let firstAccessor;
@@ -14663,7 +14692,7 @@ function getEffectiveModifierFlagsNoCache(node) {
 }
 function getSyntacticModifierFlagsNoCache(node) {
   let flags = canHaveModifiers(node) ? modifiersToFlags(node.modifiers) : 0 /* None */;
-  if (node.flags & 4 /* NestedNamespace */ || node.kind === 79 /* Identifier */ && node.isInJSDocNamespace) {
+  if (node.flags & 4 /* NestedNamespace */ || node.kind === 79 /* Identifier */ && node.flags & 2048 /* IdentifierIsInJSDocNamespace */) {
     flags |= 1 /* Export */;
   }
   return flags;
@@ -15300,7 +15329,6 @@ function Identifier2(kind, pos, end) {
   this.parent = void 0;
   this.original = void 0;
   this.emitNode = void 0;
-  this.flowNode = void 0;
 }
 function SourceMapSource(fileName, text, skipTrivia2) {
   this.fileName = fileName;
@@ -17246,7 +17274,6 @@ function createNodeFactory(flags, baseFactory2) {
     createRegularExpressionLiteral,
     createLiteralLikeNode,
     createIdentifier,
-    updateIdentifier,
     createTempVariable,
     createLoopVariable,
     createUniqueName,
@@ -17989,55 +18016,43 @@ function createNodeFactory(flags, baseFactory2) {
         );
     }
   }
-  function createBaseIdentifier(escapedText, originalKeywordKind) {
+  function createBaseIdentifier(escapedText) {
     const node = baseFactory2.createBaseIdentifierNode(79 /* Identifier */);
-    node.originalKeywordKind = originalKeywordKind;
     node.escapedText = escapedText;
-    node.autoGenerate = void 0;
-    node.typeArguments = void 0;
-    node.hasExtendedUnicodeEscape = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.flowNode = void 0;
     node.symbol = void 0;
     return node;
   }
   function createBaseGeneratedIdentifier(text, autoGenerateFlags, prefix, suffix) {
-    const node = createBaseIdentifier(
-      escapeLeadingUnderscores(text),
-      /*originalKeywordKind*/
-      void 0
-    );
-    node.autoGenerate = {
+    const node = createBaseIdentifier(escapeLeadingUnderscores(text));
+    setIdentifierAutoGenerate(node, {
       flags: autoGenerateFlags,
       id: nextAutoGenerateId,
       prefix,
       suffix
-    };
+    });
     nextAutoGenerateId++;
     return node;
   }
-  function createIdentifier(text, typeArguments, originalKeywordKind, hasExtendedUnicodeEscape) {
+  function createIdentifier(text, originalKeywordKind, hasExtendedUnicodeEscape) {
     if (originalKeywordKind === void 0 && text) {
       originalKeywordKind = stringToToken(text);
     }
     if (originalKeywordKind === 79 /* Identifier */) {
       originalKeywordKind = void 0;
     }
-    const node = createBaseIdentifier(escapeLeadingUnderscores(text), originalKeywordKind);
-    node.typeArguments = asNodeArray(typeArguments);
-    node.hasExtendedUnicodeEscape = hasExtendedUnicodeEscape;
-    if (node.originalKeywordKind === 133 /* AwaitKeyword */) {
+    const node = createBaseIdentifier(escapeLeadingUnderscores(text));
+    if (hasExtendedUnicodeEscape)
+      node.flags |= 128 /* IdentifierHasExtendedUnicodeEscape */;
+    if (node.escapedText === "await") {
       node.transformFlags |= 67108864 /* ContainsPossibleTopLevelAwait */;
     }
-    if (node.hasExtendedUnicodeEscape) {
+    if (node.flags & 128 /* IdentifierHasExtendedUnicodeEscape */) {
       node.transformFlags |= 1024 /* ContainsES2015 */;
     }
     return node;
   }
-  function updateIdentifier(node, typeArguments) {
-    return node.typeArguments !== typeArguments ? update(createIdentifier(idText(node), typeArguments), node) : node;
-  }
   function createTempVariable(recordTempVariable, reservedInNestedScopes, prefix, suffix) {
     let flags2 = 1 /* Auto */;
     if (reservedInNestedScopes)
@@ -18085,7 +18100,6 @@ function createNodeFactory(flags, baseFactory2) {
   function createBasePrivateIdentifier(escapedText) {
     const node = baseFactory2.createBasePrivateIdentifierNode(80 /* PrivateIdentifier */);
     node.escapedText = escapedText;
-    node.autoGenerate = void 0;
     node.transformFlags |= 16777216 /* ContainsClassFields */;
     return node;
   }
@@ -18096,12 +18110,12 @@ function createNodeFactory(flags, baseFactory2) {
   }
   function createBaseGeneratedPrivateIdentifier(text, autoGenerateFlags, prefix, suffix) {
     const node = createBasePrivateIdentifier(escapeLeadingUnderscores(text));
-    node.autoGenerate = {
+    setIdentifierAutoGenerate(node, {
       flags: autoGenerateFlags,
       id: nextAutoGenerateId,
       prefix,
       suffix
-    };
+    });
     nextAutoGenerateId++;
     return node;
   }
@@ -18263,7 +18277,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.transformFlags = 1 /* ContainsTypeScript */;
     node.expression = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updateTypeParameterDeclaration(node, modifiers, name, constraint, defaultType) {
@@ -18284,7 +18297,6 @@ function createNodeFactory(flags, baseFactory2) {
       node.transformFlags = propagateChildrenFlags(node.modifiers) | propagateChildFlags(node.dotDotDotToken) | propagateNameFlags(node.name) | propagateChildFlags(node.questionToken) | propagateChildFlags(node.initializer) | (((_a2 = node.questionToken) != null ? _a2 : node.type) ? 1 /* ContainsTypeScript */ : 0 /* None */) | (((_b = node.dotDotDotToken) != null ? _b : node.initializer) ? 1024 /* ContainsES2015 */ : 0 /* None */) | (modifiersToFlags(node.modifiers) & 16476 /* ParameterPropertyModifier */ ? 8192 /* ContainsTypeScriptClassSyntax */ : 0 /* None */);
     }
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updateParameterDeclaration(node, modifiers, dotDotDotToken, name, questionToken, type, initializer) {
@@ -18312,7 +18324,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.transformFlags = 1 /* ContainsTypeScript */;
     node.initializer = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updatePropertySignature(node, modifiers, name, questionToken, type) {
@@ -18335,7 +18346,6 @@ function createNodeFactory(flags, baseFactory2) {
     const isAmbient = node.flags & 16777216 /* Ambient */ || modifiersToFlags(node.modifiers) & 2 /* Ambient */;
     node.transformFlags = propagateChildrenFlags(node.modifiers) | propagateNameFlags(node.name) | propagateChildFlags(node.initializer) | (isAmbient || node.questionToken || node.exclamationToken || node.type ? 1 /* ContainsTypeScript */ : 0 /* None */) | (isComputedPropertyName(node.name) || modifiersToFlags(node.modifiers) & 32 /* Static */ && node.initializer ? 8192 /* ContainsTypeScriptClassSyntax */ : 0 /* None */) | 16777216 /* ContainsClassFields */;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updatePropertyDeclaration(node, modifiers, name, questionOrExclamationToken, type, initializer) {
@@ -18351,7 +18361,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.type = type;
     node.transformFlags = 1 /* ContainsTypeScript */;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     node.typeArguments = void 0;
@@ -18381,7 +18390,6 @@ function createNodeFactory(flags, baseFactory2) {
     }
     node.typeArguments = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     node.flowNode = void 0;
@@ -18405,7 +18413,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.illegalDecorators = void 0;
     node.modifiers = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     node.endFlowNode = void 0;
@@ -18433,7 +18440,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.type = void 0;
     node.typeArguments = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     node.endFlowNode = void 0;
@@ -18466,7 +18472,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.typeArguments = void 0;
     node.typeParameters = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     node.flowNode = void 0;
@@ -18498,7 +18503,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.typeParameters = void 0;
     node.type = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     node.flowNode = void 0;
@@ -18523,7 +18527,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.type = type;
     node.transformFlags = 1 /* ContainsTypeScript */;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     node.typeArguments = void 0;
@@ -18539,7 +18542,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.type = type;
     node.transformFlags = 1 /* ContainsTypeScript */;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     node.typeArguments = void 0;
@@ -18556,7 +18558,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.transformFlags = 1 /* ContainsTypeScript */;
     node.illegalDecorators = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     node.typeArguments = void 0;
@@ -18607,7 +18608,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.transformFlags = 1 /* ContainsTypeScript */;
     node.modifiers = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     node.typeArguments = void 0;
@@ -18633,7 +18633,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.type = type;
     node.transformFlags = 1 /* ContainsTypeScript */;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     node.typeArguments = void 0;
@@ -18702,7 +18701,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.type = type;
     node.transformFlags = 1 /* ContainsTypeScript */;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updateNamedTupleMember(node, dotDotDotToken, name, questionToken, type) {
@@ -18904,7 +18902,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.multiLine = multiLine;
     node.transformFlags |= propagateChildrenFlags(node.properties);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updateObjectLiteralExpression(node, properties) {
@@ -18917,7 +18914,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.name = name;
     node.transformFlags = propagateChildFlags(node.expression) | propagateChildFlags(node.questionDotToken) | (isIdentifier(node.name) ? propagateIdentifierNameFlags(node.name) : propagateChildFlags(node.name) | 536870912 /* ContainsPrivateIdentifierInExpression */);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.flowNode = void 0;
     return node;
   }
@@ -18968,7 +18964,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.argumentExpression = argumentExpression;
     node.transformFlags |= propagateChildFlags(node.expression) | propagateChildFlags(node.questionDotToken) | propagateChildFlags(node.argumentExpression);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.flowNode = void 0;
     return node;
   }
@@ -19119,7 +19114,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.expression = expression;
     node.transformFlags = propagateChildFlags(node.expression);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updateParenthesizedExpression(node, expression) {
@@ -19140,7 +19134,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.transformFlags = propagateChildrenFlags(node.modifiers) | propagateChildFlags(node.asteriskToken) | propagateNameFlags(node.name) | propagateChildrenFlags(node.typeParameters) | propagateChildrenFlags(node.parameters) | propagateChildFlags(node.type) | propagateChildFlags(node.body) & ~67108864 /* ContainsPossibleTopLevelAwait */ | (isAsyncGenerator ? 128 /* ContainsES2018 */ : isAsync ? 256 /* ContainsES2017 */ : isGenerator ? 2048 /* ContainsGenerator */ : 0 /* None */) | (node.typeParameters || node.type ? 1 /* ContainsTypeScript */ : 0 /* None */) | 4194304 /* ContainsHoistedDeclarationOrCompletion */;
     node.typeArguments = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     node.flowNode = void 0;
@@ -19163,7 +19156,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.transformFlags = propagateChildrenFlags(node.modifiers) | propagateChildrenFlags(node.typeParameters) | propagateChildrenFlags(node.parameters) | propagateChildFlags(node.type) | propagateChildFlags(node.equalsGreaterThanToken) | propagateChildFlags(node.body) & ~67108864 /* ContainsPossibleTopLevelAwait */ | (node.typeParameters || node.type ? 1 /* ContainsTypeScript */ : 0 /* None */) | (isAsync ? 256 /* ContainsES2017 */ | 16384 /* ContainsLexicalThis */ : 0 /* None */) | 1024 /* ContainsES2015 */;
     node.typeArguments = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     node.flowNode = void 0;
@@ -19261,7 +19253,6 @@ function createNodeFactory(flags, baseFactory2) {
       node.transformFlags |= 536870912 /* ContainsPrivateIdentifierInExpression */;
     }
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function propagateAssignmentPatternFlags(node) {
@@ -19403,7 +19394,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.members = createNodeArray(members);
     node.transformFlags |= propagateChildrenFlags(node.modifiers) | propagateNameFlags(node.name) | propagateChildrenFlags(node.typeParameters) | propagateChildrenFlags(node.heritageClauses) | propagateChildrenFlags(node.members) | (node.typeParameters ? 1 /* ContainsTypeScript */ : 0 /* None */) | 1024 /* ContainsES2015 */;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updateClassExpression(node, modifiers, name, typeParameters, heritageClauses, members) {
@@ -19519,7 +19509,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.multiLine = multiLine;
     node.transformFlags |= propagateChildrenFlags(node.statements);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     return node;
@@ -19537,7 +19526,6 @@ function createNodeFactory(flags, baseFactory2) {
     }
     node.illegalDecorators = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.flowNode = void 0;
     return node;
   }
@@ -19547,7 +19535,6 @@ function createNodeFactory(flags, baseFactory2) {
   function createEmptyStatement() {
     const node = createBaseNode(239 /* EmptyStatement */);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function createExpressionStatement(expression) {
@@ -19555,7 +19542,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.expression = parenthesizerRules().parenthesizeExpressionOfExpressionStatement(expression);
     node.transformFlags |= propagateChildFlags(node.expression);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.flowNode = void 0;
     return node;
   }
@@ -19569,7 +19555,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.elseStatement = asEmbeddedStatement(elseStatement);
     node.transformFlags |= propagateChildFlags(node.expression) | propagateChildFlags(node.thenStatement) | propagateChildFlags(node.elseStatement);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.flowNode = void 0;
     return node;
   }
@@ -19582,7 +19567,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.expression = expression;
     node.transformFlags |= propagateChildFlags(node.statement) | propagateChildFlags(node.expression);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.flowNode = void 0;
     return node;
   }
@@ -19595,7 +19579,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.statement = asEmbeddedStatement(statement);
     node.transformFlags |= propagateChildFlags(node.expression) | propagateChildFlags(node.statement);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.flowNode = void 0;
     return node;
   }
@@ -19610,7 +19593,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.statement = asEmbeddedStatement(statement);
     node.transformFlags |= propagateChildFlags(node.initializer) | propagateChildFlags(node.condition) | propagateChildFlags(node.incrementor) | propagateChildFlags(node.statement);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     node.flowNode = void 0;
@@ -19626,7 +19608,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.statement = asEmbeddedStatement(statement);
     node.transformFlags |= propagateChildFlags(node.initializer) | propagateChildFlags(node.expression) | propagateChildFlags(node.statement);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     node.flowNode = void 0;
@@ -19645,7 +19626,6 @@ function createNodeFactory(flags, baseFactory2) {
     if (awaitModifier)
       node.transformFlags |= 128 /* ContainsES2018 */;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     node.flowNode = void 0;
@@ -19659,7 +19639,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.label = asName(label);
     node.transformFlags |= propagateChildFlags(node.label) | 4194304 /* ContainsHoistedDeclarationOrCompletion */;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.flowNode = void 0;
     return node;
   }
@@ -19671,7 +19650,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.label = asName(label);
     node.transformFlags |= propagateChildFlags(node.label) | 4194304 /* ContainsHoistedDeclarationOrCompletion */;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.flowNode = void 0;
     return node;
   }
@@ -19683,7 +19661,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.expression = expression;
     node.transformFlags |= propagateChildFlags(node.expression) | 128 /* ContainsES2018 */ | 4194304 /* ContainsHoistedDeclarationOrCompletion */;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.flowNode = void 0;
     return node;
   }
@@ -19696,7 +19673,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.statement = asEmbeddedStatement(statement);
     node.transformFlags |= propagateChildFlags(node.expression) | propagateChildFlags(node.statement);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.flowNode = void 0;
     return node;
   }
@@ -19709,7 +19685,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.caseBlock = caseBlock;
     node.transformFlags |= propagateChildFlags(node.expression) | propagateChildFlags(node.caseBlock);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.flowNode = void 0;
     node.possiblyExhaustive = false;
     return node;
@@ -19723,7 +19698,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.statement = asEmbeddedStatement(statement);
     node.transformFlags |= propagateChildFlags(node.label) | propagateChildFlags(node.statement);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.flowNode = void 0;
     return node;
   }
@@ -19735,7 +19709,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.expression = expression;
     node.transformFlags |= propagateChildFlags(node.expression);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.flowNode = void 0;
     return node;
   }
@@ -19749,7 +19722,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.finallyBlock = finallyBlock;
     node.transformFlags |= propagateChildFlags(node.tryBlock) | propagateChildFlags(node.catchClause) | propagateChildFlags(node.finallyBlock);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.flowNode = void 0;
     return node;
   }
@@ -19759,7 +19731,6 @@ function createNodeFactory(flags, baseFactory2) {
   function createDebuggerStatement() {
     const node = createBaseNode(256 /* DebuggerStatement */);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.flowNode = void 0;
     return node;
   }
@@ -19772,7 +19743,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.initializer = asInitializer(initializer);
     node.transformFlags |= propagateNameFlags(node.name) | propagateChildFlags(node.initializer) | (((_a2 = node.exclamationToken) != null ? _a2 : node.type) ? 1 /* ContainsTypeScript */ : 0 /* None */);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updateVariableDeclaration(node, name, exclamationToken, type, initializer) {
@@ -19811,7 +19781,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.illegalDecorators = void 0;
     node.typeArguments = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     node.endFlowNode = void 0;
@@ -19843,7 +19812,6 @@ function createNodeFactory(flags, baseFactory2) {
       }
     }
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updateClassDeclaration(node, modifiers, name, typeParameters, heritageClauses, members) {
@@ -19859,7 +19827,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.transformFlags = 1 /* ContainsTypeScript */;
     node.illegalDecorators = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updateInterfaceDeclaration(node, modifiers, name, typeParameters, heritageClauses, members) {
@@ -19880,7 +19847,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.transformFlags = 1 /* ContainsTypeScript */;
     node.illegalDecorators = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     return node;
@@ -19903,7 +19869,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.transformFlags &= ~67108864 /* ContainsPossibleTopLevelAwait */;
     node.illegalDecorators = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updateEnumDeclaration(node, modifiers, name, members) {
@@ -19929,7 +19894,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.transformFlags &= ~67108864 /* ContainsPossibleTopLevelAwait */;
     node.illegalDecorators = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     return node;
@@ -19948,7 +19912,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.statements = createNodeArray(statements);
     node.transformFlags |= propagateChildrenFlags(node.statements);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updateModuleBlock(node, statements) {
@@ -19972,7 +19935,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.illegalDecorators = void 0;
     node.modifiers = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updateNamespaceExportDeclaration(node, name) {
@@ -19998,7 +19960,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.transformFlags &= ~67108864 /* ContainsPossibleTopLevelAwait */;
     node.illegalDecorators = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updateImportEqualsDeclaration(node, modifiers, isTypeOnly, name, moduleReference) {
@@ -20020,7 +19981,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.transformFlags &= ~67108864 /* ContainsPossibleTopLevelAwait */;
     node.illegalDecorators = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updateImportDeclaration(node, modifiers, importClause, moduleSpecifier, assertClause) {
@@ -20132,7 +20092,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.transformFlags &= ~67108864 /* ContainsPossibleTopLevelAwait */;
     node.illegalDecorators = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updateExportAssignment(node, modifiers, expression) {
@@ -20155,7 +20114,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.transformFlags &= ~67108864 /* ContainsPossibleTopLevelAwait */;
     node.illegalDecorators = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updateExportDeclaration(node, modifiers, isTypeOnly, exportClause, moduleSpecifier, assertClause) {
@@ -20185,7 +20143,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.transformFlags |= propagateChildFlags(node.propertyName) | propagateChildFlags(node.name);
     node.transformFlags &= ~67108864 /* ContainsPossibleTopLevelAwait */;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updateExportSpecifier(node, isTypeOnly, propertyName, name) {
@@ -20194,7 +20151,6 @@ function createNodeFactory(flags, baseFactory2) {
   function createMissingDeclaration() {
     const node = createBaseDeclaration(279 /* MissingDeclaration */);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function createExternalModuleReference(expression) {
@@ -20235,7 +20191,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.type = type;
     node.transformFlags = propagateChildrenFlags(node.parameters) | (node.type ? 1 /* ContainsTypeScript */ : 0 /* None */);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     node.typeArguments = void 0;
@@ -20267,7 +20222,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.parameters = createNodeArray(parameters);
     node.type = type;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     node.locals = void 0;
     node.nextContainer = void 0;
     return node;
@@ -20595,7 +20549,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.statements = createNodeArray(statements);
     node.transformFlags |= propagateChildFlags(node.expression) | propagateChildrenFlags(node.statements);
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updateCaseClause(node, expression, statements) {
@@ -20652,7 +20605,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.questionToken = void 0;
     node.exclamationToken = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updatePropertyAssignment(node, name, initializer) {
@@ -20678,7 +20630,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.questionToken = void 0;
     node.exclamationToken = void 0;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updateShorthandPropertyAssignment(node, name, objectAssignmentInitializer) {
@@ -20699,7 +20650,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.expression = parenthesizerRules().parenthesizeExpressionForDisallowedComma(expression);
     node.transformFlags |= propagateChildFlags(node.expression) | 128 /* ContainsES2018 */ | 65536 /* ContainsObjectRestOrSpread */;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updateSpreadAssignment(node, expression) {
@@ -20711,7 +20661,6 @@ function createNodeFactory(flags, baseFactory2) {
     node.initializer = initializer && parenthesizerRules().parenthesizeExpressionForDisallowedComma(initializer);
     node.transformFlags |= propagateChildFlags(node.name) | propagateChildFlags(node.initializer) | 1 /* ContainsTypeScript */;
     node.jsDoc = void 0;
-    node.jsDocCache = void 0;
     return node;
   }
   function updateEnumMember(node, name, initializer) {
@@ -20957,36 +20906,32 @@ function createNodeFactory(flags, baseFactory2) {
     return node.expression !== expression || node.thisArg !== thisArg ? update(createSyntheticReferenceExpression(expression, thisArg), node) : node;
   }
   function cloneGeneratedIdentifier(node) {
-    const clone2 = createBaseIdentifier(
-      node.escapedText,
-      /*originalKeywordKind*/
-      void 0
-    );
+    const clone2 = createBaseIdentifier(node.escapedText);
     clone2.flags |= node.flags & ~8 /* Synthesized */;
-    clone2.autoGenerate = { ...node.autoGenerate };
     clone2.transformFlags = node.transformFlags;
     setOriginalNode(clone2, node);
+    setIdentifierAutoGenerate(clone2, { ...node.emitNode.autoGenerate });
     return clone2;
   }
   function cloneIdentifier(node) {
-    const clone2 = createBaseIdentifier(node.escapedText, node.originalKeywordKind);
+    const clone2 = createBaseIdentifier(node.escapedText);
     clone2.flags |= node.flags & ~8 /* Synthesized */;
-    clone2.typeArguments = node.typeArguments;
-    clone2.hasExtendedUnicodeEscape = node.hasExtendedUnicodeEscape;
     clone2.jsDoc = node.jsDoc;
-    clone2.jsDocCache = node.jsDocCache;
     clone2.flowNode = node.flowNode;
     clone2.symbol = node.symbol;
     clone2.transformFlags = node.transformFlags;
     setOriginalNode(clone2, node);
+    const typeArguments = getIdentifierTypeArguments(node);
+    if (typeArguments)
+      setIdentifierTypeArguments(clone2, typeArguments);
     return clone2;
   }
   function cloneGeneratedPrivateIdentifier(node) {
     const clone2 = createBasePrivateIdentifier(node.escapedText);
     clone2.flags |= node.flags & ~8 /* Synthesized */;
-    clone2.autoGenerate = { ...node.autoGenerate };
     clone2.transformFlags = node.transformFlags;
     setOriginalNode(clone2, node);
+    setIdentifierAutoGenerate(clone2, { ...node.emitNode.autoGenerate });
     return clone2;
   }
   function clonePrivateIdentifier(node) {
@@ -22194,6 +22139,26 @@ function getTypeNode(node) {
   var _a2;
   return (_a2 = node.emitNode) == null ? void 0 : _a2.typeNode;
 }
+function setIdentifierTypeArguments(node, typeArguments) {
+  getOrCreateEmitNode(node).identifierTypeArguments = typeArguments;
+  return node;
+}
+function getIdentifierTypeArguments(node) {
+  var _a2;
+  return (_a2 = node.emitNode) == null ? void 0 : _a2.identifierTypeArguments;
+}
+function setIdentifierAutoGenerate(node, autoGenerate) {
+  getOrCreateEmitNode(node).autoGenerate = autoGenerate;
+  return node;
+}
+function setIdentifierGeneratedImportReference(node, value) {
+  getOrCreateEmitNode(node).generatedImportReference = value;
+  return node;
+}
+function getIdentifierGeneratedImportReference(node) {
+  var _a2;
+  return (_a2 = node.emitNode) == null ? void 0 : _a2.generatedImportReference;
+}
 
 // src/compiler/factory/emitHelpers.ts
 function createEmitHelperFactory(context) {
@@ -24420,13 +24385,16 @@ function elideNodes(factory2, nodes) {
   return setTextRange(factory2.createNodeArray([], nodes.hasTrailingComma), nodes);
 }
 function getNodeForGeneratedName(name) {
-  if (name.autoGenerate.flags & 4 /* Node */) {
-    const autoGenerateId = name.autoGenerate.id;
+  var _a2;
+  const autoGenerate = name.emitNode.autoGenerate;
+  if (autoGenerate.flags & 4 /* Node */) {
+    const autoGenerateId = autoGenerate.id;
     let node = name;
     let original = node.original;
     while (original) {
       node = original;
-      if (isMemberName(node) && (node.autoGenerate === void 0 || !!(node.autoGenerate.flags & 4 /* Node */) && node.autoGenerate.id !== autoGenerateId)) {
+      const autoGenerate2 = (_a2 = node.emitNode) == null ? void 0 : _a2.autoGenerate;
+      if (isMemberName(node) && (autoGenerate2 === void 0 || !!(autoGenerate2.flags & 4 /* Node */) && autoGenerate2.id !== autoGenerateId)) {
         break;
       }
       original = node.original;
@@ -26025,8 +25993,6 @@ var Parser;
     const pos = getNodePos();
     const result = kind === 79 /* Identifier */ ? factory2.createIdentifier(
       "",
-      /*typeArguments*/
-      void 0,
       /*originalKeywordKind*/
       void 0
     ) : isTemplateLiteralKind(kind) ? factory2.createTemplateLiteralLikeNode(
@@ -26061,13 +26027,7 @@ var Parser;
       const text = internIdentifier(scanner.getTokenValue());
       const hasExtendedUnicodeEscape = scanner.hasExtendedUnicodeEscape();
       nextTokenWithoutCheck();
-      return finishNode(factory2.createIdentifier(
-        text,
-        /*typeArguments*/
-        void 0,
-        originalKeywordKind,
-        hasExtendedUnicodeEscape
-      ), pos);
+      return finishNode(factory2.createIdentifier(text, originalKeywordKind, hasExtendedUnicodeEscape), pos);
     }
     if (token() === 80 /* PrivateIdentifier */) {
       parseErrorAtCurrentToken(privateIdentifierDiagnosticMessage || Diagnostics.Private_identifiers_are_not_allowed_outside_class_bodies);
@@ -26409,6 +26369,7 @@ var Parser;
     return parseElement();
   }
   function currentNode(parsingContext2, pos) {
+    var _a2;
     if (!syntaxCursor || !isReusableParsingContext(parsingContext2) || parseErrorBeforeNextFinishedNode) {
       return void 0;
     }
@@ -26423,8 +26384,8 @@ var Parser;
     if (!canReuseNode(node, parsingContext2)) {
       return void 0;
     }
-    if (canHaveJSDoc(node) && node.jsDocCache) {
-      node.jsDocCache = void 0;
+    if (canHaveJSDoc(node) && ((_a2 = node.jsDoc) == null ? void 0 : _a2.jsDocCache)) {
+      node.jsDoc.jsDocCache = void 0;
     }
     return node;
   }
@@ -26483,7 +26444,7 @@ var Parser;
           return true;
         case 171 /* MethodDeclaration */:
           const methodDeclaration = node;
-          const nameIsConstructor = methodDeclaration.name.kind === 79 /* Identifier */ && methodDeclaration.name.originalKeywordKind === 135 /* ConstructorKeyword */;
+          const nameIsConstructor = methodDeclaration.name.kind === 79 /* Identifier */ && methodDeclaration.name.escapedText === "constructor";
           return !nameIsConstructor;
       }
     }
@@ -26705,13 +26666,10 @@ var Parser;
   function parseEntityName(allowReservedWords, diagnosticMessage) {
     const pos = getNodePos();
     let entity = allowReservedWords ? parseIdentifierName(diagnosticMessage) : parseIdentifier(diagnosticMessage);
-    let dotPos = getNodePos();
     while (parseOptional(24 /* DotToken */)) {
       if (token() === 29 /* LessThanToken */) {
-        entity.jsdocDotPos = dotPos;
         break;
       }
-      dotPos = getNodePos();
       entity = finishNode(
         factory2.createQualifiedName(
           entity,
@@ -31491,7 +31449,7 @@ var Parser;
           return finishNode(jsDocNamespaceNode, pos);
         }
         if (nested) {
-          typeNameOrNamespaceName.isInJSDocNamespace = true;
+          typeNameOrNamespaceName.flags |= 2048 /* IdentifierIsInJSDocNamespace */;
         }
         return typeNameOrNamespaceName;
       }
@@ -31695,12 +31653,7 @@ var Parser;
         const end2 = scanner.getTextPos();
         const originalKeywordKind = token();
         const text = internIdentifier(scanner.getTokenValue());
-        const result = finishNode(factory2.createIdentifier(
-          text,
-          /*typeArguments*/
-          void 0,
-          originalKeywordKind
-        ), pos, end2);
+        const result = finishNode(factory2.createIdentifier(text, originalKeywordKind), pos, end2);
         nextTokenJSDoc();
         return result;
       }
@@ -34297,7 +34250,8 @@ function convertToObjectWorker(sourceFile, rootExpression, errors, returnValue,
         if (returnValue) {
           result[keyText] = value;
         }
-        if (jsonConversionNotifier && (parentOption || isRootOptionMap(knownOptions))) {
+        if (jsonConversionNotifier && // Current callbacks are only on known parent option or if we are setting values in the root
+        (parentOption || isRootOptionMap(knownOptions))) {
           const isValidOptionValue = isCompilerOptionsValue(option, value);
           if (parentOption) {
             if (isValidOptionValue) {
@@ -35559,7 +35513,7 @@ function resolvedTypeScriptOnly(resolved) {
   Debug.assert(extensionIsTS(resolved.extension));
   return { fileName: resolved.path, packageId: resolved.packageId };
 }
-function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations, affectingLocations, diagnostics, resultFromCache) {
+function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibraryImport, failedLookupLocations, affectingLocations, diagnostics, resultFromCache, legacyResult) {
   if (resultFromCache) {
     resultFromCache.failedLookupLocations = updateResolutionField(resultFromCache.failedLookupLocations, failedLookupLocations);
     resultFromCache.affectingLocations = updateResolutionField(resultFromCache.affectingLocations, affectingLocations);
@@ -35577,7 +35531,8 @@ function createResolvedModuleWithFailedLookupLocations(resolved, isExternalLibra
     },
     failedLookupLocations: initializeResolutionField(failedLookupLocations),
     affectingLocations: initializeResolutionField(affectingLocations),
-    resolutionDiagnostics: initializeResolutionField(diagnostics)
+    resolutionDiagnostics: initializeResolutionField(diagnostics),
+    node10Result: legacyResult
   };
 }
 function initializeResolutionField(value) {
@@ -36607,7 +36562,7 @@ function nodeNextJsonConfigResolver(moduleName, containingFile, host) {
   );
 }
 function nodeModuleNameResolverWorker(features, moduleName, containingDirectory, compilerOptions, host, cache, extensions, isConfigLookup, redirectedReference) {
-  var _a2, _b;
+  var _a2, _b, _c, _d;
   const traceEnabled = isTraceEnabled(compilerOptions, host);
   const failedLookupLocations = [];
   const affectingLocations = [];
@@ -36634,44 +36589,60 @@ function nodeModuleNameResolverWorker(features, moduleName, containingDirectory,
   if (getEmitModuleResolutionKind(compilerOptions) === 2 /* Node10 */) {
     const priorityExtensions = extensions & (1 /* TypeScript */ | 4 /* Declaration */);
     const secondaryExtensions = extensions & ~(1 /* TypeScript */ | 4 /* Declaration */);
-    result = priorityExtensions && tryResolve(priorityExtensions) || secondaryExtensions && tryResolve(secondaryExtensions) || void 0;
+    result = priorityExtensions && tryResolve(priorityExtensions, state) || secondaryExtensions && tryResolve(secondaryExtensions, state) || void 0;
   } else {
-    result = tryResolve(extensions);
+    result = tryResolve(extensions, state);
+  }
+  let legacyResult;
+  if (((_a2 = result == null ? void 0 : result.value) == null ? void 0 : _a2.isExternalLibraryImport) && !isConfigLookup && extensions & (1 /* TypeScript */ | 4 /* Declaration */) && features & 8 /* Exports */ && !isExternalModuleNameRelative(moduleName) && !extensionIsOk(1 /* TypeScript */ | 4 /* Declaration */, result.value.resolved.extension) && conditions.indexOf("import") > -1) {
+    traceIfEnabled(state, Diagnostics.Resolution_of_non_relative_name_failed_trying_with_modern_Node_resolution_features_disabled_to_see_if_npm_library_needs_configuration_update);
+    const diagnosticState = {
+      ...state,
+      features: state.features & ~8 /* Exports */,
+      failedLookupLocations: [],
+      affectingLocations: [],
+      reportDiagnostic: noop
+    };
+    const diagnosticResult = tryResolve(extensions & (1 /* TypeScript */ | 4 /* Declaration */), diagnosticState);
+    if ((_b = diagnosticResult == null ? void 0 : diagnosticResult.value) == null ? void 0 : _b.isExternalLibraryImport) {
+      legacyResult = diagnosticResult.value.resolved.path;
+    }
   }
   return createResolvedModuleWithFailedLookupLocations(
-    (_a2 = result == null ? void 0 : result.value) == null ? void 0 : _a2.resolved,
-    (_b = result == null ? void 0 : result.value) == null ? void 0 : _b.isExternalLibraryImport,
+    (_c = result == null ? void 0 : result.value) == null ? void 0 : _c.resolved,
+    (_d = result == null ? void 0 : result.value) == null ? void 0 : _d.isExternalLibraryImport,
     failedLookupLocations,
     affectingLocations,
     diagnostics,
-    state.resultFromCache
+    state.resultFromCache,
+    legacyResult
   );
-  function tryResolve(extensions2) {
-    const loader = (extensions3, candidate, onlyRecordFailures, state2) => nodeLoadModuleByRelativeName(
+  function tryResolve(extensions2, state2) {
+    const loader = (extensions3, candidate, onlyRecordFailures, state3) => nodeLoadModuleByRelativeName(
       extensions3,
       candidate,
       onlyRecordFailures,
-      state2,
+      state3,
       /*considerPackageJson*/
       true
     );
-    const resolved = tryLoadModuleUsingOptionalResolutionSettings(extensions2, moduleName, containingDirectory, loader, state);
+    const resolved = tryLoadModuleUsingOptionalResolutionSettings(extensions2, moduleName, containingDirectory, loader, state2);
     if (resolved) {
       return toSearchResult({ resolved, isExternalLibraryImport: pathContainsNodeModules(resolved.path) });
     }
     if (!isExternalModuleNameRelative(moduleName)) {
       let resolved2;
       if (features & 2 /* Imports */ && startsWith(moduleName, "#")) {
-        resolved2 = loadModuleFromImports(extensions2, moduleName, containingDirectory, state, cache, redirectedReference);
+        resolved2 = loadModuleFromImports(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
       }
       if (!resolved2 && features & 4 /* SelfName */) {
-        resolved2 = loadModuleFromSelfNameReference(extensions2, moduleName, containingDirectory, state, cache, redirectedReference);
+        resolved2 = loadModuleFromSelfNameReference(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
       }
       if (!resolved2) {
         if (traceEnabled) {
           trace(host, Diagnostics.Loading_module_0_from_node_modules_folder_target_file_types_Colon_1, moduleName, formatExtensions(extensions2));
         }
-        resolved2 = loadModuleFromNearestNodeModulesDirectory(extensions2, moduleName, containingDirectory, state, cache, redirectedReference);
+        resolved2 = loadModuleFromNearestNodeModulesDirectory(extensions2, moduleName, containingDirectory, state2, cache, redirectedReference);
       }
       if (!resolved2)
         return void 0;
@@ -36690,7 +36661,7 @@ function nodeModuleNameResolverWorker(features, moduleName, containingDirectory,
         candidate,
         /*onlyRecordFailures*/
         false,
-        state,
+        state2,
         /*considerPackageJson*/
         true
       );
@@ -37923,7 +37894,7 @@ function getModuleInstanceStateWorker(node, visited) {
     case 264 /* ModuleDeclaration */:
       return getModuleInstanceState(node, visited);
     case 79 /* Identifier */:
-      if (node.isInJSDocNamespace) {
+      if (node.flags & 2048 /* IdentifierIsInJSDocNamespace */) {
         return 0 /* NonInstantiated */;
       }
   }
@@ -38360,6 +38331,7 @@ function createBinder() {
     } else if (containerFlags & 64 /* IsInterface */) {
       seenThisKeyword = false;
       bindChildren(node);
+      Debug.assertNotNode(node, isIdentifier);
       node.flags = seenThisKeyword ? node.flags | 128 /* ContainsThis */ : node.flags & ~128 /* ContainsThis */;
     } else {
       bindChildren(node);
@@ -39519,13 +39491,14 @@ function createBinder() {
   }
   function checkContextualIdentifier(node) {
     if (!file.parseDiagnostics.length && !(node.flags & 16777216 /* Ambient */) && !(node.flags & 8388608 /* JSDoc */) && !isIdentifierName(node)) {
-      if (inStrictMode && node.originalKeywordKind >= 117 /* FirstFutureReservedWord */ && node.originalKeywordKind <= 125 /* LastFutureReservedWord */) {
+      const originalKeywordKind = identifierToKeywordKind(node);
+      if (inStrictMode && originalKeywordKind >= 117 /* FirstFutureReservedWord */ && originalKeywordKind <= 125 /* LastFutureReservedWord */) {
         file.bindDiagnostics.push(createDiagnosticForNode2(
           node,
           getStrictModeIdentifierMessage(node),
           declarationNameToString(node)
         ));
-      } else if (node.originalKeywordKind === 133 /* AwaitKeyword */) {
+      } else if (originalKeywordKind === 133 /* AwaitKeyword */) {
         if (isExternalModule(file) && isInTopLevelContext(node)) {
           file.bindDiagnostics.push(createDiagnosticForNode2(
             node,
@@ -39539,7 +39512,7 @@ function createBinder() {
             declarationNameToString(node)
           ));
         }
-      } else if (node.originalKeywordKind === 125 /* YieldKeyword */ && node.flags & 8192 /* YieldContext */) {
+      } else if (originalKeywordKind === 125 /* YieldKeyword */ && node.flags & 8192 /* YieldContext */) {
         file.bindDiagnostics.push(createDiagnosticForNode2(
           node,
           Diagnostics.Identifier_expected_0_is_a_reserved_word_that_cannot_be_used_here,
@@ -39751,7 +39724,7 @@ function createBinder() {
   function bindWorker(node) {
     switch (node.kind) {
       case 79 /* Identifier */:
-        if (node.isInJSDocNamespace) {
+        if (node.flags & 2048 /* IdentifierIsInJSDocNamespace */) {
           let parentNode = node.parent;
           while (parentNode && !isJSDocTypeAlias(parentNode)) {
             parentNode = parentNode.parent;
@@ -40575,8 +40548,12 @@ function createBinder() {
       return false;
     }
     if (currentFlow === unreachableFlow) {
-      const reportError = isStatementButNotDeclaration(node) && node.kind !== 239 /* EmptyStatement */ || // report error on class declarations
-      node.kind === 260 /* ClassDeclaration */ || node.kind === 264 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node);
+      const reportError = (
+        // report error on all statements except empty ones
+        isStatementButNotDeclaration(node) && node.kind !== 239 /* EmptyStatement */ || // report error on class declarations
+        node.kind === 260 /* ClassDeclaration */ || // report error on instantiated modules or const-enums only modules if preserveConstEnums is set
+        node.kind === 264 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node)
+      );
       if (reportError) {
         currentFlow = reportedUnreachableFlow;
         if (!options.allowUnreachableCode) {
@@ -44761,6 +44738,8 @@ function createTypeChecker(host) {
             /*isError*/
             false,
             errorNode,
+            currentSourceFile,
+            mode,
             resolvedModule,
             moduleReference
           );
@@ -44846,6 +44825,8 @@ function createTypeChecker(host) {
           /*isError*/
           noImplicitAny && !!moduleNotFoundError,
           errorNode,
+          currentSourceFile,
+          mode,
           resolvedModule,
           moduleReference
         );
@@ -44900,26 +44881,37 @@ function createTypeChecker(host) {
       return importSourceWithoutExtension;
     }
   }
-  function errorOnImplicitAnyModule(isError, errorNode, { packageId, resolvedFileName }, moduleReference) {
-    const errorInfo = !isExternalModuleNameRelative(moduleReference) && packageId ? typesPackageExists(packageId.name) ? chainDiagnosticMessages(
-      /*details*/
-      void 0,
-      Diagnostics.If_the_0_package_actually_exposes_this_module_consider_sending_a_pull_request_to_amend_https_Colon_Slash_Slashgithub_com_SlashDefinitelyTyped_SlashDefinitelyTyped_Slashtree_Slashmaster_Slashtypes_Slash_1,
-      packageId.name,
-      mangleScopedPackageName(packageId.name)
-    ) : packageBundlesTypes(packageId.name) ? chainDiagnosticMessages(
-      /*details*/
-      void 0,
-      Diagnostics.If_the_0_package_actually_exposes_this_module_try_adding_a_new_declaration_d_ts_file_containing_declare_module_1,
-      packageId.name,
-      moduleReference
-    ) : chainDiagnosticMessages(
-      /*details*/
-      void 0,
-      Diagnostics.Try_npm_i_save_dev_types_Slash_1_if_it_exists_or_add_a_new_declaration_d_ts_file_containing_declare_module_0,
-      moduleReference,
-      mangleScopedPackageName(packageId.name)
-    ) : void 0;
+  function errorOnImplicitAnyModule(isError, errorNode, sourceFile, mode, { packageId, resolvedFileName }, moduleReference) {
+    var _a2, _b;
+    let errorInfo;
+    if (!isExternalModuleNameRelative(moduleReference) && packageId) {
+      const node10Result = (_b = (_a2 = sourceFile.resolvedModules) == null ? void 0 : _a2.get(moduleReference, mode)) == null ? void 0 : _b.node10Result;
+      errorInfo = node10Result ? chainDiagnosticMessages(
+        /*details*/
+        void 0,
+        Diagnostics.There_are_types_at_0_but_this_result_could_not_be_resolved_when_respecting_package_json_exports_The_1_library_may_need_to_update_its_package_json_or_typings,
+        node10Result,
+        node10Result.indexOf(nodeModulesPathPart + "@types/") > -1 ? `@types/${mangleScopedPackageName(packageId.name)}` : packageId.name
+      ) : typesPackageExists(packageId.name) ? chainDiagnosticMessages(
+        /*details*/
+        void 0,
+        Diagnostics.If_the_0_package_actually_exposes_this_module_consider_sending_a_pull_request_to_amend_https_Colon_Slash_Slashgithub_com_SlashDefinitelyTyped_SlashDefinitelyTyped_Slashtree_Slashmaster_Slashtypes_Slash_1,
+        packageId.name,
+        mangleScopedPackageName(packageId.name)
+      ) : packageBundlesTypes(packageId.name) ? chainDiagnosticMessages(
+        /*details*/
+        void 0,
+        Diagnostics.If_the_0_package_actually_exposes_this_module_try_adding_a_new_declaration_d_ts_file_containing_declare_module_1,
+        packageId.name,
+        moduleReference
+      ) : chainDiagnosticMessages(
+        /*details*/
+        void 0,
+        Diagnostics.Try_npm_i_save_dev_types_Slash_1_if_it_exists_or_add_a_new_declaration_d_ts_file_containing_declare_module_0,
+        moduleReference,
+        mangleScopedPackageName(packageId.name)
+      );
+    }
     errorOrSuggestion(isError, errorNode, chainDiagnosticMessages(
       errorInfo,
       Diagnostics.Could_not_find_a_declaration_file_for_module_0_1_implicitly_has_an_any_type,
@@ -46382,7 +46374,8 @@ function createTypeChecker(host) {
           const isNonLocalFunctionSymbol = !!(symbol.flags & 16 /* Function */) && (symbol.parent || // is exported function symbol
           forEach(symbol.declarations, (declaration) => declaration.parent.kind === 308 /* SourceFile */ || declaration.parent.kind === 265 /* ModuleBlock */));
           if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
-            return (!!(context.flags & 4096 /* UseTypeOfFunction */) || ((_a4 = context.visitedTypes) == null ? void 0 : _a4.has(typeId))) && (!(context.flags & 8 /* UseStructuralFallback */) || isValueSymbolAccessible(symbol, context.enclosingDeclaration));
+            return (!!(context.flags & 4096 /* UseTypeOfFunction */) || ((_a4 = context.visitedTypes) == null ? void 0 : _a4.has(typeId))) && // it is type of the symbol uses itself recursively
+            (!(context.flags & 8 /* UseStructuralFallback */) || isValueSymbolAccessible(symbol, context.enclosingDeclaration));
           }
         }
       }
@@ -46474,7 +46467,9 @@ function createTypeChecker(host) {
         const abstractSignatures = filter(resolved.constructSignatures, (signature) => !!(signature.flags & 4 /* Abstract */));
         if (some(abstractSignatures)) {
           const types = map(abstractSignatures, getOrCreateTypeFromSignature);
-          const typeElementCount = resolved.callSignatures.length + (resolved.constructSignatures.length - abstractSignatures.length) + resolved.indexInfos.length + (context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */ ? countWhere(resolved.properties, (p) => !(p.flags & 4194304 /* Prototype */)) : length(resolved.properties));
+          const typeElementCount = resolved.callSignatures.length + (resolved.constructSignatures.length - abstractSignatures.length) + resolved.indexInfos.length + // exclude `prototype` when writing a class expression as a type literal, as per
+          // the logic in `createTypeNodesFromResolvedType`.
+          (context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */ ? countWhere(resolved.properties, (p) => !(p.flags & 4194304 /* Prototype */)) : length(resolved.properties));
           if (typeElementCount) {
             types.push(getResolvedTypeWithoutAbstractConstructSignatures(resolved));
           }
@@ -46573,13 +46568,17 @@ function createTypeChecker(host) {
           let qualifier = root.qualifier;
           if (qualifier) {
             if (isIdentifier(qualifier)) {
-              qualifier = factory.updateIdentifier(qualifier, typeArguments);
+              if (typeArguments !== getIdentifierTypeArguments(qualifier)) {
+                qualifier = setIdentifierTypeArguments(factory.cloneNode(qualifier), typeArguments);
+              }
             } else {
-              qualifier = factory.updateQualifiedName(
-                qualifier,
-                qualifier.left,
-                factory.updateIdentifier(qualifier.right, typeArguments)
-              );
+              if (typeArguments !== getIdentifierTypeArguments(qualifier.right)) {
+                qualifier = factory.updateQualifiedName(
+                  qualifier,
+                  qualifier.left,
+                  setIdentifierTypeArguments(factory.cloneNode(qualifier.right), typeArguments)
+                );
+              }
             }
           }
           typeArguments = ref.typeArguments;
@@ -46599,13 +46598,17 @@ function createTypeChecker(host) {
           let typeArguments = root.typeArguments;
           let typeName = root.typeName;
           if (isIdentifier(typeName)) {
-            typeName = factory.updateIdentifier(typeName, typeArguments);
+            if (typeArguments !== getIdentifierTypeArguments(typeName)) {
+              typeName = setIdentifierTypeArguments(factory.cloneNode(typeName), typeArguments);
+            }
           } else {
-            typeName = factory.updateQualifiedName(
-              typeName,
-              typeName.left,
-              factory.updateIdentifier(typeName.right, typeArguments)
-            );
+            if (typeArguments !== getIdentifierTypeArguments(typeName.right)) {
+              typeName = factory.updateQualifiedName(
+                typeName,
+                typeName.left,
+                setIdentifierTypeArguments(factory.cloneNode(typeName.right), typeArguments)
+              );
+            }
           }
           typeArguments = ref.typeArguments;
           const ids = getAccessStack(ref);
@@ -47136,9 +47139,11 @@ function createTypeChecker(host) {
         if (accessibleSymbolChain) {
           return accessibleSymbolChain;
         }
-        if (// If this is the last part of outputting the symbol, always output. The cases apply only to parent symbols.
-        endOfChain || // If a parent symbol is an anonymous type, don't write it.
-        !(symbol2.flags & (2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */))) {
+        if (
+          // If this is the last part of outputting the symbol, always output. The cases apply only to parent symbols.
+          endOfChain || // If a parent symbol is an anonymous type, don't write it.
+          !(symbol2.flags & (2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */))
+        ) {
           if (!endOfChain && !yieldModuleSymbol && !!forEach(symbol2.declarations, hasNonGlobalAugmentationExternalModuleSymbol)) {
             return;
           }
@@ -47317,7 +47322,11 @@ function createTypeChecker(host) {
         if (!nonRootParts || isEntityName(nonRootParts)) {
           if (nonRootParts) {
             const lastId = isIdentifier(nonRootParts) ? nonRootParts : nonRootParts.right;
-            lastId.typeArguments = void 0;
+            setIdentifierTypeArguments(
+              lastId,
+              /*typeArguments*/
+              void 0
+            );
           }
           return factory.createImportTypeNode(lit, assertion, nonRootParts, typeParameterNodes, isTypeOf);
         } else {
@@ -47334,8 +47343,12 @@ function createTypeChecker(host) {
         return factory.createTypeQueryNode(entityName);
       } else {
         const lastId = isIdentifier(entityName) ? entityName : entityName.right;
-        const lastTypeArgs = lastId.typeArguments;
-        lastId.typeArguments = void 0;
+        const lastTypeArgs = getIdentifierTypeArguments(lastId);
+        setIdentifierTypeArguments(
+          lastId,
+          /*typeArguments*/
+          void 0
+        );
         return factory.createTypeReferenceNode(entityName, lastTypeArgs);
       }
       function createAccessFromSymbolChain(chain2, index, stopper) {
@@ -47379,7 +47392,9 @@ function createTypeChecker(host) {
             return factory.createIndexedAccessTypeNode(factory.createTypeReferenceNode(LHS, typeParameterNodes), factory.createLiteralTypeNode(factory.createStringLiteral(symbolName2)));
           }
         }
-        const identifier = setEmitFlags(factory.createIdentifier(symbolName2, typeParameterNodes), 33554432 /* NoAsciiEscaping */);
+        const identifier = setEmitFlags(factory.createIdentifier(symbolName2), 33554432 /* NoAsciiEscaping */);
+        if (typeParameterNodes)
+          setIdentifierTypeArguments(identifier, factory.createNodeArray(typeParameterNodes));
         identifier.symbol = symbol2;
         if (index > stopper) {
           const LHS = createAccessFromSymbolChain(chain2, index - 1, stopper);
@@ -47437,7 +47452,9 @@ function createTypeChecker(host) {
           text = `${rawtext}_${i}`;
         }
         if (text !== rawtext) {
-          result = factory.createIdentifier(text, result.typeArguments);
+          const typeArguments = getIdentifierTypeArguments(result);
+          result = factory.createIdentifier(text);
+          setIdentifierTypeArguments(result, typeArguments);
         }
         (context.typeParameterNamesByTextNextNameCount || (context.typeParameterNamesByTextNextNameCount = /* @__PURE__ */ new Map())).set(rawtext, i);
         (context.typeParameterNames || (context.typeParameterNames = /* @__PURE__ */ new Map())).set(getTypeId(type), result);
@@ -47461,7 +47478,9 @@ function createTypeChecker(host) {
         if (index === 0) {
           context.flags ^= 16777216 /* InInitialEntityName */;
         }
-        const identifier = setEmitFlags(factory.createIdentifier(symbolName2, typeParameterNodes), 33554432 /* NoAsciiEscaping */);
+        const identifier = setEmitFlags(factory.createIdentifier(symbolName2), 33554432 /* NoAsciiEscaping */);
+        if (typeParameterNodes)
+          setIdentifierTypeArguments(identifier, factory.createNodeArray(typeParameterNodes));
         identifier.symbol = symbol2;
         return index > 0 ? factory.createQualifiedName(createEntityNameFromSymbolChain(chain2, index - 1), identifier) : identifier;
       }
@@ -47484,7 +47503,9 @@ function createTypeChecker(host) {
           return factory.createStringLiteral(getSpecifierForModuleSymbol(symbol2, context));
         }
         if (index === 0 || canUsePropertyAccess(symbolName2, languageVersion)) {
-          const identifier = setEmitFlags(factory.createIdentifier(symbolName2, typeParameterNodes), 33554432 /* NoAsciiEscaping */);
+          const identifier = setEmitFlags(factory.createIdentifier(symbolName2), 33554432 /* NoAsciiEscaping */);
+          if (typeParameterNodes)
+            setIdentifierTypeArguments(identifier, factory.createNodeArray(typeParameterNodes));
           identifier.symbol = symbol2;
           return index > 0 ? factory.createPropertyAccessExpression(createExpressionFromSymbolChain(chain2, index - 1), identifier) : identifier;
         } else {
@@ -47499,8 +47520,11 @@ function createTypeChecker(host) {
             expression = factory.createNumericLiteral(+symbolName2);
           }
           if (!expression) {
-            expression = setEmitFlags(factory.createIdentifier(symbolName2, typeParameterNodes), 33554432 /* NoAsciiEscaping */);
-            expression.symbol = symbol2;
+            const identifier = setEmitFlags(factory.createIdentifier(symbolName2), 33554432 /* NoAsciiEscaping */);
+            if (typeParameterNodes)
+              setIdentifierTypeArguments(identifier, factory.createNodeArray(typeParameterNodes));
+            identifier.symbol = symbol2;
+            expression = identifier;
           }
           return factory.createElementAccessExpression(createExpressionFromSymbolChain(chain2, index - 1), expression);
         }
@@ -47760,7 +47784,8 @@ function createTypeChecker(host) {
         }
         if (isLiteralImportTypeNode(node)) {
           const nodeSymbol = getNodeLinks(node).resolvedSymbol;
-          if (isInJSDoc(node) && nodeSymbol && (!node.isTypeOf && !(nodeSymbol.flags & 788968 /* Type */) || // The import type had type arguments autofilled by js fallback logic
+          if (isInJSDoc(node) && nodeSymbol && // The import type resolved using jsdoc fallback logic
+          (!node.isTypeOf && !(nodeSymbol.flags & 788968 /* Type */) || // The import type had type arguments autofilled by js fallback logic
           !(length(node.typeArguments) >= getMinTypeArgumentCount(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(nodeSymbol))))) {
             return setOriginalNode(typeToTypeNodeHelper(getTypeFromTypeNode(node), context), node);
           }
@@ -49277,8 +49302,10 @@ function createTypeChecker(host) {
     }
   }
   function getNameOfSymbolAsWritten(symbol, context) {
-    if (context && symbol.escapedName === "default" /* Default */ && !(context.flags & 16384 /* UseAliasDefinedOutsideCurrentScope */) && (!(context.flags & 16777216 /* InInitialEntityName */) || // if the symbol is synthesized, it will only be referenced externally it must print as `default`
-    !symbol.declarations || context.enclosingDeclaration && findAncestor(symbol.declarations[0], isDefaultBindingContext) !== findAncestor(context.enclosingDeclaration, isDefaultBindingContext))) {
+    if (context && symbol.escapedName === "default" /* Default */ && !(context.flags & 16384 /* UseAliasDefinedOutsideCurrentScope */) && // If it's not the first part of an entity name, it must print as `default`
+    (!(context.flags & 16777216 /* InInitialEntityName */) || // if the symbol is synthesized, it will only be referenced externally it must print as `default`
+    !symbol.declarations || // if not in the same binding context (source file, module declaration), it must print as `default`
+    context.enclosingDeclaration && findAncestor(symbol.declarations[0], isDefaultBindingContext) !== findAncestor(context.enclosingDeclaration, isDefaultBindingContext))) {
       return "default";
     }
     if (symbol.declarations && symbol.declarations.length) {
@@ -50605,7 +50632,10 @@ function createTypeChecker(host) {
   function getWriteTypeOfSymbol(symbol) {
     const checkFlags = getCheckFlags(symbol);
     if (symbol.flags & 4 /* Property */) {
-      return checkFlags & 2 /* SyntheticProperty */ ? checkFlags & 65536 /* DeferredType */ ? getWriteTypeOfSymbolWithDeferredType(symbol) || getTypeOfSymbolWithDeferredType(symbol) : symbol.links.writeType || symbol.links.type : getTypeOfSymbol(symbol);
+      return checkFlags & 2 /* SyntheticProperty */ ? checkFlags & 65536 /* DeferredType */ ? getWriteTypeOfSymbolWithDeferredType(symbol) || getTypeOfSymbolWithDeferredType(symbol) : (
+        // NOTE: cast to TransientSymbol should be safe because only TransientSymbols can have CheckFlags.SyntheticProperty
+        symbol.links.writeType || symbol.links.type
+      ) : getTypeOfSymbol(symbol);
     }
     if (symbol.flags & 98304 /* Accessor */) {
       return checkFlags & 1 /* Instantiated */ ? getWriteTypeOfInstantiatedSymbol(symbol) : getWriteTypeOfAccessors(symbol);
@@ -59022,7 +59052,11 @@ function createTypeChecker(host) {
         if (variances === emptyArray) {
           return 1 /* Unknown */;
         }
-        const varianceResult = relateVariances(source2.aliasTypeArguments, target2.aliasTypeArguments, variances, intersectionState);
+        const params = getSymbolLinks(source2.aliasSymbol).typeParameters;
+        const minParams = getMinTypeArgumentCount(params);
+        const sourceTypes = fillMissingTypeArguments(source2.aliasTypeArguments, params, minParams, isInJSFile(source2.aliasSymbol.valueDeclaration));
+        const targetTypes = fillMissingTypeArguments(target2.aliasTypeArguments, params, minParams, isInJSFile(source2.aliasSymbol.valueDeclaration));
+        const varianceResult = relateVariances(sourceTypes, targetTypes, variances, intersectionState);
         if (varianceResult !== void 0) {
           return varianceResult;
         }
@@ -61005,19 +61039,22 @@ function createTypeChecker(host) {
         break;
       case 166 /* Parameter */:
         const param = declaration;
-        if (isIdentifier(param.name) && (isCallSignatureDeclaration(param.parent) || isMethodSignature(param.parent) || isFunctionTypeNode(param.parent)) && param.parent.parameters.indexOf(param) > -1 && (resolveName(
-          param,
-          param.name.escapedText,
-          788968 /* Type */,
-          void 0,
-          param.name.escapedText,
-          /*isUse*/
-          true
-        ) || param.name.originalKeywordKind && isTypeNodeKind(param.name.originalKeywordKind))) {
-          const newName = "arg" + param.parent.parameters.indexOf(param);
-          const typeName = declarationNameToString(param.name) + (param.dotDotDotToken ? "[]" : "");
-          errorOrSuggestion(noImplicitAny, declaration, Diagnostics.Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1, newName, typeName);
-          return;
+        if (isIdentifier(param.name)) {
+          const originalKeywordKind = identifierToKeywordKind(param.name);
+          if ((isCallSignatureDeclaration(param.parent) || isMethodSignature(param.parent) || isFunctionTypeNode(param.parent)) && param.parent.parameters.indexOf(param) > -1 && (resolveName(
+            param,
+            param.name.escapedText,
+            788968 /* Type */,
+            void 0,
+            param.name.escapedText,
+            /*isUse*/
+            true
+          ) || originalKeywordKind && isTypeNodeKind(originalKeywordKind))) {
+            const newName = "arg" + param.parent.parameters.indexOf(param);
+            const typeName = declarationNameToString(param.name) + (param.dotDotDotToken ? "[]" : "");
+            errorOrSuggestion(noImplicitAny, declaration, Diagnostics.Parameter_has_a_name_but_no_type_Did_you_mean_0_Colon_1, newName, typeName);
+            return;
+          }
         }
         diagnostic = declaration.dotDotDotToken ? noImplicitAny ? Diagnostics.Rest_parameter_0_implicitly_has_an_any_type : Diagnostics.Rest_parameter_0_implicitly_has_an_any_type_but_a_better_type_may_be_inferred_from_usage : noImplicitAny ? Diagnostics.Parameter_0_implicitly_has_an_1_type : Diagnostics.Parameter_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage;
         break;
@@ -61205,6 +61242,10 @@ function createTypeChecker(host) {
   function isTypeParameterAtTopLevel(type, typeParameter) {
     return !!(type === typeParameter || type.flags & 3145728 /* UnionOrIntersection */ && some(type.types, (t) => isTypeParameterAtTopLevel(t, typeParameter)) || type.flags & 16777216 /* Conditional */ && (getTrueTypeFromConditionalType(type) === typeParameter || getFalseTypeFromConditionalType(type) === typeParameter));
   }
+  function isTypeParameterAtTopLevelInReturnType(signature, typeParameter) {
+    const typePredicate = getTypePredicateOfSignature(signature);
+    return typePredicate ? !!typePredicate.type && isTypeParameterAtTopLevel(typePredicate.type, typeParameter) : isTypeParameterAtTopLevel(getReturnTypeOfSignature(signature), typeParameter);
+  }
   function createEmptyObjectTypeFromStringLiteral(type) {
     const members = createSymbolTable();
     forEachType(type, (t) => {
@@ -61479,7 +61520,11 @@ function createTypeChecker(host) {
       }
       if (source.aliasSymbol && source.aliasSymbol === target.aliasSymbol) {
         if (source.aliasTypeArguments) {
-          inferFromTypeArguments(source.aliasTypeArguments, target.aliasTypeArguments, getAliasVariances(source.aliasSymbol));
+          const params = getSymbolLinks(source.aliasSymbol).typeParameters;
+          const minParams = getMinTypeArgumentCount(params);
+          const sourceTypes = fillMissingTypeArguments(source.aliasTypeArguments, params, minParams, isInJSFile(source.aliasSymbol.valueDeclaration));
+          const targetTypes = fillMissingTypeArguments(target.aliasTypeArguments, params, minParams, isInJSFile(source.aliasSymbol.valueDeclaration));
+          inferFromTypeArguments(sourceTypes, targetTypes, getAliasVariances(source.aliasSymbol));
         }
         return;
       }
@@ -62072,7 +62117,7 @@ function createTypeChecker(host) {
   function getCovariantInference(inference, signature) {
     const candidates = unionObjectAndArrayLiteralCandidates(inference.candidates);
     const primitiveConstraint = hasPrimitiveConstraint(inference.typeParameter) || isConstTypeVariable(inference.typeParameter);
-    const widenLiteralTypes = !primitiveConstraint && inference.topLevel && (inference.isFixed || !isTypeParameterAtTopLevel(getReturnTypeOfSignature(signature), inference.typeParameter));
+    const widenLiteralTypes = !primitiveConstraint && inference.topLevel && (inference.isFixed || !isTypeParameterAtTopLevelInReturnType(signature, inference.typeParameter));
     const baseCandidates = primitiveConstraint ? sameMap(candidates, getRegularTypeOfLiteralType) : widenLiteralTypes ? sameMap(candidates, getWidenedLiteralType) : candidates;
     const unwidenedType = inference.priority & 416 /* PriorityImpliesCombination */ ? getUnionType(baseCandidates, 2 /* Subtype */) : getCommonSupertype(baseCandidates);
     return getWidenedType(unwidenedType);
@@ -63886,18 +63931,20 @@ function createTypeChecker(host) {
       return narrowTypeByTypeFacts(type, nonPrimitiveType, 128 /* TypeofEQHostObject */);
     }
     function narrowTypeByTypeFacts(type, impliedType, facts) {
-      return mapType(type, (t) => // We first check if a constituent is a subtype of the implied type. If so, we either keep or eliminate
-      // the constituent based on its type facts. We use the strict subtype relation because it treats `object`
-      // as a subtype of `{}`, and we need the type facts check because function types are subtypes of `object`,
-      // but are classified as "function" according to `typeof`.
-      isTypeRelatedTo(t, impliedType, strictSubtypeRelation) ? getTypeFacts(t) & facts ? t : neverType : (
-        // We next check if the consituent is a supertype of the implied type. If so, we substitute the implied
-        // type. This handles top types like `unknown` and `{}`, and supertypes like `{ toString(): string }`.
-        isTypeSubtypeOf(impliedType, t) ? impliedType : (
-          // Neither the constituent nor the implied type is a subtype of the other, however their domains may still
-          // overlap. For example, an unconstrained type parameter and type `string`. If the type facts indicate
-          // possible overlap, we form an intersection. Otherwise, we eliminate the constituent.
-          getTypeFacts(t) & facts ? getIntersectionType([t, impliedType]) : neverType
+      return mapType(type, (t) => (
+        // We first check if a constituent is a subtype of the implied type. If so, we either keep or eliminate
+        // the constituent based on its type facts. We use the strict subtype relation because it treats `object`
+        // as a subtype of `{}`, and we need the type facts check because function types are subtypes of `object`,
+        // but are classified as "function" according to `typeof`.
+        isTypeRelatedTo(t, impliedType, strictSubtypeRelation) ? getTypeFacts(t) & facts ? t : neverType : (
+          // We next check if the consituent is a supertype of the implied type. If so, we substitute the implied
+          // type. This handles top types like `unknown` and `{}`, and supertypes like `{ toString(): string }`.
+          isTypeSubtypeOf(impliedType, t) ? impliedType : (
+            // Neither the constituent nor the implied type is a subtype of the other, however their domains may still
+            // overlap. For example, an unconstrained type parameter and type `string`. If the type facts indicate
+            // possible overlap, we form an intersection. Otherwise, we eliminate the constituent.
+            getTypeFacts(t) & facts ? getIntersectionType([t, impliedType]) : neverType
+          )
         )
       ));
     }
@@ -71468,7 +71515,8 @@ function createTypeChecker(host) {
       }
     }
     function isIndirectCall(node) {
-      return node.parent.kind === 214 /* ParenthesizedExpression */ && isNumericLiteral(node.left) && node.left.text === "0" && (isCallExpression(node.parent.parent) && node.parent.parent.expression === node.parent || node.parent.parent.kind === 212 /* TaggedTemplateExpression */) && (isAccessExpression(node.right) || isIdentifier(node.right) && node.right.escapedText === "eval");
+      return node.parent.kind === 214 /* ParenthesizedExpression */ && isNumericLiteral(node.left) && node.left.text === "0" && (isCallExpression(node.parent.parent) && node.parent.parent.expression === node.parent || node.parent.parent.kind === 212 /* TaggedTemplateExpression */) && // special-case for "eval" because it's the only non-access case where an indirect call actually affects behavior.
+      (isAccessExpression(node.right) || isIdentifier(node.right) && node.right.escapedText === "eval");
     }
     function checkForDisallowedESSymbolOperand(operator2) {
       const offendingSymbolOperand = maybeTypeOfKindConsideringBaseConstraint(leftType, 12288 /* ESSymbolLike */) ? left : maybeTypeOfKindConsideringBaseConstraint(rightType, 12288 /* ESSymbolLike */) ? right : void 0;
@@ -72798,8 +72846,11 @@ function createTypeChecker(host) {
   }
   function checkTypeReferenceNode(node) {
     checkGrammarTypeArguments(node, node.typeArguments);
-    if (node.kind === 180 /* TypeReference */ && node.typeName.jsdocDotPos !== void 0 && !isInJSFile(node) && !isInJSDoc(node)) {
-      grammarErrorAtPos(node, node.typeName.jsdocDotPos, 1, Diagnostics.JSDoc_types_can_only_be_used_inside_documentation_comments);
+    if (node.kind === 180 /* TypeReference */ && !isInJSFile(node) && !isInJSDoc(node) && node.typeArguments && node.typeName.end !== node.typeArguments.pos) {
+      const sourceFile = getSourceFileOfNode(node);
+      if (scanTokenAtPosition(sourceFile, node.typeName.end) === 24 /* DotToken */) {
+        grammarErrorAtPos(node, skipTrivia(sourceFile.text, node.typeName.end), 1, Diagnostics.JSDoc_types_can_only_be_used_inside_documentation_comments);
+      }
     }
     forEach(node.typeArguments, checkSourceElement);
     const type = getTypeFromTypeReference(node);
@@ -78408,8 +78459,9 @@ function createTypeChecker(host) {
     }
   }
   function getReferencedImportDeclaration(nodeIn) {
-    if (nodeIn.generatedImportReference) {
-      return nodeIn.generatedImportReference;
+    const specifier = getIdentifierGeneratedImportReference(nodeIn);
+    if (specifier) {
+      return specifier;
     }
     const node = getParseTreeNode(nodeIn, isIdentifier);
     if (node) {
@@ -78553,7 +78605,12 @@ function createTypeChecker(host) {
         return false;
       const symbol = getSymbolOfDeclaration(node);
       const signaturesOfSymbol = getSignaturesOfSymbol(symbol);
-      return signaturesOfSymbol.length > 1 || signaturesOfSymbol.length === 1 && signaturesOfSymbol[0].declaration !== node;
+      return signaturesOfSymbol.length > 1 || // If there is single signature for the symbol, it is overload if that signature isn't coming from the node
+      // e.g.: function foo(a: string): string;
+      //       function foo(a: any) { // This is implementation of the overloads
+      //           return a;
+      //       }
+      signaturesOfSymbol.length === 1 && signaturesOfSymbol[0].declaration !== node;
     }
     return false;
   }
@@ -80382,7 +80439,7 @@ function createTypeChecker(host) {
   }
   function checkGrammarNameInLetOrConstDeclarations(name) {
     if (name.kind === 79 /* Identifier */) {
-      if (name.originalKeywordKind === 119 /* LetKeyword */) {
+      if (name.escapedText === "let") {
         return grammarErrorOnNode(name, Diagnostics.let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations);
       }
     } else {
@@ -81186,12 +81243,6 @@ function visitEachChild(node, visitor, context, nodesVisitor = visitNodes2, toke
   return fn === void 0 ? node : fn(node, visitor, context, nodesVisitor, nodeVisitor, tokenVisitor);
 }
 var visitEachChildTable = {
-  [79 /* Identifier */]: function visitEachChildOfIdentifier(node, visitor, context, nodesVisitor, _nodeVisitor, _tokenVisitor) {
-    return context.factory.updateIdentifier(
-      node,
-      nodesVisitor(node.typeArguments, visitor, isTypeNodeOrTypeParameterDeclaration)
-    );
-  },
   [163 /* QualifiedName */]: function visitEachChildOfQualifiedName(node, visitor, context, _nodesVisitor, nodeVisitor, _tokenVisitor) {
     return context.factory.updateQualifiedName(
       node,
@@ -86227,7 +86278,7 @@ function transformClassFields(context) {
         if (isClassWithConstructorReference) {
           enableSubstitutionForClassAliases();
           const alias = factory2.cloneNode(temp);
-          alias.autoGenerate.flags &= ~8 /* ReservedInNestedScopes */;
+          alias.emitNode.autoGenerate.flags &= ~8 /* ReservedInNestedScopes */;
           classAliases[getOriginalNodeId(node)] = alias;
         }
         setEmitFlags(classExpression, 131072 /* Indented */ | getEmitFlags(classExpression));
@@ -90363,7 +90414,7 @@ function transformJsx(context) {
       factory2.createIdentifier(name),
       generatedName
     );
-    generatedName.generatedImportReference = specifier;
+    setIdentifierGeneratedImportReference(generatedName, specifier);
     specifierSourceImports.set(name, specifier);
     return generatedName;
   }
@@ -91506,7 +91557,7 @@ function transformES2015(context) {
         return convertedLoopState.argumentsName || (convertedLoopState.argumentsName = factory2.createUniqueName("arguments"));
       }
     }
-    if (node.hasExtendedUnicodeEscape) {
+    if (node.flags & 128 /* IdentifierHasExtendedUnicodeEscape */) {
       return setOriginalNode(setTextRange(
         factory2.createIdentifier(unescapeLeadingUnderscores(node.escapedText)),
         node
@@ -94387,7 +94438,7 @@ function transformES5(context) {
     return node;
   }
   function trySubstituteReservedName(name) {
-    const token = name.originalKeywordKind || (nodeIsSynthesized(name) ? stringToToken(idText(name)) : void 0);
+    const token = identifierToKeywordKind(name);
     if (token !== void 0 && token >= 81 /* FirstReservedWord */ && token <= 116 /* LastReservedWord */) {
       return setTextRange(factory2.createStringLiteralFromNode(name), name);
     }
@@ -98055,7 +98106,7 @@ function transformModule(context) {
         return factory2.createPropertyAccessExpression(externalHelpersModuleName, node);
       }
       return node;
-    } else if (!(isGeneratedIdentifier(node) && !(node.autoGenerate.flags & 64 /* AllowNameSubstitution */)) && !isLocalName(node)) {
+    } else if (!(isGeneratedIdentifier(node) && !(node.emitNode.autoGenerate.flags & 64 /* AllowNameSubstitution */)) && !isLocalName(node)) {
       const exportContainer = resolver.getReferencedExportContainer(node, isExportName(node));
       if (exportContainer && exportContainer.kind === 308 /* SourceFile */) {
         return setTextRange(
@@ -104008,7 +104059,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
       /*includeTrivia*/
       false
     ), node.symbol);
-    emitList(node, node.typeArguments, 53776 /* TypeParameters */);
+    emitList(node, getIdentifierTypeArguments(node), 53776 /* TypeParameters */);
   }
   function emitPrivateIdentifier(node) {
     write(getTextOfNode2(
@@ -106726,10 +106777,11 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     }
   }
   function generateName(name) {
-    if ((name.autoGenerate.flags & 7 /* KindMask */) === 4 /* Node */) {
-      return generateNameCached(getNodeForGeneratedName(name), isPrivateIdentifier(name), name.autoGenerate.flags, name.autoGenerate.prefix, name.autoGenerate.suffix);
+    const autoGenerate = name.emitNode.autoGenerate;
+    if ((autoGenerate.flags & 7 /* KindMask */) === 4 /* Node */) {
+      return generateNameCached(getNodeForGeneratedName(name), isPrivateIdentifier(name), autoGenerate.flags, autoGenerate.prefix, autoGenerate.suffix);
     } else {
-      const autoGenerateId = name.autoGenerate.id;
+      const autoGenerateId = autoGenerate.id;
       return autoGeneratedIdToGeneratedName[autoGenerateId] || (autoGeneratedIdToGeneratedName[autoGenerateId] = makeName(name));
     }
   }
@@ -107009,16 +107061,17 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     }
   }
   function makeName(name) {
-    const prefix = formatGeneratedNamePart(name.autoGenerate.prefix, generateName);
-    const suffix = formatGeneratedNamePart(name.autoGenerate.suffix);
-    switch (name.autoGenerate.flags & 7 /* KindMask */) {
+    const autoGenerate = name.emitNode.autoGenerate;
+    const prefix = formatGeneratedNamePart(autoGenerate.prefix, generateName);
+    const suffix = formatGeneratedNamePart(autoGenerate.suffix);
+    switch (autoGenerate.flags & 7 /* KindMask */) {
       case 1 /* Auto */:
-        return makeTempVariableName(TempFlags.Auto, !!(name.autoGenerate.flags & 8 /* ReservedInNestedScopes */), isPrivateIdentifier(name), prefix, suffix);
+        return makeTempVariableName(TempFlags.Auto, !!(autoGenerate.flags & 8 /* ReservedInNestedScopes */), isPrivateIdentifier(name), prefix, suffix);
       case 2 /* Loop */:
         Debug.assertNode(name, isIdentifier);
         return makeTempVariableName(
           TempFlags._i,
-          !!(name.autoGenerate.flags & 8 /* ReservedInNestedScopes */),
+          !!(autoGenerate.flags & 8 /* ReservedInNestedScopes */),
           /*privateName*/
           false,
           prefix,
@@ -107027,16 +107080,16 @@ function createPrinter(printerOptions = {}, handlers = {}) {
       case 3 /* Unique */:
         return makeUniqueName(
           idText(name),
-          name.autoGenerate.flags & 32 /* FileLevel */ ? isFileLevelUniqueName2 : isUniqueName,
-          !!(name.autoGenerate.flags & 16 /* Optimistic */),
-          !!(name.autoGenerate.flags & 8 /* ReservedInNestedScopes */),
+          autoGenerate.flags & 32 /* FileLevel */ ? isFileLevelUniqueName2 : isUniqueName,
+          !!(autoGenerate.flags & 16 /* Optimistic */),
+          !!(autoGenerate.flags & 8 /* ReservedInNestedScopes */),
           isPrivateIdentifier(name),
           prefix,
           suffix
         );
     }
     return Debug.fail(`Unsupported GeneratedIdentifierKind: ${Debug.formatEnum(
-      name.autoGenerate.flags & 7 /* KindMask */,
+      autoGenerate.flags & 7 /* KindMask */,
       GeneratedIdentifierFlags,
       /*isFlags*/
       true
@@ -108966,7 +109019,8 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     const oldSourceFiles = oldProgram.getSourceFiles();
     for (const oldSourceFile of oldSourceFiles) {
       const newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
-      if (shouldCreateNewSourceFile || !newFile || newFile.impliedNodeFormat !== oldSourceFile.impliedNodeFormat || oldSourceFile.resolvedPath === oldSourceFile.path && newFile.resolvedPath !== oldSourceFile.path) {
+      if (shouldCreateNewSourceFile || !newFile || newFile.impliedNodeFormat !== oldSourceFile.impliedNodeFormat || // old file wasn't redirect but new file is
+      oldSourceFile.resolvedPath === oldSourceFile.path && newFile.resolvedPath !== oldSourceFile.path) {
         host.onReleaseOldSourceFile(oldSourceFile, oldProgram.getCompilerOptions(), !!getSourceFileByPath(oldSourceFile.path));
       }
     }
@@ -113662,7 +113716,8 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       const name = loader.nameAndMode.getName(entry);
       const mode = loader.nameAndMode.getMode(entry, containingSourceFile);
       let resolution = resolutionsInFile.get(name, mode);
-      if (!seenNamesInFile.has(name, mode) && unmatchedRedirects || !resolution || resolution.isInvalidated || hasInvalidatedNonRelativeUnresolvedImport && !isExternalModuleNameRelative(name) && shouldRetryResolution(resolution)) {
+      if (!seenNamesInFile.has(name, mode) && unmatchedRedirects || !resolution || resolution.isInvalidated || // If the name is unresolved import that was invalidated, recalculate
+      hasInvalidatedNonRelativeUnresolvedImport && !isExternalModuleNameRelative(name) && shouldRetryResolution(resolution)) {
         const existingResolution = resolution;
         resolution = loader.resolve(name, mode);
         if (resolutionHost.onDiscoveredSymlink && resolutionIsSymlink(resolution)) {