@typescript-deploys/pr-build 5.5.0-pr-57403-34 → 5.5.0-pr-57207-16

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-insiders.20240305`;
+var version = `${versionMajorMinor}.0-insiders.20240307`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -3340,12 +3340,13 @@ var SyntaxKind = /* @__PURE__ */ ((SyntaxKind4) => {
   SyntaxKind4[SyntaxKind4["JSDocPropertyTag"] = 348] = "JSDocPropertyTag";
   SyntaxKind4[SyntaxKind4["JSDocThrowsTag"] = 349] = "JSDocThrowsTag";
   SyntaxKind4[SyntaxKind4["JSDocSatisfiesTag"] = 350] = "JSDocSatisfiesTag";
-  SyntaxKind4[SyntaxKind4["SyntaxList"] = 351] = "SyntaxList";
-  SyntaxKind4[SyntaxKind4["NotEmittedStatement"] = 352] = "NotEmittedStatement";
-  SyntaxKind4[SyntaxKind4["PartiallyEmittedExpression"] = 353] = "PartiallyEmittedExpression";
-  SyntaxKind4[SyntaxKind4["CommaListExpression"] = 354] = "CommaListExpression";
-  SyntaxKind4[SyntaxKind4["SyntheticReferenceExpression"] = 355] = "SyntheticReferenceExpression";
-  SyntaxKind4[SyntaxKind4["Count"] = 356] = "Count";
+  SyntaxKind4[SyntaxKind4["JSDocImportTag"] = 351] = "JSDocImportTag";
+  SyntaxKind4[SyntaxKind4["SyntaxList"] = 352] = "SyntaxList";
+  SyntaxKind4[SyntaxKind4["NotEmittedStatement"] = 353] = "NotEmittedStatement";
+  SyntaxKind4[SyntaxKind4["PartiallyEmittedExpression"] = 354] = "PartiallyEmittedExpression";
+  SyntaxKind4[SyntaxKind4["CommaListExpression"] = 355] = "CommaListExpression";
+  SyntaxKind4[SyntaxKind4["SyntheticReferenceExpression"] = 356] = "SyntheticReferenceExpression";
+  SyntaxKind4[SyntaxKind4["Count"] = 357] = "Count";
   SyntaxKind4[SyntaxKind4["FirstAssignment"] = 64 /* EqualsToken */] = "FirstAssignment";
   SyntaxKind4[SyntaxKind4["LastAssignment"] = 79 /* CaretEqualsToken */] = "LastAssignment";
   SyntaxKind4[SyntaxKind4["FirstCompoundAssignment"] = 65 /* PlusEqualsToken */] = "FirstCompoundAssignment";
@@ -3374,9 +3375,9 @@ var SyntaxKind = /* @__PURE__ */ ((SyntaxKind4) => {
   SyntaxKind4[SyntaxKind4["LastStatement"] = 259 /* DebuggerStatement */] = "LastStatement";
   SyntaxKind4[SyntaxKind4["FirstNode"] = 166 /* QualifiedName */] = "FirstNode";
   SyntaxKind4[SyntaxKind4["FirstJSDocNode"] = 309 /* JSDocTypeExpression */] = "FirstJSDocNode";
-  SyntaxKind4[SyntaxKind4["LastJSDocNode"] = 350 /* JSDocSatisfiesTag */] = "LastJSDocNode";
+  SyntaxKind4[SyntaxKind4["LastJSDocNode"] = 351 /* JSDocImportTag */] = "LastJSDocNode";
   SyntaxKind4[SyntaxKind4["FirstJSDocTagNode"] = 327 /* JSDocTag */] = "FirstJSDocTagNode";
-  SyntaxKind4[SyntaxKind4["LastJSDocTagNode"] = 350 /* JSDocSatisfiesTag */] = "LastJSDocTagNode";
+  SyntaxKind4[SyntaxKind4["LastJSDocTagNode"] = 351 /* JSDocImportTag */] = "LastJSDocTagNode";
   SyntaxKind4[SyntaxKind4["FirstContextualKeyword"] = 128 /* AbstractKeyword */] = "FirstContextualKeyword";
   SyntaxKind4[SyntaxKind4["LastContextualKeyword"] = 165 /* OfKeyword */] = "LastContextualKeyword";
   return SyntaxKind4;
@@ -3692,7 +3693,6 @@ var ObjectFlags = /* @__PURE__ */ ((ObjectFlags3) => {
   ObjectFlags3[ObjectFlags3["ContainsSpread"] = 2097152] = "ContainsSpread";
   ObjectFlags3[ObjectFlags3["ObjectRestType"] = 4194304] = "ObjectRestType";
   ObjectFlags3[ObjectFlags3["InstantiationExpressionType"] = 8388608] = "InstantiationExpressionType";
-  ObjectFlags3[ObjectFlags3["SingleSignatureType"] = 134217728] = "SingleSignatureType";
   ObjectFlags3[ObjectFlags3["IsClassInstanceClone"] = 16777216] = "IsClassInstanceClone";
   ObjectFlags3[ObjectFlags3["IdenticalBaseTypeCalculated"] = 33554432] = "IdenticalBaseTypeCalculated";
   ObjectFlags3[ObjectFlags3["IdenticalBaseTypeExists"] = 67108864] = "IdenticalBaseTypeExists";
@@ -7555,6 +7555,7 @@ var Diagnostics = {
   Update_import_from_0: diag(90058, 3 /* Message */, "Update_import_from_0_90058", 'Update import from "{0}"'),
   Export_0_from_module_1: diag(90059, 3 /* Message */, "Export_0_from_module_1_90059", "Export '{0}' from module '{1}'"),
   Export_all_referenced_locals: diag(90060, 3 /* Message */, "Export_all_referenced_locals_90060", "Export all referenced locals"),
+  Update_modifiers_of_0: diag(90061, 3 /* Message */, "Update_modifiers_of_0_90061", "Update modifiers of '{0}'"),
   Convert_function_to_an_ES2015_class: diag(95001, 3 /* Message */, "Convert_function_to_an_ES2015_class_95001", "Convert function to an ES2015 class"),
   Convert_0_to_1_in_0: diag(95003, 3 /* Message */, "Convert_0_to_1_in_0_95003", "Convert '{0}' to '{1} in {0}'"),
   Extract_to_0_in_1: diag(95004, 3 /* Message */, "Extract_to_0_in_1_95004", "Extract to {0} in {1}"),
@@ -8436,7 +8437,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
   var tokenValue;
   var tokenFlags;
   var commentDirectives;
-  var inJSDocType = 0;
+  var skipJsDocLeadingAsterisks = 0;
   var scriptKind = 0 /* Unknown */;
   var jsDocParsingMode = 0 /* ParseAll */;
   setText(text, start, length2);
@@ -8487,7 +8488,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
     setOnError,
     resetTokenState,
     setTextPos: resetTokenState,
-    setInJSDocType,
+    setSkipJsDocLeadingAsterisks,
     tryScan,
     lookAhead,
     scanRange
@@ -9203,7 +9204,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
             return pos += 2, token = 43 /* AsteriskAsteriskToken */;
           }
           pos++;
-          if (inJSDocType && !asteriskSeen && tokenFlags & 1 /* PrecedingLineBreak */) {
+          if (skipJsDocLeadingAsterisks && !asteriskSeen && tokenFlags & 1 /* PrecedingLineBreak */) {
             asteriskSeen = true;
             continue;
           }
@@ -9981,8 +9982,8 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
     tokenValue = void 0;
     tokenFlags = 0 /* None */;
   }
-  function setInJSDocType(inType) {
-    inJSDocType += inType ? 1 : -1;
+  function setSkipJsDocLeadingAsterisks(skip) {
+    skipJsDocLeadingAsterisks += skip ? 1 : -1;
   }
 }
 function codePointAt(s, i) {
@@ -11035,8 +11036,8 @@ function isExpressionKind(kind) {
     case 230 /* SpreadElement */:
     case 234 /* AsExpression */:
     case 232 /* OmittedExpression */:
-    case 354 /* CommaListExpression */:
-    case 353 /* PartiallyEmittedExpression */:
+    case 355 /* CommaListExpression */:
+    case 354 /* PartiallyEmittedExpression */:
     case 238 /* SatisfiesExpression */:
       return true;
     default:
@@ -11207,7 +11208,7 @@ function isDeclarationStatementKind(kind) {
   return kind === 262 /* FunctionDeclaration */ || kind === 282 /* MissingDeclaration */ || kind === 263 /* ClassDeclaration */ || kind === 264 /* InterfaceDeclaration */ || kind === 265 /* TypeAliasDeclaration */ || kind === 266 /* EnumDeclaration */ || kind === 267 /* ModuleDeclaration */ || kind === 272 /* ImportDeclaration */ || kind === 271 /* ImportEqualsDeclaration */ || kind === 278 /* ExportDeclaration */ || kind === 277 /* ExportAssignment */ || kind === 270 /* NamespaceExportDeclaration */;
 }
 function isStatementKindButNotDeclarationKind(kind) {
-  return kind === 252 /* BreakStatement */ || kind === 251 /* ContinueStatement */ || kind === 259 /* DebuggerStatement */ || kind === 246 /* DoStatement */ || kind === 244 /* ExpressionStatement */ || kind === 242 /* EmptyStatement */ || kind === 249 /* ForInStatement */ || kind === 250 /* ForOfStatement */ || kind === 248 /* ForStatement */ || kind === 245 /* IfStatement */ || kind === 256 /* LabeledStatement */ || kind === 253 /* ReturnStatement */ || kind === 255 /* SwitchStatement */ || kind === 257 /* ThrowStatement */ || kind === 258 /* TryStatement */ || kind === 243 /* VariableStatement */ || kind === 247 /* WhileStatement */ || kind === 254 /* WithStatement */ || kind === 352 /* NotEmittedStatement */;
+  return kind === 252 /* BreakStatement */ || kind === 251 /* ContinueStatement */ || kind === 259 /* DebuggerStatement */ || kind === 246 /* DoStatement */ || kind === 244 /* ExpressionStatement */ || kind === 242 /* EmptyStatement */ || kind === 249 /* ForInStatement */ || kind === 250 /* ForOfStatement */ || kind === 248 /* ForStatement */ || kind === 245 /* IfStatement */ || kind === 256 /* LabeledStatement */ || kind === 253 /* ReturnStatement */ || kind === 255 /* SwitchStatement */ || kind === 257 /* ThrowStatement */ || kind === 258 /* TryStatement */ || kind === 243 /* VariableStatement */ || kind === 247 /* WhileStatement */ || kind === 254 /* WithStatement */ || kind === 353 /* NotEmittedStatement */;
 }
 function isDeclaration(node) {
   if (node.kind === 168 /* TypeParameter */) {
@@ -11268,10 +11269,10 @@ function isCaseOrDefaultClause(node) {
   return kind === 296 /* CaseClause */ || kind === 297 /* DefaultClause */;
 }
 function isJSDocNode(node) {
-  return node.kind >= 309 /* FirstJSDocNode */ && node.kind <= 350 /* LastJSDocNode */;
+  return node.kind >= 309 /* FirstJSDocNode */ && node.kind <= 351 /* LastJSDocNode */;
 }
 function isJSDocTag(node) {
-  return node.kind >= 327 /* FirstJSDocTagNode */ && node.kind <= 350 /* LastJSDocTagNode */;
+  return node.kind >= 327 /* FirstJSDocTagNode */ && node.kind <= 351 /* LastJSDocTagNode */;
 }
 function isSetAccessor(node) {
   return node.kind === 178 /* SetAccessor */;
@@ -11712,7 +11713,7 @@ function getTokenPosOfNode(node, sourceFile, includeJsDoc) {
   if (includeJsDoc && hasJSDocNodes(node)) {
     return getTokenPosOfNode(node.jsDoc[0], sourceFile);
   }
-  if (node.kind === 351 /* SyntaxList */ && node._children.length > 0) {
+  if (node.kind === 352 /* SyntaxList */ && node._children.length > 0) {
     return getTokenPosOfNode(node._children[0], sourceFile, includeJsDoc);
   }
   return skipTrivia(
@@ -13663,6 +13664,7 @@ function tryGetModuleSpecifierFromDeclaration(node) {
       ))) == null ? void 0 : _a.arguments[0];
     case 272 /* ImportDeclaration */:
     case 278 /* ExportDeclaration */:
+    case 351 /* JSDocImportTag */:
       return tryCast(node.moduleSpecifier, isStringLiteralLike);
     case 271 /* ImportEqualsDeclaration */:
       return tryCast((_b = tryCast(node.moduleReference, isExternalModuleReference)) == null ? void 0 : _b.expression, isStringLiteralLike);
@@ -13684,6 +13686,7 @@ function getExternalModuleName(node) {
   switch (node.kind) {
     case 272 /* ImportDeclaration */:
     case 278 /* ExportDeclaration */:
+    case 351 /* JSDocImportTag */:
       return node.moduleSpecifier;
     case 271 /* ImportEqualsDeclaration */:
       return node.moduleReference.kind === 283 /* ExternalModuleReference */ ? node.moduleReference.expression : void 0;
@@ -13710,7 +13713,7 @@ function getNamespaceDeclarationNode(node) {
   }
 }
 function isDefaultImport(node) {
-  return node.kind === 272 /* ImportDeclaration */ && !!node.importClause && !!node.importClause.name;
+  return (node.kind === 272 /* ImportDeclaration */ || node.kind === 351 /* JSDocImportTag */) && !!node.importClause && !!node.importClause.name;
 }
 function hasQuestionToken(node) {
   if (node) {
@@ -14483,7 +14486,7 @@ function getOperator(expression) {
 }
 function getOperatorPrecedence(nodeKind, operatorKind, hasArguments) {
   switch (nodeKind) {
-    case 354 /* CommaListExpression */:
+    case 355 /* CommaListExpression */:
       return 0 /* Comma */;
     case 230 /* SpreadElement */:
       return 1 /* Spread */;
@@ -16032,7 +16035,7 @@ function getLeftmostExpression(node, stopAtCallExpressions) {
       case 212 /* ElementAccessExpression */:
       case 211 /* PropertyAccessExpression */:
       case 235 /* NonNullExpression */:
-      case 353 /* PartiallyEmittedExpression */:
+      case 354 /* PartiallyEmittedExpression */:
       case 238 /* SatisfiesExpression */:
         node = node.expression;
         continue;
@@ -17419,7 +17422,7 @@ function getContainingNodeArray(node) {
       return parent.types;
     case 189 /* TupleType */:
     case 209 /* ArrayLiteralExpression */:
-    case 354 /* CommaListExpression */:
+    case 355 /* CommaListExpression */:
     case 275 /* NamedImports */:
     case 279 /* NamedExports */:
       return parent.elements;
@@ -18604,6 +18607,8 @@ function createNodeFactory(flags, baseFactory2) {
     updateJSDocImplementsTag,
     createJSDocSeeTag,
     updateJSDocSeeTag,
+    createJSDocImportTag,
+    updateJSDocImportTag,
     createJSDocNameReference,
     updateJSDocNameReference,
     createJSDocMemberName,
@@ -21376,6 +21381,17 @@ function createNodeFactory(flags, baseFactory2) {
   function updateJSDocEnumTag(node, tagName = getDefaultTagName(node), typeExpression, comment) {
     return node.tagName !== tagName || node.typeExpression !== typeExpression || node.comment !== comment ? update(createJSDocEnumTag(tagName, typeExpression, comment), node) : node;
   }
+  function createJSDocImportTag(tagName, importClause, moduleSpecifier, attributes, comment) {
+    const node = createBaseJSDocTag(351 /* JSDocImportTag */, tagName ?? createIdentifier("import"), comment);
+    node.importClause = importClause;
+    node.moduleSpecifier = moduleSpecifier;
+    node.attributes = attributes;
+    node.comment = comment;
+    return node;
+  }
+  function updateJSDocImportTag(node, tagName, importClause, moduleSpecifier, attributes, comment) {
+    return node.tagName !== tagName || node.comment !== comment || node.importClause !== importClause || node.moduleSpecifier !== moduleSpecifier || node.attributes !== attributes ? update(createJSDocImportTag(tagName, importClause, moduleSpecifier, attributes, comment), node) : node;
+  }
   function createJSDocText(text) {
     const node = createBaseNode(321 /* JSDocText */);
     node.text = text;
@@ -21773,18 +21789,18 @@ function createNodeFactory(flags, baseFactory2) {
     return node;
   }
   function createSyntaxList(children) {
-    const node = createBaseNode(351 /* SyntaxList */);
+    const node = createBaseNode(352 /* SyntaxList */);
     node._children = children;
     return node;
   }
   function createNotEmittedStatement(original) {
-    const node = createBaseNode(352 /* NotEmittedStatement */);
+    const node = createBaseNode(353 /* NotEmittedStatement */);
     node.original = original;
     setTextRange(node, original);
     return node;
   }
   function createPartiallyEmittedExpression(expression, original) {
-    const node = createBaseNode(353 /* PartiallyEmittedExpression */);
+    const node = createBaseNode(354 /* PartiallyEmittedExpression */);
     node.expression = expression;
     node.original = original;
     node.transformFlags |= propagateChildFlags(node.expression) | 1 /* ContainsTypeScript */;
@@ -21806,7 +21822,7 @@ function createNodeFactory(flags, baseFactory2) {
     return node;
   }
   function createCommaListExpression(elements) {
-    const node = createBaseNode(354 /* CommaListExpression */);
+    const node = createBaseNode(355 /* CommaListExpression */);
     node.elements = createNodeArray(sameFlatMap(elements, flattenCommaElements));
     node.transformFlags |= propagateChildrenFlags(node.elements);
     return node;
@@ -21815,7 +21831,7 @@ function createNodeFactory(flags, baseFactory2) {
     return node.elements !== elements ? update(createCommaListExpression(elements), node) : node;
   }
   function createSyntheticReferenceExpression(expression, thisArg) {
-    const node = createBaseNode(355 /* SyntheticReferenceExpression */);
+    const node = createBaseNode(356 /* SyntheticReferenceExpression */);
     node.expression = expression;
     node.thisArg = thisArg;
     node.transformFlags |= propagateChildFlags(node.expression) | propagateChildFlags(node.thisArg);
@@ -22061,7 +22077,7 @@ function createNodeFactory(flags, baseFactory2) {
         return updateSatisfiesExpression(outerExpression, expression, outerExpression.type);
       case 235 /* NonNullExpression */:
         return updateNonNullExpression(outerExpression, expression);
-      case 353 /* PartiallyEmittedExpression */:
+      case 354 /* PartiallyEmittedExpression */:
         return updatePartiallyEmittedExpression(outerExpression, expression);
     }
   }
@@ -22471,6 +22487,8 @@ function getDefaultTagNameForKind(kind) {
       return "augments";
     case 329 /* JSDocImplementsTag */:
       return "implements";
+    case 351 /* JSDocImportTag */:
+      return "import";
     default:
       return Debug.fail(`Unsupported kind: ${Debug.formatSyntaxKind(kind)}`);
   }
@@ -22611,7 +22629,7 @@ function getTransformFlagsSubtreeExclusions(kind) {
     case 216 /* TypeAssertionExpression */:
     case 238 /* SatisfiesExpression */:
     case 234 /* AsExpression */:
-    case 353 /* PartiallyEmittedExpression */:
+    case 354 /* PartiallyEmittedExpression */:
     case 217 /* ParenthesizedExpression */:
     case 108 /* SuperKeyword */:
       return -2147483648 /* OuterExpressionExcludes */;
@@ -24249,10 +24267,10 @@ function isMetaProperty(node) {
   return node.kind === 236 /* MetaProperty */;
 }
 function isPartiallyEmittedExpression(node) {
-  return node.kind === 353 /* PartiallyEmittedExpression */;
+  return node.kind === 354 /* PartiallyEmittedExpression */;
 }
 function isCommaListExpression(node) {
-  return node.kind === 354 /* CommaListExpression */;
+  return node.kind === 355 /* CommaListExpression */;
 }
 function isTemplateSpan(node) {
   return node.kind === 239 /* TemplateSpan */;
@@ -24375,10 +24393,10 @@ function isExportSpecifier(node) {
   return node.kind === 281 /* ExportSpecifier */;
 }
 function isNotEmittedStatement(node) {
-  return node.kind === 352 /* NotEmittedStatement */;
+  return node.kind === 353 /* NotEmittedStatement */;
 }
 function isSyntheticReference(node) {
-  return node.kind === 355 /* SyntheticReferenceExpression */;
+  return node.kind === 356 /* SyntheticReferenceExpression */;
 }
 function isExternalModuleReference(node) {
   return node.kind === 283 /* ExternalModuleReference */;
@@ -24545,6 +24563,9 @@ function isJSDocImplementsTag(node) {
 function isJSDocSatisfiesTag(node) {
   return node.kind === 350 /* JSDocSatisfiesTag */;
 }
+function isJSDocImportTag(node) {
+  return node.kind === 351 /* JSDocImportTag */;
+}
 
 // src/compiler/factory/utilities.ts
 function createEmptyExports(factory2) {
@@ -24927,7 +24948,7 @@ function isOuterExpression(node, kinds = 15 /* All */) {
       return (kinds & 2 /* TypeAssertions */) !== 0;
     case 235 /* NonNullExpression */:
       return (kinds & 4 /* NonNullAssertions */) !== 0;
-    case 353 /* PartiallyEmittedExpression */:
+    case 354 /* PartiallyEmittedExpression */:
       return (kinds & 8 /* PartiallyEmittedExpressions */) !== 0;
   }
   return false;
@@ -26003,7 +26024,7 @@ var forEachChildTable = {
   [282 /* MissingDeclaration */]: function forEachChildInMissingDeclaration(node, cbNode, cbNodes) {
     return visitNodes(cbNode, cbNodes, node.modifiers);
   },
-  [354 /* CommaListExpression */]: function forEachChildInCommaListExpression(node, cbNode, cbNodes) {
+  [355 /* CommaListExpression */]: function forEachChildInCommaListExpression(node, cbNode, cbNodes) {
     return visitNodes(cbNode, cbNodes, node.elements);
   },
   [284 /* JsxElement */]: function forEachChildInJsxElement(node, cbNode, cbNodes) {
@@ -26098,7 +26119,8 @@ var forEachChildTable = {
   [336 /* JSDocReadonlyTag */]: forEachChildInJSDocTag,
   [331 /* JSDocDeprecatedTag */]: forEachChildInJSDocTag,
   [337 /* JSDocOverrideTag */]: forEachChildInJSDocTag,
-  [353 /* PartiallyEmittedExpression */]: forEachChildInPartiallyEmittedExpression
+  [351 /* JSDocImportTag */]: forEachChildInJSDocImportTag,
+  [354 /* PartiallyEmittedExpression */]: forEachChildInPartiallyEmittedExpression
 };
 function forEachChildInCallOrConstructSignature(node, cbNode, cbNodes) {
   return visitNodes(cbNode, cbNodes, node.typeParameters) || visitNodes(cbNode, cbNodes, node.parameters) || visitNode2(cbNode, node.type);
@@ -26149,6 +26171,9 @@ function forEachChildInJSDocLinkCodeOrPlain(node, cbNode, _cbNodes) {
 function forEachChildInJSDocTag(node, cbNode, cbNodes) {
   return visitNode2(cbNode, node.tagName) || (typeof node.comment === "string" ? void 0 : visitNodes(cbNode, cbNodes, node.comment));
 }
+function forEachChildInJSDocImportTag(node, cbNode, cbNodes) {
+  return visitNode2(cbNode, node.tagName) || visitNode2(cbNode, node.importClause) || visitNode2(cbNode, node.moduleSpecifier) || visitNode2(cbNode, node.attributes) || (typeof node.comment === "string" ? void 0 : visitNodes(cbNode, cbNodes, node.comment));
+}
 function forEachChildInPartiallyEmittedExpression(node, cbNode, _cbNodes) {
   return visitNode2(cbNode, node.expression);
 }
@@ -28141,7 +28166,7 @@ var Parser;
     );
   }
   function parseJSDocType() {
-    scanner.setInJSDocType(true);
+    scanner.setSkipJsDocLeadingAsterisks(true);
     const pos = getNodePos();
     if (parseOptional(144 /* ModuleKeyword */)) {
       const moduleTag = factory2.createJSDocNamepathType(
@@ -28160,12 +28185,12 @@ var Parser;
               nextTokenJSDoc();
           }
         }
-      scanner.setInJSDocType(false);
+      scanner.setSkipJsDocLeadingAsterisks(false);
       return finishNode(moduleTag, pos);
     }
     const hasDotDotDot = parseOptional(26 /* DotDotDotToken */);
     let type = parseTypeOrTypePredicate();
-    scanner.setInJSDocType(false);
+    scanner.setSkipJsDocLeadingAsterisks(false);
     if (hasDotDotDot) {
       type = finishNode(factory2.createJSDocVariadicType(type), pos);
     }
@@ -31728,22 +31753,28 @@ var Parser;
     if (identifier && !tokenAfterImportedIdentifierDefinitelyProducesImportDeclaration()) {
       return parseImportEqualsDeclaration(pos, hasJSDoc, modifiers, identifier, isTypeOnly);
     }
+    const importClause = tryParseImportClause(identifier, afterImportPos, isTypeOnly);
+    const moduleSpecifier = parseModuleSpecifier();
+    const attributes = tryParseImportAttributes();
+    parseSemicolon();
+    const node = factory2.createImportDeclaration(modifiers, importClause, moduleSpecifier, attributes);
+    return withJSDoc(finishNode(node, pos), hasJSDoc);
+  }
+  function tryParseImportClause(identifier, pos, isTypeOnly, skipJsDocLeadingAsterisks = false) {
     let importClause;
     if (identifier || // import id
     token() === 42 /* AsteriskToken */ || // import *
     token() === 19 /* OpenBraceToken */) {
-      importClause = parseImportClause(identifier, afterImportPos, isTypeOnly);
+      importClause = parseImportClause(identifier, pos, isTypeOnly, skipJsDocLeadingAsterisks);
       parseExpected(161 /* FromKeyword */);
     }
-    const moduleSpecifier = parseModuleSpecifier();
+    return importClause;
+  }
+  function tryParseImportAttributes() {
     const currentToken2 = token();
-    let attributes;
     if ((currentToken2 === 118 /* WithKeyword */ || currentToken2 === 132 /* AssertKeyword */) && !scanner.hasPrecedingLineBreak()) {
-      attributes = parseImportAttributes(currentToken2);
+      return parseImportAttributes(currentToken2);
     }
-    parseSemicolon();
-    const node = factory2.createImportDeclaration(modifiers, importClause, moduleSpecifier, attributes);
-    return withJSDoc(finishNode(node, pos), hasJSDoc);
   }
   function parseImportAttribute() {
     const pos = getNodePos();
@@ -31810,10 +31841,14 @@ var Parser;
     const finished = withJSDoc(finishNode(node, pos), hasJSDoc);
     return finished;
   }
-  function parseImportClause(identifier, pos, isTypeOnly) {
+  function parseImportClause(identifier, pos, isTypeOnly, skipJsDocLeadingAsterisks) {
     let namedBindings;
     if (!identifier || parseOptional(28 /* CommaToken */)) {
+      if (skipJsDocLeadingAsterisks)
+        scanner.setSkipJsDocLeadingAsterisks(true);
       namedBindings = token() === 42 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(275 /* NamedImports */);
+      if (skipJsDocLeadingAsterisks)
+        scanner.setSkipJsDocLeadingAsterisks(false);
     }
     return finishNode(factory2.createImportClause(isTypeOnly, identifier, namedBindings), pos);
   }
@@ -32384,6 +32419,9 @@ var Parser;
           case "throws":
             tag = parseThrowsTag(start2, tagName, margin, indentText);
             break;
+          case "import":
+            tag = parseImportTag(start2, tagName, margin, indentText);
+            break;
           default:
             tag = parseUnknownTag(start2, tagName, margin, indentText);
             break;
@@ -32703,13 +32741,32 @@ var Parser;
         const comments2 = margin !== void 0 && indentText !== void 0 ? parseTrailingTagComments(start2, getNodePos(), margin, indentText) : void 0;
         return finishNode(factory2.createJSDocSatisfiesTag(tagName, typeExpression, comments2), start2);
       }
+      function parseImportTag(start2, tagName, margin, indentText) {
+        const afterImportTagPos = scanner.getTokenFullStart();
+        let identifier;
+        if (isIdentifier2()) {
+          identifier = parseIdentifier();
+        }
+        const importClause = tryParseImportClause(
+          identifier,
+          afterImportTagPos,
+          /*isTypeOnly*/
+          true,
+          /*skipJsDocLeadingAsterisks*/
+          true
+        );
+        const moduleSpecifier = parseModuleSpecifier();
+        const attributes = tryParseImportAttributes();
+        const comments2 = margin !== void 0 && indentText !== void 0 ? parseTrailingTagComments(start2, getNodePos(), margin, indentText) : void 0;
+        return finishNode(factory2.createJSDocImportTag(tagName, importClause, moduleSpecifier, attributes, comments2), start2);
+      }
       function parseExpressionWithTypeArgumentsForAugments() {
         const usedBrace = parseOptional(19 /* OpenBraceToken */);
         const pos = getNodePos();
         const expression = parsePropertyAccessEntityNameExpression();
-        scanner.setInJSDocType(true);
+        scanner.setSkipJsDocLeadingAsterisks(true);
         const typeArguments = tryParseTypeArguments();
-        scanner.setInJSDocType(false);
+        scanner.setSkipJsDocLeadingAsterisks(false);
         const node = factory2.createExpressionWithTypeArguments(expression, typeArguments);
         const res = finishNode(node, pos);
         if (usedBrace) {
@@ -39385,6 +39442,7 @@ function createBinder() {
   var lastContainer;
   var delayedTypeAliases;
   var seenThisKeyword;
+  var jsDocImports;
   var currentFlow;
   var currentBreakTarget;
   var currentContinueTarget;
@@ -39432,6 +39490,7 @@ function createBinder() {
       file.symbolCount = symbolCount;
       file.classifiableNames = classifiableNames;
       delayedBindJSDocTypedefTag();
+      bindJSDocImports();
     }
     file = void 0;
     options = void 0;
@@ -39442,6 +39501,7 @@ function createBinder() {
     blockScopeContainer = void 0;
     lastContainer = void 0;
     delayedTypeAliases = void 0;
+    jsDocImports = void 0;
     seenThisKeyword = false;
     currentFlow = void 0;
     currentBreakTarget = void 0;
@@ -39876,6 +39936,9 @@ function createBinder() {
       case 340 /* JSDocEnumTag */:
         bindJSDocTypeAlias(node);
         break;
+      case 351 /* JSDocImportTag */:
+        bindJSDocImportTag(node);
+        break;
       case 307 /* SourceFile */: {
         bindEachFunctionsFirst(node.statements);
         bind(node.endOfFileToken);
@@ -40608,6 +40671,12 @@ function createBinder() {
       addDeclarationToSymbol(host.symbol, host, 32 /* Class */);
     }
   }
+  function bindJSDocImportTag(node) {
+    bind(node.tagName);
+    if (typeof node.comment !== "string") {
+      bindEach(node.comment);
+    }
+  }
   function bindOptionalExpression(node, trueTarget, falseTarget) {
     doWithConditionalBranches(bind, node, trueTarget, falseTarget);
     if (!isOptionalChain(node) || isOutermostOptionalChain(node)) {
@@ -40924,6 +40993,31 @@ function createBinder() {
     parent = saveParent;
     currentFlow = saveCurrentFlow;
   }
+  function bindJSDocImports() {
+    if (jsDocImports === void 0) {
+      return;
+    }
+    const saveContainer = container;
+    const saveLastContainer = lastContainer;
+    const saveBlockScopeContainer = blockScopeContainer;
+    const saveParent = parent;
+    const saveCurrentFlow = currentFlow;
+    for (const jsDocImportTag of jsDocImports) {
+      const host = getJSDocHost(jsDocImportTag);
+      const enclosingContainer = host ? getEnclosingContainer(host) : void 0;
+      const enclosingBlockScopeContainer = host ? getEnclosingBlockScopeContainer(host) : void 0;
+      container = enclosingContainer || file;
+      blockScopeContainer = enclosingBlockScopeContainer || file;
+      currentFlow = initFlowNode({ flags: 2 /* Start */ });
+      parent = jsDocImportTag;
+      bind(jsDocImportTag.importClause);
+    }
+    container = saveContainer;
+    lastContainer = saveLastContainer;
+    blockScopeContainer = saveBlockScopeContainer;
+    parent = saveParent;
+    currentFlow = saveCurrentFlow;
+  }
   function checkContextualIdentifier(node) {
     if (!file.parseDiagnostics.length && !(node.flags & 33554432 /* Ambient */) && !(node.flags & 16777216 /* JSDoc */) && !isIdentifierName(node)) {
       const originalKeywordKind = identifierToKeywordKind(node);
@@ -41348,6 +41442,8 @@ function createBinder() {
         return (delayedTypeAliases || (delayedTypeAliases = [])).push(node);
       case 339 /* JSDocOverloadTag */:
         return bind(node.typeExpression);
+      case 351 /* JSDocImportTag */:
+        return (jsDocImports || (jsDocImports = [])).push(node);
     }
   }
   function bindPropertyWorker(node) {
@@ -45027,6 +45123,7 @@ function createTypeChecker(host) {
           case 346 /* JSDocTypedefTag */:
           case 338 /* JSDocCallbackTag */:
           case 340 /* JSDocEnumTag */:
+          case 351 /* JSDocImportTag */:
             const root = getJSDocRoot(location);
             if (root) {
               location = root.parent;
@@ -46519,7 +46616,7 @@ function createTypeChecker(host) {
       return ambientModule;
     }
     const currentSourceFile = getSourceFileOfNode(location);
-    const contextSpecifier = isStringLiteralLike(location) ? location : ((_a = isModuleDeclaration(location) ? location : location.parent && isModuleDeclaration(location.parent) && location.parent.name === location ? location.parent : void 0) == null ? void 0 : _a.name) || ((_b = isLiteralImportTypeNode(location) ? location : void 0) == null ? void 0 : _b.argument.literal) || (isVariableDeclaration(location) && location.initializer && isRequireCall(
+    const contextSpecifier = isStringLiteralLike(location) ? location : ((_a = isModuleDeclaration(location) ? location : location.parent && isModuleDeclaration(location.parent) && location.parent.name === location ? location.parent : void 0) == null ? void 0 : _a.name) || ((_b = isLiteralImportTypeNode(location) ? location : void 0) == null ? void 0 : _b.argument.literal) || (isInJSFile(location) && isJSDocImportTag(location) ? location.moduleSpecifier : void 0) || (isVariableDeclaration(location) && location.initializer && isRequireCall(
       location.initializer,
       /*requireStringLiteralLikeArgument*/
       true
@@ -48378,7 +48475,7 @@ function createTypeChecker(host) {
         }
         const abstractSignatures = filter(resolved.constructSignatures, (signature) => !!(signature.flags & 4 /* Abstract */));
         if (some(abstractSignatures)) {
-          const types = map(abstractSignatures, (s) => getOrCreateTypeFromSignature(s));
+          const types = map(abstractSignatures, getOrCreateTypeFromSignature);
           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));
@@ -50820,19 +50917,20 @@ function createTypeChecker(host) {
           case 273 /* ImportClause */: {
             const generatedSpecifier = getSpecifierForModuleSymbol(target.parent || target, context);
             const specifier2 = bundled ? factory.createStringLiteral(generatedSpecifier) : node.parent.moduleSpecifier;
+            const attributes = isImportDeclaration(node.parent) ? node.parent.attributes : void 0;
+            const isTypeOnly = isJSDocImportTag(node.parent);
             addResult(
               factory.createImportDeclaration(
                 /*modifiers*/
                 void 0,
                 factory.createImportClause(
-                  /*isTypeOnly*/
-                  false,
+                  isTypeOnly,
                   factory.createIdentifier(localName),
                   /*namedBindings*/
                   void 0
                 ),
                 specifier2,
-                node.parent.attributes
+                attributes
               ),
               0 /* None */
             );
@@ -50841,13 +50939,13 @@ function createTypeChecker(host) {
           case 274 /* NamespaceImport */: {
             const generatedSpecifier = getSpecifierForModuleSymbol(target.parent || target, context);
             const specifier2 = bundled ? factory.createStringLiteral(generatedSpecifier) : node.parent.parent.moduleSpecifier;
+            const isTypeOnly = isJSDocImportTag(node.parent.parent);
             addResult(
               factory.createImportDeclaration(
                 /*modifiers*/
                 void 0,
                 factory.createImportClause(
-                  /*isTypeOnly*/
-                  false,
+                  isTypeOnly,
                   /*name*/
                   void 0,
                   factory.createNamespaceImport(factory.createIdentifier(localName))
@@ -50875,13 +50973,13 @@ function createTypeChecker(host) {
           case 276 /* ImportSpecifier */: {
             const generatedSpecifier = getSpecifierForModuleSymbol(target.parent || target, context);
             const specifier2 = bundled ? factory.createStringLiteral(generatedSpecifier) : node.parent.parent.parent.moduleSpecifier;
+            const isTypeOnly = isJSDocImportTag(node.parent.parent.parent);
             addResult(
               factory.createImportDeclaration(
                 /*modifiers*/
                 void 0,
                 factory.createImportClause(
-                  /*isTypeOnly*/
-                  false,
+                  isTypeOnly,
                   /*name*/
                   void 0,
                   factory.createNamedImports([
@@ -55779,12 +55877,6 @@ function createTypeChecker(host) {
       isInJSFile(signature.declaration)
     );
   }
-  function getImplementationSignature(signature) {
-    return signature.typeParameters ? signature.implementationSignatureCache || (signature.implementationSignatureCache = createImplementationSignature(signature)) : signature;
-  }
-  function createImplementationSignature(signature) {
-    return signature.typeParameters ? instantiateSignature(signature, createTypeMapper([], [])) : signature;
-  }
   function getBaseSignature(signature) {
     const typeParameters = signature.typeParameters;
     if (typeParameters) {
@@ -55807,22 +55899,12 @@ function createTypeChecker(host) {
     }
     return signature;
   }
-  function getOrCreateTypeFromSignature(signature, outerTypeParameters) {
+  function getOrCreateTypeFromSignature(signature) {
     var _a;
     if (!signature.isolatedSignatureType) {
       const kind = (_a = signature.declaration) == null ? void 0 : _a.kind;
       const isConstructor = kind === void 0 || kind === 176 /* Constructor */ || kind === 180 /* ConstructSignature */ || kind === 185 /* ConstructorType */;
-      const type = createObjectType(16 /* Anonymous */ | 134217728 /* SingleSignatureType */, createSymbol(16 /* Function */, "__function" /* Function */));
-      if (signature.declaration && !nodeIsSynthesized(signature.declaration)) {
-        type.symbol.declarations = [signature.declaration];
-        type.symbol.valueDeclaration = signature.declaration;
-      }
-      outerTypeParameters || (outerTypeParameters = signature.declaration && getOuterTypeParameters(
-        signature.declaration,
-        /*includeThisTypes*/
-        true
-      ));
-      type.outerTypeParameters = outerTypeParameters;
+      const type = createObjectType(16 /* Anonymous */);
       type.members = emptySymbols;
       type.properties = emptyArray;
       type.callSignatures = !isConstructor ? [signature] : emptyArray;
@@ -59218,7 +59300,7 @@ function createTypeChecker(host) {
     const declaration = type.objectFlags & 4 /* Reference */ ? type.node : type.objectFlags & 8388608 /* InstantiationExpressionType */ ? type.node : type.symbol.declarations[0];
     const links = getNodeLinks(declaration);
     const target = type.objectFlags & 4 /* Reference */ ? links.resolvedType : type.objectFlags & 64 /* Instantiated */ ? type.target : type;
-    let typeParameters = type.objectFlags & 134217728 /* SingleSignatureType */ ? type.outerTypeParameters : links.outerTypeParameters;
+    let typeParameters = links.outerTypeParameters;
     if (!typeParameters) {
       let outerTypeParameters = getOuterTypeParameters(
         declaration,
@@ -59399,9 +59481,6 @@ function createTypeChecker(host) {
     if (type.objectFlags & 8388608 /* InstantiationExpressionType */) {
       result.node = type.node;
     }
-    if (type.objectFlags & 134217728 /* SingleSignatureType */) {
-      result.outerTypeParameters = type.outerTypeParameters;
-    }
     result.target = type;
     result.mapper = mapper;
     result.aliasSymbol = aliasSymbol || type.aliasSymbol;
@@ -64022,7 +64101,7 @@ function createTypeChecker(host) {
     if (objectFlags & 524288 /* CouldContainTypeVariablesComputed */) {
       return !!(objectFlags & 1048576 /* CouldContainTypeVariables */);
     }
-    const result = !!(type.flags & 465829888 /* Instantiable */ || type.flags & 524288 /* Object */ && !isNonGenericTopLevelType(type) && (objectFlags & 4 /* Reference */ && (type.node || some(getTypeArguments(type), couldContainTypeVariables)) || objectFlags & 134217728 /* SingleSignatureType */ && !!length(type.outerTypeParameters) || objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations || objectFlags & (32 /* Mapped */ | 1024 /* ReverseMapped */ | 4194304 /* ObjectRestType */ | 8388608 /* InstantiationExpressionType */)) || type.flags & 3145728 /* UnionOrIntersection */ && !(type.flags & 1024 /* EnumLiteral */) && !isNonGenericTopLevelType(type) && some(type.types, couldContainTypeVariables));
+    const result = !!(type.flags & 465829888 /* Instantiable */ || type.flags & 524288 /* Object */ && !isNonGenericTopLevelType(type) && (objectFlags & 4 /* Reference */ && (type.node || some(getTypeArguments(type), couldContainTypeVariables)) || objectFlags & 16 /* Anonymous */ && type.symbol && type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) && type.symbol.declarations || objectFlags & (32 /* Mapped */ | 1024 /* ReverseMapped */ | 4194304 /* ObjectRestType */ | 8388608 /* InstantiationExpressionType */)) || type.flags & 3145728 /* UnionOrIntersection */ && !(type.flags & 1024 /* EnumLiteral */) && !isNonGenericTopLevelType(type) && some(type.types, couldContainTypeVariables));
     if (type.flags & 3899393 /* ObjectFlagsType */) {
       type.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (result ? 1048576 /* CouldContainTypeVariables */ : 0);
     }
@@ -64304,9 +64383,6 @@ function createTypeChecker(host) {
       pos = p;
     }
   }
-  function isTupleOfSelf(typeParameter, type) {
-    return isTupleType(type) && getTupleElementType(type, 0) === getIndexedAccessType(typeParameter, getNumberLiteralType(0)) && !getTypeOfPropertyOfType(type, "1");
-  }
   function inferTypes(inferences, originalSource, originalTarget, priority = 0 /* None */, contravariant = false) {
     let bivariant = false;
     let propagationType;
@@ -64392,9 +64468,6 @@ function createTypeChecker(host) {
               inference.priority = priority;
             }
             if (priority === inference.priority) {
-              if (isTupleOfSelf(inference.typeParameter, candidate)) {
-                return;
-              }
               if (contravariant && !bivariant) {
                 if (!contains(inference.contraCandidates, candidate)) {
                   inference.contraCandidates = append(inference.contraCandidates, candidate);
@@ -71317,7 +71390,7 @@ function createTypeChecker(host) {
     argument = skipParentheses(argument);
     return isSatisfiesExpression(argument) ? skipParentheses(argument.expression) : argument;
   }
-  function getSignatureApplicabilityError(node, args, signature, relation, checkMode, reportErrors2, containingMessageChain, inferenceContext) {
+  function getSignatureApplicabilityError(node, args, signature, relation, checkMode, reportErrors2, containingMessageChain) {
     const errorOutputContainer = { errors: void 0, skipLogging: true };
     if (isJsxOpeningLikeElement(node)) {
       if (!checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors2, containingMessageChain, errorOutputContainer)) {
@@ -71351,8 +71424,7 @@ function createTypeChecker(host) {
           void 0,
           checkMode
         );
-        const regularArgType = checkMode & 4 /* SkipContextSensitive */ ? getRegularTypeOfObjectLiteral(argType) : argType;
-        const checkArgType = inferenceContext ? instantiateType(regularArgType, inferenceContext.nonFixingMapper) : regularArgType;
+        const checkArgType = checkMode & 4 /* SkipContextSensitive */ ? getRegularTypeOfObjectLiteral(argType) : argType;
         const effectiveCheckArgumentNode = getEffectiveCheckNode(arg);
         if (!checkTypeRelatedToAndOptionallyElaborate(checkArgType, paramType, relation, reportErrors2 ? effectiveCheckArgumentNode : void 0, effectiveCheckArgumentNode, headMessage, containingMessageChain, errorOutputContainer)) {
           Debug.assert(!reportErrors2 || !!errorOutputContainer.errors, "parameter should have errors when reporting errors");
@@ -71761,9 +71833,7 @@ function createTypeChecker(host) {
             0 /* Normal */,
             /*reportErrors*/
             true,
-            () => chain,
-            /*inferenceContext*/
-            void 0
+            () => chain
           );
           if (diags) {
             for (const d of diags) {
@@ -71799,9 +71869,7 @@ function createTypeChecker(host) {
               0 /* Normal */,
               /*reportErrors*/
               true,
-              chain2,
-              /*inferenceContext*/
-              void 0
+              chain2
             );
             if (diags2) {
               if (diags2.length <= min2) {
@@ -71892,8 +71960,6 @@ function createTypeChecker(host) {
           /*reportErrors*/
           false,
           /*containingMessageChain*/
-          void 0,
-          /*inferenceContext*/
           void 0
         )) {
           candidatesForArgumentError = [candidate];
@@ -71902,16 +71968,13 @@ function createTypeChecker(host) {
         return candidate;
       }
       for (let candidateIndex = 0; candidateIndex < candidates2.length; candidateIndex++) {
-        let candidate = candidates2[candidateIndex];
+        const candidate = candidates2[candidateIndex];
         if (!hasCorrectTypeArgumentArity(candidate, typeArguments) || !hasCorrectArity(node, args, candidate, signatureHelpTrailingComma2)) {
           continue;
         }
         let checkCandidate;
         let inferenceContext;
         if (candidate.typeParameters) {
-          if (candidate.declaration && findAncestor(node, (a) => a === candidate.declaration)) {
-            candidate = getImplementationSignature(candidate);
-          }
           let typeArgumentTypes;
           if (some(typeArguments)) {
             typeArgumentTypes = checkTypeArguments(
@@ -71931,7 +71994,7 @@ function createTypeChecker(host) {
               /*flags*/
               isInJSFile(node) ? 2 /* AnyDefault */ : 0 /* None */
             );
-            typeArgumentTypes = instantiateTypes(inferTypeArguments(node, candidate, args, argCheckMode | 8 /* SkipGenericFunctions */, inferenceContext), inferenceContext.nonFixingMapper);
+            typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode | 8 /* SkipGenericFunctions */, inferenceContext);
             argCheckMode |= inferenceContext.flags & 4 /* SkippedGenericFunction */ ? 8 /* SkipGenericFunctions */ : 0 /* Normal */;
           }
           checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, isInJSFile(candidate.declaration), inferenceContext && inferenceContext.inferredTypeParameters);
@@ -71951,8 +72014,7 @@ function createTypeChecker(host) {
           /*reportErrors*/
           false,
           /*containingMessageChain*/
-          void 0,
-          inferenceContext
+          void 0
         )) {
           (candidatesForArgumentError || (candidatesForArgumentError = [])).push(checkCandidate);
           continue;
@@ -71960,7 +72022,7 @@ function createTypeChecker(host) {
         if (argCheckMode) {
           argCheckMode = 0 /* Normal */;
           if (inferenceContext) {
-            const typeArgumentTypes = instantiateTypes(inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext), inferenceContext.mapper);
+            const typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext);
             checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, isInJSFile(candidate.declaration), inferenceContext.inferredTypeParameters);
             if (getNonArrayRestType(candidate) && !hasCorrectArity(node, args, checkCandidate, signatureHelpTrailingComma2)) {
               candidateForArgumentArityError = checkCandidate;
@@ -71976,8 +72038,7 @@ function createTypeChecker(host) {
             /*reportErrors*/
             false,
             /*containingMessageChain*/
-            void 0,
-            inferenceContext
+            void 0
           )) {
             (candidatesForArgumentError || (candidatesForArgumentError = [])).push(checkCandidate);
             continue;
@@ -75674,7 +75735,7 @@ function createTypeChecker(host) {
                 }
               }
             }
-            return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, context), flatMap(inferenceContexts, (c) => c && map(c.inferences, (i) => i.typeParameter)).slice());
+            return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, context));
           }
         }
       }
@@ -77653,6 +77714,9 @@ function createTypeChecker(host) {
       error(node.tagName, Diagnostics.An_arrow_function_cannot_have_a_this_parameter);
     }
   }
+  function checkJSDocImportTag(node) {
+    checkImportAttributes(node);
+  }
   function checkJSDocImplementsTag(node) {
     const classLike = getEffectiveJSDocHost(node);
     if (!classLike || !isClassDeclaration(classLike) && !isClassExpression(classLike)) {
@@ -80894,7 +80958,7 @@ function createTypeChecker(host) {
         const message = isImportAttributes2 ? moduleKind === 199 /* NodeNext */ ? Diagnostics.Import_attributes_are_not_allowed_on_statements_that_compile_to_CommonJS_require_calls : Diagnostics.Import_attributes_are_only_supported_when_the_module_option_is_set_to_esnext_nodenext_or_preserve : moduleKind === 199 /* NodeNext */ ? Diagnostics.Import_assertions_are_not_allowed_on_statements_that_compile_to_CommonJS_require_calls : Diagnostics.Import_assertions_are_only_supported_when_the_module_option_is_set_to_esnext_nodenext_or_preserve;
         return grammarErrorOnNode(node, message);
       }
-      if (isImportDeclaration(declaration) ? (_a = declaration.importClause) == null ? void 0 : _a.isTypeOnly : declaration.isTypeOnly) {
+      if (isImportDeclaration(declaration) || isJSDocImportTag(declaration) ? (_a = declaration.importClause) == null ? void 0 : _a.isTypeOnly : declaration.isTypeOnly) {
         return grammarErrorOnNode(node, isImportAttributes2 ? Diagnostics.Import_attributes_cannot_be_used_with_type_only_imports_or_exports : Diagnostics.Import_assertions_cannot_be_used_with_type_only_imports_or_exports);
       }
       if (override) {
@@ -81345,6 +81409,8 @@ function createTypeChecker(host) {
         return checkJSDocSatisfiesTag(node);
       case 343 /* JSDocThisTag */:
         return checkJSDocThisTag(node);
+      case 351 /* JSDocImportTag */:
+        return checkJSDocImportTag(node);
       case 199 /* IndexedAccessType */:
         return checkIndexedAccessType(node);
       case 200 /* MappedType */:
@@ -82148,7 +82214,7 @@ function createTypeChecker(host) {
         return void 0;
       case 11 /* StringLiteral */:
       case 15 /* NoSubstitutionTemplateLiteral */:
-        if (isExternalModuleImportEqualsDeclaration(node.parent.parent) && getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node || (node.parent.kind === 272 /* ImportDeclaration */ || node.parent.kind === 278 /* ExportDeclaration */) && node.parent.moduleSpecifier === node || (isInJSFile(node) && isRequireCall(
+        if (isExternalModuleImportEqualsDeclaration(node.parent.parent) && getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node || (node.parent.kind === 272 /* ImportDeclaration */ || node.parent.kind === 278 /* ExportDeclaration */) && node.parent.moduleSpecifier === node || isInJSFile(node) && isJSDocImportTag(node.parent) && node.parent.moduleSpecifier === node || (isInJSFile(node) && isRequireCall(
           node.parent,
           /*requireStringLiteralLikeArgument*/
           false
@@ -86390,13 +86456,13 @@ var visitEachChildTable = {
     );
   },
   // Transformation nodes
-  [353 /* PartiallyEmittedExpression */]: function visitEachChildOfPartiallyEmittedExpression(node, visitor, context, _nodesVisitor, nodeVisitor, _tokenVisitor) {
+  [354 /* PartiallyEmittedExpression */]: function visitEachChildOfPartiallyEmittedExpression(node, visitor, context, _nodesVisitor, nodeVisitor, _tokenVisitor) {
     return context.factory.updatePartiallyEmittedExpression(
       node,
       Debug.checkDefined(nodeVisitor(node.expression, visitor, isExpression))
     );
   },
-  [354 /* CommaListExpression */]: function visitEachChildOfCommaListExpression(node, visitor, context, nodesVisitor, _nodeVisitor, _tokenVisitor) {
+  [355 /* CommaListExpression */]: function visitEachChildOfCommaListExpression(node, visitor, context, nodesVisitor, _nodeVisitor, _tokenVisitor) {
     return context.factory.updateCommaListExpression(
       node,
       nodesVisitor(node.elements, visitor, isExpression)
@@ -86852,6 +86918,7 @@ function collectExternalModuleInfo(context, sourceFile) {
   const exportedBindings = [];
   const uniqueExports = /* @__PURE__ */ new Map();
   let exportedNames;
+  let exportedFunctions;
   let hasExportDefault = false;
   let exportEquals;
   let hasExportStarsToExportValues = false;
@@ -86910,6 +86977,7 @@ function collectExternalModuleInfo(context, sourceFile) {
         break;
       case 262 /* FunctionDeclaration */:
         if (hasSyntacticModifier(node, 32 /* Export */)) {
+          exportedFunctions = append(exportedFunctions, node);
           if (hasSyntacticModifier(node, 2048 /* Default */)) {
             if (!hasExportDefault) {
               multiMapSparseArrayAdd(exportedBindings, getOriginalNodeId(node), context.factory.getDeclarationName(node));
@@ -86920,7 +86988,6 @@ function collectExternalModuleInfo(context, sourceFile) {
             if (!uniqueExports.get(idText(name))) {
               multiMapSparseArrayAdd(exportedBindings, getOriginalNodeId(node), name);
               uniqueExports.set(idText(name), true);
-              exportedNames = append(exportedNames, name);
             }
           }
         }
@@ -86948,7 +87015,7 @@ function collectExternalModuleInfo(context, sourceFile) {
   if (externalHelpersImportDeclaration) {
     externalImports.unshift(externalHelpersImportDeclaration);
   }
-  return { externalImports, exportSpecifiers, exportEquals, hasExportStarsToExportValues, exportedBindings, exportedNames, externalHelpersImportDeclaration };
+  return { externalImports, exportSpecifiers, exportEquals, hasExportStarsToExportValues, exportedBindings, exportedNames, exportedFunctions, externalHelpersImportDeclaration };
   function addExportedNamesForExportDeclaration(node) {
     for (const specifier of cast(node.exportClause, isNamedExports).elements) {
       if (!uniqueExports.get(idText(specifier.name))) {
@@ -90051,7 +90118,7 @@ function transformClassFields(context) {
           /*discarded*/
           true
         );
-      case 354 /* CommaListExpression */:
+      case 355 /* CommaListExpression */:
         return visitCommaListExpression(
           node,
           /*discarded*/
@@ -93144,7 +93211,7 @@ function transformESDecorators(context) {
         return visitForStatement(node);
       case 244 /* ExpressionStatement */:
         return visitExpressionStatement(node);
-      case 354 /* CommaListExpression */:
+      case 355 /* CommaListExpression */:
         return visitCommaListExpression(
           node,
           /*discarded*/
@@ -93156,7 +93223,7 @@ function transformESDecorators(context) {
           /*discarded*/
           false
         );
-      case 353 /* PartiallyEmittedExpression */:
+      case 354 /* PartiallyEmittedExpression */:
         return visitPartiallyEmittedExpression(
           node,
           /*discarded*/
@@ -93242,7 +93309,7 @@ function transformESDecorators(context) {
           /*discarded*/
           true
         );
-      case 354 /* CommaListExpression */:
+      case 355 /* CommaListExpression */:
         return visitCommaListExpression(
           node,
           /*discarded*/
@@ -95833,7 +95900,7 @@ function transformES2018(context) {
         return visitObjectLiteralExpression(node);
       case 226 /* BinaryExpression */:
         return visitBinaryExpression(node, expressionResultIsUnused2);
-      case 354 /* CommaListExpression */:
+      case 355 /* CommaListExpression */:
         return visitCommaListExpression(node, expressionResultIsUnused2);
       case 299 /* CatchClause */:
         return visitCatchClause(node);
@@ -99056,7 +99123,7 @@ function transformES2015(context) {
         return visitParenthesizedExpression(node, expressionResultIsUnused2);
       case 226 /* BinaryExpression */:
         return visitBinaryExpression(node, expressionResultIsUnused2);
-      case 354 /* CommaListExpression */:
+      case 355 /* CommaListExpression */:
         return visitCommaListExpression(node, expressionResultIsUnused2);
       case 15 /* NoSubstitutionTemplateLiteral */:
       case 16 /* TemplateHead */:
@@ -102351,7 +102418,7 @@ function transformGenerators(context) {
     switch (node.kind) {
       case 226 /* BinaryExpression */:
         return visitBinaryExpression(node);
-      case 354 /* CommaListExpression */:
+      case 355 /* CommaListExpression */:
         return visitCommaListExpression(node);
       case 227 /* ConditionalExpression */:
         return visitConditionalExpression(node);
@@ -104279,7 +104346,7 @@ function transformModule(context) {
     if (shouldEmitUnderscoreUnderscoreESModule()) {
       append(statements, createUnderscoreUnderscoreESModule());
     }
-    if (length(currentModuleInfo.exportedNames)) {
+    if (some(currentModuleInfo.exportedNames)) {
       const chunkSize = 50;
       for (let i = 0; i < currentModuleInfo.exportedNames.length; i += chunkSize) {
         append(
@@ -104294,6 +104361,11 @@ function transformModule(context) {
         );
       }
     }
+    if (some(currentModuleInfo.exportedFunctions)) {
+      for (const f of currentModuleInfo.exportedFunctions) {
+        appendExportsOfHoistedDeclaration(statements, f);
+      }
+    }
     append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, topLevelVisitor, isStatement));
     addRange(statements, visitNodes2(node.statements, topLevelVisitor, isStatement, statementOffset));
     addExportEqualsIfNeeded(
@@ -104606,9 +104678,14 @@ function transformModule(context) {
     if (shouldEmitUnderscoreUnderscoreESModule()) {
       append(statements, createUnderscoreUnderscoreESModule());
     }
-    if (length(currentModuleInfo.exportedNames)) {
+    if (some(currentModuleInfo.exportedNames)) {
       append(statements, factory2.createExpressionStatement(reduceLeft(currentModuleInfo.exportedNames, (prev, nextId) => factory2.createAssignment(factory2.createPropertyAccessExpression(factory2.createIdentifier("exports"), factory2.createIdentifier(idText(nextId))), prev), factory2.createVoidZero())));
     }
+    if (some(currentModuleInfo.exportedFunctions)) {
+      for (const f of currentModuleInfo.exportedFunctions) {
+        appendExportsOfHoistedDeclaration(statements, f);
+      }
+    }
     append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, topLevelVisitor, isStatement));
     if (moduleKind === 2 /* AMD */) {
       addRange(statements, mapDefined(currentModuleInfo.externalImports, getAMDImportExpressionForImport));
@@ -104731,7 +104808,7 @@ function transformModule(context) {
         return visitExpressionStatement(node);
       case 217 /* ParenthesizedExpression */:
         return visitParenthesizedExpression(node, valueIsDiscarded);
-      case 353 /* PartiallyEmittedExpression */:
+      case 354 /* PartiallyEmittedExpression */:
         return visitPartiallyEmittedExpression(node, valueIsDiscarded);
       case 213 /* CallExpression */:
         if (isImportCall(node) && currentSourceFile.impliedNodeFormat === void 0) {
@@ -105579,7 +105656,6 @@ function transformModule(context) {
     } else {
       statements = append(statements, visitEachChild(node, visitor, context));
     }
-    statements = appendExportsOfHoistedDeclaration(statements, node);
     return singleOrMany(statements);
   }
   function visitClassDeclaration(node) {
@@ -106322,7 +106398,7 @@ function transformSystemModule(context) {
     if (!moduleInfo.hasExportStarsToExportValues) {
       return;
     }
-    if (!moduleInfo.exportedNames && moduleInfo.exportSpecifiers.size === 0) {
+    if (!some(moduleInfo.exportedNames) && !some(moduleInfo.exportedFunctions) && moduleInfo.exportSpecifiers.size === 0) {
       let hasExportDeclarationWithExportClause = false;
       for (const externalImport of moduleInfo.externalImports) {
         if (externalImport.kind === 278 /* ExportDeclaration */ && externalImport.exportClause) {
@@ -106353,6 +106429,20 @@ function transformSystemModule(context) {
         );
       }
     }
+    if (moduleInfo.exportedFunctions) {
+      for (const f of moduleInfo.exportedFunctions) {
+        if (hasSyntacticModifier(f, 2048 /* Default */)) {
+          continue;
+        }
+        Debug.assert(!!f.name);
+        exportedNames.push(
+          factory2.createPropertyAssignment(
+            factory2.createStringLiteralFromNode(f.name),
+            factory2.createTrue()
+          )
+        );
+      }
+    }
     const exportedNamesStorageRef = factory2.createUniqueName("exportedNames");
     statements.push(
       factory2.createVariableStatement(
@@ -107111,7 +107201,7 @@ function transformSystemModule(context) {
         return visitExpressionStatement(node);
       case 217 /* ParenthesizedExpression */:
         return visitParenthesizedExpression(node, valueIsDiscarded);
-      case 353 /* PartiallyEmittedExpression */:
+      case 354 /* PartiallyEmittedExpression */:
         return visitPartiallyEmittedExpression(node, valueIsDiscarded);
       case 226 /* BinaryExpression */:
         if (isDestructuringAssignment(node)) {
@@ -109219,6 +109309,8 @@ function transformDeclarations(context) {
     }
     if (isDeclaration(input) && isDeclarationAndNotVisible(input))
       return;
+    if (isJSDocImportTag(input))
+      return;
     if (isFunctionLike(input) && resolver.isImplementationOfOverload(input))
       return;
     let previousEnclosingDeclaration;
@@ -109866,7 +109958,7 @@ function noEmitNotification(hint, node, callback) {
 }
 function transformNodes(resolver, host, factory2, options, nodes, transformers, allowDtsFiles) {
   var _a, _b;
-  const enabledSyntaxKindFeatures = new Array(356 /* Count */);
+  const enabledSyntaxKindFeatures = new Array(357 /* Count */);
   let lexicalEnvironmentVariableDeclarations;
   let lexicalEnvironmentFunctionDeclarations;
   let lexicalEnvironmentStatements;
@@ -111439,7 +111531,9 @@ function createPrinter(printerOptions = {}, handlers = {}) {
           return emitJSDocTypedefTag(node);
         case 347 /* JSDocSeeTag */:
           return emitJSDocSeeTag(node);
-        case 352 /* NotEmittedStatement */:
+        case 351 /* JSDocImportTag */:
+          return emitJSDocImportTag(node);
+        case 353 /* NotEmittedStatement */:
           return;
       }
       if (isExpression(node)) {
@@ -111540,15 +111634,15 @@ function createPrinter(printerOptions = {}, handlers = {}) {
           return emitJsxSelfClosingElement(node);
         case 288 /* JsxFragment */:
           return emitJsxFragment(node);
-        case 351 /* SyntaxList */:
+        case 352 /* SyntaxList */:
           return Debug.fail("SyntaxList should not be printed");
-        case 352 /* NotEmittedStatement */:
+        case 353 /* NotEmittedStatement */:
           return;
-        case 353 /* PartiallyEmittedExpression */:
+        case 354 /* PartiallyEmittedExpression */:
           return emitPartiallyEmittedExpression(node);
-        case 354 /* CommaListExpression */:
+        case 355 /* CommaListExpression */:
           return emitCommaList(node);
-        case 355 /* SyntheticReferenceExpression */:
+        case 356 /* SyntheticReferenceExpression */:
           return Debug.fail("SyntheticReferenceExpression should not be printed");
       }
     }
@@ -113392,6 +113486,21 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     emit(tag.name);
     emitJSDocComment(tag.comment);
   }
+  function emitJSDocImportTag(tag) {
+    emitJSDocTagName(tag.tagName);
+    writeSpace();
+    if (tag.importClause) {
+      emit(tag.importClause);
+      writeSpace();
+      emitTokenWithComment(161 /* FromKeyword */, tag.importClause.end, writeKeyword, tag);
+      writeSpace();
+    }
+    emitExpression(tag.moduleSpecifier);
+    if (tag.attributes) {
+      emitWithLeadingSpace(tag.attributes);
+    }
+    emitJSDocComment(tag.comment);
+  }
   function emitJSDocNameReference(node) {
     writeSpace();
     writePunctuation("{");
@@ -114806,7 +114915,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
         emitLeadingComments(
           pos,
           /*isEmittedNode*/
-          node.kind !== 352 /* NotEmittedStatement */
+          node.kind !== 353 /* NotEmittedStatement */
         );
       }
       if (!skipLeadingComments || pos >= 0 && (emitFlags & 1024 /* NoLeadingComments */) !== 0) {
@@ -114830,7 +114939,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
       containerPos = savedContainerPos;
       containerEnd = savedContainerEnd;
       declarationListContainerEnd = savedDeclarationListContainerEnd;
-      if (!skipTrailingComments && node.kind !== 352 /* NotEmittedStatement */) {
+      if (!skipTrailingComments && node.kind !== 353 /* NotEmittedStatement */) {
         emitTrailingComments(end);
       }
     }
@@ -115082,7 +115191,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     const emitFlags = getEmitFlags(node);
     const sourceMapRange = getSourceMapRange(node);
     const source = sourceMapRange.source || sourceMapSource;
-    if (node.kind !== 352 /* NotEmittedStatement */ && (emitFlags & 32 /* NoLeadingSourceMap */) === 0 && sourceMapRange.pos >= 0) {
+    if (node.kind !== 353 /* NotEmittedStatement */ && (emitFlags & 32 /* NoLeadingSourceMap */) === 0 && sourceMapRange.pos >= 0) {
       emitSourcePos(sourceMapRange.source || sourceMapSource, skipSourceTrivia(source, sourceMapRange.pos));
     }
     if (emitFlags & 128 /* NoNestedSourceMaps */) {
@@ -115095,7 +115204,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     if (emitFlags & 128 /* NoNestedSourceMaps */) {
       sourceMapsDisabled = false;
     }
-    if (node.kind !== 352 /* NotEmittedStatement */ && (emitFlags & 64 /* NoTrailingSourceMap */) === 0 && sourceMapRange.end >= 0) {
+    if (node.kind !== 353 /* NotEmittedStatement */ && (emitFlags & 64 /* NoTrailingSourceMap */) === 0 && sourceMapRange.end >= 0) {
       emitSourcePos(sourceMapRange.source || sourceMapSource, sourceMapRange.end);
     }
   }
@@ -117977,7 +118086,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       );
     }
     if (file.flags & 4194304 /* PossiblyContainsDynamicImport */ || isJavaScriptFile) {
-      collectDynamicImportOrRequireCalls(file);
+      collectDynamicImportOrRequireOrJsDocImportCalls(file);
     }
     file.imports = imports || emptyArray;
     file.moduleAugmentations = moduleAugmentations || emptyArray;
@@ -118021,7 +118130,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         }
       }
     }
-    function collectDynamicImportOrRequireCalls(file2) {
+    function collectDynamicImportOrRequireOrJsDocImportCalls(file2) {
       const r = /import|require/g;
       while (r.exec(file2.text) !== null) {
         const node = getNodeAtPosition(file2, r.lastIndex);
@@ -118050,6 +118159,16 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
             false
           );
           imports = append(imports, node.argument.literal);
+        } else if (isJavaScriptFile && isJSDocImportTag(node)) {
+          const moduleNameExpr = getExternalModuleName(node);
+          if (moduleNameExpr && isStringLiteral(moduleNameExpr) && moduleNameExpr.text) {
+            setParentRecursive(
+              node,
+              /*incremental*/
+              false
+            );
+            imports = append(imports, moduleNameExpr);
+          }
         }
       }
     }