typescript 5.5.0-dev.20240326 → 5.5.0-dev.20240328

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-dev.20240326`;
+var version = `${versionMajorMinor}.0-dev.20240328`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -3346,12 +3346,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";
@@ -3380,9 +3381,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;
@@ -3698,6 +3699,7 @@ 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";
@@ -8466,7 +8468,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);
@@ -8517,7 +8519,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
     setOnError,
     resetTokenState,
     setTextPos: resetTokenState,
-    setInJSDocType,
+    setSkipJsDocLeadingAsterisks,
     tryScan,
     lookAhead,
     scanRange
@@ -9233,7 +9235,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;
           }
@@ -10011,8 +10013,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) {
@@ -11065,8 +11067,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:
@@ -11237,7 +11239,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 */) {
@@ -11298,10 +11300,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 */;
@@ -11742,7 +11744,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(
@@ -13696,6 +13698,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);
@@ -13717,6 +13720,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;
@@ -13743,7 +13747,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) {
@@ -14516,7 +14520,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 */;
@@ -16065,7 +16069,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;
@@ -17452,7 +17456,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;
@@ -17694,6 +17698,91 @@ function isSyntacticallyString(expr) {
   }
   return false;
 }
+function createEvaluator({ evaluateElementAccessExpression, evaluateEntityNameExpression }) {
+  function evaluate(expr, location) {
+    switch (expr.kind) {
+      case 224 /* PrefixUnaryExpression */:
+        const value = evaluate(expr.operand, location);
+        if (typeof value === "number") {
+          switch (expr.operator) {
+            case 40 /* PlusToken */:
+              return value;
+            case 41 /* MinusToken */:
+              return -value;
+            case 55 /* TildeToken */:
+              return ~value;
+          }
+        }
+        break;
+      case 226 /* BinaryExpression */:
+        const left = evaluate(expr.left, location);
+        const right = evaluate(expr.right, location);
+        if (typeof left === "number" && typeof right === "number") {
+          switch (expr.operatorToken.kind) {
+            case 52 /* BarToken */:
+              return left | right;
+            case 51 /* AmpersandToken */:
+              return left & right;
+            case 49 /* GreaterThanGreaterThanToken */:
+              return left >> right;
+            case 50 /* GreaterThanGreaterThanGreaterThanToken */:
+              return left >>> right;
+            case 48 /* LessThanLessThanToken */:
+              return left << right;
+            case 53 /* CaretToken */:
+              return left ^ right;
+            case 42 /* AsteriskToken */:
+              return left * right;
+            case 44 /* SlashToken */:
+              return left / right;
+            case 40 /* PlusToken */:
+              return left + right;
+            case 41 /* MinusToken */:
+              return left - right;
+            case 45 /* PercentToken */:
+              return left % right;
+            case 43 /* AsteriskAsteriskToken */:
+              return left ** right;
+          }
+        } else if ((typeof left === "string" || typeof left === "number") && (typeof right === "string" || typeof right === "number") && expr.operatorToken.kind === 40 /* PlusToken */) {
+          return "" + left + right;
+        }
+        break;
+      case 11 /* StringLiteral */:
+      case 15 /* NoSubstitutionTemplateLiteral */:
+        return expr.text;
+      case 228 /* TemplateExpression */:
+        return evaluateTemplateExpression(expr, location);
+      case 9 /* NumericLiteral */:
+        return +expr.text;
+      case 217 /* ParenthesizedExpression */:
+        return evaluate(expr.expression, location);
+      case 80 /* Identifier */:
+        return evaluateEntityNameExpression(expr, location);
+      case 211 /* PropertyAccessExpression */:
+        if (isEntityNameExpression(expr)) {
+          return evaluateEntityNameExpression(expr, location);
+        }
+        break;
+      case 212 /* ElementAccessExpression */:
+        return evaluateElementAccessExpression(expr, location);
+    }
+    return void 0;
+  }
+  function evaluateTemplateExpression(expr, location) {
+    let result = expr.head.text;
+    for (const span of expr.templateSpans) {
+      const value = evaluate(span.expression, location);
+      if (value === void 0) {
+        return void 0;
+      }
+      result += value;
+      result += span.literal.text;
+    }
+    return result;
+  }
+  return evaluate;
+}
 
 // src/compiler/factory/baseNodeFactory.ts
 function createBaseNodeFactory() {
@@ -18651,6 +18740,8 @@ function createNodeFactory(flags, baseFactory2) {
     updateJSDocImplementsTag,
     createJSDocSeeTag,
     updateJSDocSeeTag,
+    createJSDocImportTag,
+    updateJSDocImportTag,
     createJSDocNameReference,
     updateJSDocNameReference,
     createJSDocMemberName,
@@ -21423,6 +21514,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;
@@ -21820,18 +21922,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 */;
@@ -21853,7 +21955,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;
@@ -21862,7 +21964,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);
@@ -22108,7 +22210,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);
     }
   }
@@ -22518,6 +22620,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)}`);
   }
@@ -22658,7 +22762,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 */;
@@ -24296,10 +24400,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 */;
@@ -24422,10 +24526,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 */;
@@ -24592,6 +24696,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) {
@@ -24974,7 +25081,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;
@@ -26050,7 +26157,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) {
@@ -26145,7 +26252,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);
@@ -26196,6 +26304,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);
 }
@@ -28188,7 +28299,7 @@ var Parser;
     );
   }
   function parseJSDocType() {
-    scanner.setInJSDocType(true);
+    scanner.setSkipJsDocLeadingAsterisks(true);
     const pos = getNodePos();
     if (parseOptional(144 /* ModuleKeyword */)) {
       const moduleTag = factory2.createJSDocNamepathType(
@@ -28207,12 +28318,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);
     }
@@ -31775,22 +31886,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();
@@ -31857,10 +31974,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);
   }
@@ -32431,6 +32552,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;
@@ -32750,13 +32874,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) {
@@ -39435,6 +39578,7 @@ function createBinder() {
   var lastContainer;
   var delayedTypeAliases;
   var seenThisKeyword;
+  var jsDocImports;
   var currentFlow;
   var currentBreakTarget;
   var currentContinueTarget;
@@ -39482,6 +39626,7 @@ function createBinder() {
       file.symbolCount = symbolCount;
       file.classifiableNames = classifiableNames;
       delayedBindJSDocTypedefTag();
+      bindJSDocImports();
     }
     file = void 0;
     options = void 0;
@@ -39492,6 +39637,7 @@ function createBinder() {
     blockScopeContainer = void 0;
     lastContainer = void 0;
     delayedTypeAliases = void 0;
+    jsDocImports = void 0;
     seenThisKeyword = false;
     currentFlow = void 0;
     currentBreakTarget = void 0;
@@ -39926,6 +40072,9 @@ function createBinder() {
       case 340 /* JSDocEnumTag */:
         bindJSDocTypeAlias(node);
         break;
+      case 351 /* JSDocImportTag */:
+        bindJSDocImportTag(node);
+        break;
       case 307 /* SourceFile */: {
         bindEachFunctionsFirst(node.statements);
         bind(node.endOfFileToken);
@@ -40658,6 +40807,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)) {
@@ -40974,6 +41129,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);
@@ -41398,6 +41578,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) {
@@ -43274,6 +43456,10 @@ function createTypeChecker(host) {
   var checkBinaryExpression = createCheckBinaryExpression();
   var emitResolver = createResolver();
   var nodeBuilder = createNodeBuilder();
+  var evaluate = createEvaluator({
+    evaluateElementAccessExpression,
+    evaluateEntityNameExpression
+  });
   var globals = createSymbolTable();
   var undefinedSymbol = createSymbol(4 /* Property */, "undefined");
   undefinedSymbol.declarations = [];
@@ -45038,6 +45224,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;
@@ -46530,7 +46717,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
@@ -48443,7 +48630,7 @@ function createTypeChecker(host) {
         }
         const abstractSignatures = filter(resolved.constructSignatures, (signature) => !!(signature.flags & 4 /* Abstract */));
         if (some(abstractSignatures)) {
-          const types = map(abstractSignatures, getOrCreateTypeFromSignature);
+          const types = map(abstractSignatures, (s) => getOrCreateTypeFromSignature(s));
           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));
@@ -49758,7 +49945,7 @@ function createTypeChecker(host) {
           const type = getDeclaredTypeOfSymbol(sym);
           const name = sym.flags & 262144 /* TypeParameter */ ? typeParameterToName(type, context) : factory.cloneNode(node);
           name.symbol = sym;
-          return { introducesError, node: setEmitFlags(setOriginalNode(name, node), 16777216 /* NoAsciiEscaping */) };
+          return { introducesError, node: setTextRange(setEmitFlags(setOriginalNode(name, node), 16777216 /* NoAsciiEscaping */), node) };
         }
       }
       return { introducesError, node };
@@ -49768,7 +49955,6 @@ function createTypeChecker(host) {
         cancellationToken.throwIfCancellationRequested();
       }
       let hadError = false;
-      const file = getSourceFileOfNode(existing);
       const transformed = visitNode(existing, visitExistingNodeTreeSymbols, isTypeNode);
       if (hadError) {
         return void 0;
@@ -49919,8 +50105,17 @@ function createTypeChecker(host) {
             return result;
           }
         }
-        if (file && isTupleTypeNode(node) && !nodeIsSynthesized(node) && getLineAndCharacterOfPosition(file, node.pos).line === getLineAndCharacterOfPosition(file, node.end).line) {
-          setEmitFlags(node, 1 /* SingleLine */);
+        if (isTupleTypeNode(node) || isTypeLiteralNode(node) || isMappedTypeNode(node)) {
+          const visited = visitEachChild(
+            node,
+            visitExistingNodeTreeSymbols,
+            /*context*/
+            void 0
+          );
+          const clone = setTextRange(visited === node ? factory.cloneNode(node) : visited, node);
+          const flags = getEmitFlags(clone);
+          setEmitFlags(clone, flags | (context.flags & 1024 /* MultilineObjectLiterals */ && isTypeLiteralNode(node) ? 0 : 1 /* SingleLine */));
+          return clone;
         }
         return visitEachChild(
           node,
@@ -50906,19 +51101,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 */
             );
@@ -50927,13 +51123,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))
@@ -50961,13 +51157,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([
@@ -53647,7 +53843,7 @@ function createTypeChecker(host) {
         if (!lateSymbol)
           lateSymbols.set(memberName, lateSymbol = createSymbol(0 /* None */, memberName, 4096 /* Late */));
         const earlySymbol = earlySymbols && earlySymbols.get(memberName);
-        if (!(parent.flags & 32 /* Class */) && (lateSymbol.flags & getExcludedSymbolFlags(symbolFlags) || earlySymbol)) {
+        if (!(parent.flags & 32 /* Class */) && lateSymbol.flags & getExcludedSymbolFlags(symbolFlags)) {
           const declarations = earlySymbol ? concatenate(earlySymbol.declarations, lateSymbol.declarations) : lateSymbol.declarations;
           const name = !(type.flags & 8192 /* UniqueESSymbol */) && unescapeLeadingUnderscores(memberName) || declarationNameToString(declName);
           forEach(declarations, (declaration) => error(getNameOfDeclaration(declaration) || declaration, Diagnostics.Property_0_was_also_declared_here, name));
@@ -54599,11 +54795,15 @@ function createTypeChecker(host) {
     const modifiers = getMappedTypeModifiers(type);
     return modifiers & 8 /* ExcludeOptional */ ? -1 : modifiers & 4 /* IncludeOptional */ ? 1 : 0;
   }
-  function getModifiersTypeOptionality(type) {
-    return type.flags & 2097152 /* Intersection */ ? Math.max(...map(type.types, getModifiersTypeOptionality)) : getObjectFlags(type) & 32 /* Mapped */ ? getCombinedMappedTypeOptionality(type) : 0;
-  }
   function getCombinedMappedTypeOptionality(type) {
-    return getMappedTypeOptionality(type) || getModifiersTypeOptionality(getModifiersTypeFromMappedType(type));
+    if (getObjectFlags(type) & 32 /* Mapped */) {
+      return getMappedTypeOptionality(type) || getCombinedMappedTypeOptionality(getModifiersTypeFromMappedType(type));
+    }
+    if (type.flags & 2097152 /* Intersection */) {
+      const optionality = getCombinedMappedTypeOptionality(type.types[0]);
+      return every(type.types, (t, i) => i === 0 || getCombinedMappedTypeOptionality(t) === optionality) ? optionality : 0;
+    }
+    return 0;
   }
   function isPartialMappedType(type) {
     return !!(getObjectFlags(type) & 32 /* Mapped */ && getMappedTypeModifiers(type) & 4 /* IncludeOptional */);
@@ -55880,6 +56080,12 @@ 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) {
@@ -55902,12 +56108,22 @@ function createTypeChecker(host) {
     }
     return signature;
   }
-  function getOrCreateTypeFromSignature(signature) {
+  function getOrCreateTypeFromSignature(signature, outerTypeParameters) {
     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 */);
+      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;
       type.members = emptySymbols;
       type.properties = emptyArray;
       type.callSignatures = !isConstructor ? [signature] : emptyArray;
@@ -58396,13 +58612,18 @@ function createTypeChecker(host) {
     const mapper = createTypeMapper([getTypeParameterFromMappedType(objectType)], [index]);
     const templateMapper = combineTypeMappers(objectType.mapper, mapper);
     const instantiatedTemplateType = instantiateType(getTemplateTypeFromMappedType(objectType.target || objectType), templateMapper);
+    const isOptional = getMappedTypeOptionality(objectType) > 0 || (isGenericType(objectType) ? getCombinedMappedTypeOptionality(getModifiersTypeFromMappedType(objectType)) > 0 : couldAccessOptionalProperty(objectType, index));
     return addOptionality(
       instantiatedTemplateType,
       /*isProperty*/
       true,
-      getCombinedMappedTypeOptionality(objectType) > 0
+      isOptional
     );
   }
+  function couldAccessOptionalProperty(objectType, indexType) {
+    const indexConstraint = getBaseConstraintOfType(indexType);
+    return !!indexConstraint && some(getPropertiesOfType(objectType), (p) => !!(p.flags & 16777216 /* Optional */) && isTypeAssignableTo(getLiteralTypeFromProperty(p, 8576 /* StringOrNumberLiteralOrUnique */), indexConstraint));
+  }
   function getIndexedAccessType(objectType, indexType, accessFlags = 0 /* None */, accessNode, aliasSymbol, aliasTypeArguments) {
     return getIndexedAccessTypeOrUndefined(objectType, indexType, accessFlags, accessNode, aliasSymbol, aliasTypeArguments) || (accessNode ? errorType : unknownType);
   }
@@ -59313,7 +59534,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 = links.outerTypeParameters;
+    let typeParameters = type.objectFlags & 134217728 /* SingleSignatureType */ ? type.outerTypeParameters : links.outerTypeParameters;
     if (!typeParameters) {
       let outerTypeParameters = getOuterTypeParameters(
         declaration,
@@ -59493,6 +59714,9 @@ 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;
@@ -64124,7 +64348,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 & 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 & 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));
     if (type.flags & 3899393 /* ObjectFlagsType */) {
       type.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (result ? 1048576 /* CouldContainTypeVariables */ : 0);
     }
@@ -64408,6 +64632,9 @@ 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;
@@ -64493,6 +64720,9 @@ 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);
@@ -65173,13 +65403,20 @@ function createTypeChecker(host) {
         return getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
       case 166 /* QualifiedName */:
         const left = getFlowCacheKey(node.left, declaredType, initialType, flowContainer);
-        return left && left + "." + node.right.escapedText;
+        return left && `${left}.${node.right.escapedText}`;
       case 211 /* PropertyAccessExpression */:
       case 212 /* ElementAccessExpression */:
         const propName = getAccessedPropertyName(node);
         if (propName !== void 0) {
           const key = getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
-          return key && key + "." + propName;
+          return key && `${key}.${propName}`;
+        }
+        if (isElementAccessExpression(node) && isIdentifier(node.argumentExpression)) {
+          const symbol = getResolvedSymbol(node.argumentExpression);
+          if (isConstantVariable(symbol) || isParameterOrMutableLocalVariable(symbol) && !isSymbolAssigned(symbol)) {
+            const key = getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
+            return key && `${key}.@${getSymbolId(symbol)}`;
+          }
         }
         break;
       case 206 /* ObjectBindingPattern */:
@@ -65216,8 +65453,19 @@ function createTypeChecker(host) {
       case 211 /* PropertyAccessExpression */:
       case 212 /* ElementAccessExpression */:
         const sourcePropertyName = getAccessedPropertyName(source);
-        const targetPropertyName = isAccessExpression(target) ? getAccessedPropertyName(target) : void 0;
-        return sourcePropertyName !== void 0 && targetPropertyName !== void 0 && targetPropertyName === sourcePropertyName && isMatchingReference(source.expression, target.expression);
+        if (sourcePropertyName !== void 0) {
+          const targetPropertyName = isAccessExpression(target) ? getAccessedPropertyName(target) : void 0;
+          if (targetPropertyName !== void 0) {
+            return targetPropertyName === sourcePropertyName && isMatchingReference(source.expression, target.expression);
+          }
+        }
+        if (isElementAccessExpression(source) && isElementAccessExpression(target) && isIdentifier(source.argumentExpression) && isIdentifier(target.argumentExpression)) {
+          const symbol = getResolvedSymbol(source.argumentExpression);
+          if (symbol === getResolvedSymbol(target.argumentExpression) && (isConstantVariable(symbol) || isParameterOrMutableLocalVariable(symbol) && !isSymbolAssigned(symbol))) {
+            return isMatchingReference(source.expression, target.expression);
+          }
+        }
+        break;
       case 166 /* QualifiedName */:
         return isAccessExpression(target) && source.right.escapedText === getAccessedPropertyName(target) && isMatchingReference(source.left, target.expression);
       case 226 /* BinaryExpression */:
@@ -71413,7 +71661,7 @@ function createTypeChecker(host) {
     argument = skipParentheses(argument);
     return isSatisfiesExpression(argument) ? skipParentheses(argument.expression) : argument;
   }
-  function getSignatureApplicabilityError(node, args, signature, relation, checkMode, reportErrors2, containingMessageChain) {
+  function getSignatureApplicabilityError(node, args, signature, relation, checkMode, reportErrors2, containingMessageChain, inferenceContext) {
     const errorOutputContainer = { errors: void 0, skipLogging: true };
     if (isJsxOpeningLikeElement(node)) {
       if (!checkApplicableSignatureForJsxOpeningLikeElement(node, signature, relation, checkMode, reportErrors2, containingMessageChain, errorOutputContainer)) {
@@ -71447,7 +71695,8 @@ function createTypeChecker(host) {
           void 0,
           checkMode
         );
-        const checkArgType = checkMode & 4 /* SkipContextSensitive */ ? getRegularTypeOfObjectLiteral(argType) : argType;
+        const regularArgType = checkMode & 4 /* SkipContextSensitive */ ? getRegularTypeOfObjectLiteral(argType) : argType;
+        const checkArgType = inferenceContext ? instantiateType(regularArgType, inferenceContext.nonFixingMapper) : regularArgType;
         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");
@@ -71859,7 +72108,9 @@ function createTypeChecker(host) {
             0 /* Normal */,
             /*reportErrors*/
             true,
-            () => chain
+            () => chain,
+            /*inferenceContext*/
+            void 0
           );
           if (diags) {
             for (const d of diags) {
@@ -71895,7 +72146,9 @@ function createTypeChecker(host) {
               0 /* Normal */,
               /*reportErrors*/
               true,
-              chain2
+              chain2,
+              /*inferenceContext*/
+              void 0
             );
             if (diags2) {
               if (diags2.length <= min2) {
@@ -71986,6 +72239,8 @@ function createTypeChecker(host) {
           /*reportErrors*/
           false,
           /*containingMessageChain*/
+          void 0,
+          /*inferenceContext*/
           void 0
         )) {
           candidatesForArgumentError = [candidate];
@@ -71994,13 +72249,16 @@ function createTypeChecker(host) {
         return candidate;
       }
       for (let candidateIndex = 0; candidateIndex < candidates2.length; candidateIndex++) {
-        const candidate = candidates2[candidateIndex];
+        let 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(
@@ -72020,7 +72278,7 @@ function createTypeChecker(host) {
               /*flags*/
               isInJSFile(node) ? 2 /* AnyDefault */ : 0 /* None */
             );
-            typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode | 8 /* SkipGenericFunctions */, inferenceContext);
+            typeArgumentTypes = instantiateTypes(inferTypeArguments(node, candidate, args, argCheckMode | 8 /* SkipGenericFunctions */, inferenceContext), inferenceContext.nonFixingMapper);
             argCheckMode |= inferenceContext.flags & 4 /* SkippedGenericFunction */ ? 8 /* SkipGenericFunctions */ : 0 /* Normal */;
           }
           checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, isInJSFile(candidate.declaration), inferenceContext && inferenceContext.inferredTypeParameters);
@@ -72040,7 +72298,8 @@ function createTypeChecker(host) {
           /*reportErrors*/
           false,
           /*containingMessageChain*/
-          void 0
+          void 0,
+          inferenceContext
         )) {
           (candidatesForArgumentError || (candidatesForArgumentError = [])).push(checkCandidate);
           continue;
@@ -72048,7 +72307,7 @@ function createTypeChecker(host) {
         if (argCheckMode) {
           argCheckMode = 0 /* Normal */;
           if (inferenceContext) {
-            const typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext);
+            const typeArgumentTypes = instantiateTypes(inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext), inferenceContext.mapper);
             checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, isInJSFile(candidate.declaration), inferenceContext.inferredTypeParameters);
             if (getNonArrayRestType(candidate) && !hasCorrectArity(node, args, checkCandidate, signatureHelpTrailingComma2)) {
               candidateForArgumentArityError = checkCandidate;
@@ -72064,7 +72323,8 @@ function createTypeChecker(host) {
             /*reportErrors*/
             false,
             /*containingMessageChain*/
-            void 0
+            void 0,
+            inferenceContext
           )) {
             (candidatesForArgumentError || (candidatesForArgumentError = [])).push(checkCandidate);
             continue;
@@ -75604,7 +75864,7 @@ function createTypeChecker(host) {
     ) || unknownType, isTemplateLiteralContextualType)) {
       return getTemplateLiteralType(texts, types);
     }
-    const evaluated = node.parent.kind !== 215 /* TaggedTemplateExpression */ && evaluateTemplateExpression(node);
+    const evaluated = node.parent.kind !== 215 /* TaggedTemplateExpression */ && evaluate(node);
     return evaluated ? getFreshTypeOfLiteralType(getStringLiteralType(evaluated)) : stringType;
   }
   function isTemplateLiteralContextualType(type) {
@@ -75818,7 +76078,7 @@ function createTypeChecker(host) {
                 }
               }
             }
-            return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, context));
+            return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, context), flatMap(inferenceContexts, (c) => c && map(c.inferences, (i) => i.typeParameter)).slice());
           }
         }
       }
@@ -75993,7 +76253,8 @@ function createTypeChecker(host) {
     if (getIsolatedModules(compilerOptions)) {
       Debug.assert(!!(type.symbol.flags & 128 /* ConstEnum */));
       const constEnumDeclaration = type.symbol.valueDeclaration;
-      if (constEnumDeclaration.flags & 33554432 /* Ambient */ && !isValidTypeOnlyAliasUseSite(node)) {
+      const redirect = host.getRedirectReferenceForResolutionFromSourceOfProject(getSourceFileOfNode(constEnumDeclaration).resolvedPath);
+      if (constEnumDeclaration.flags & 33554432 /* Ambient */ && !isValidTypeOnlyAliasUseSite(node) && (!redirect || !shouldPreserveConstEnums(redirect.commandLine.options))) {
         error(node, Diagnostics.Cannot_access_ambient_const_enums_when_0_is_enabled, isolatedModulesLikeFlagName);
       }
     }
@@ -77848,6 +78109,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)) {
@@ -80577,122 +80841,53 @@ function createTypeChecker(host) {
     }
     return false;
   }
-  function evaluate(expr, location) {
-    switch (expr.kind) {
-      case 224 /* PrefixUnaryExpression */:
-        const value = evaluate(expr.operand, location);
-        if (typeof value === "number") {
-          switch (expr.operator) {
-            case 40 /* PlusToken */:
-              return value;
-            case 41 /* MinusToken */:
-              return -value;
-            case 55 /* TildeToken */:
-              return ~value;
-          }
-        }
-        break;
-      case 226 /* BinaryExpression */:
-        const left = evaluate(expr.left, location);
-        const right = evaluate(expr.right, location);
-        if (typeof left === "number" && typeof right === "number") {
-          switch (expr.operatorToken.kind) {
-            case 52 /* BarToken */:
-              return left | right;
-            case 51 /* AmpersandToken */:
-              return left & right;
-            case 49 /* GreaterThanGreaterThanToken */:
-              return left >> right;
-            case 50 /* GreaterThanGreaterThanGreaterThanToken */:
-              return left >>> right;
-            case 48 /* LessThanLessThanToken */:
-              return left << right;
-            case 53 /* CaretToken */:
-              return left ^ right;
-            case 42 /* AsteriskToken */:
-              return left * right;
-            case 44 /* SlashToken */:
-              return left / right;
-            case 40 /* PlusToken */:
-              return left + right;
-            case 41 /* MinusToken */:
-              return left - right;
-            case 45 /* PercentToken */:
-              return left % right;
-            case 43 /* AsteriskAsteriskToken */:
-              return left ** right;
-          }
-        } else if ((typeof left === "string" || typeof left === "number") && (typeof right === "string" || typeof right === "number") && expr.operatorToken.kind === 40 /* PlusToken */) {
-          return "" + left + right;
-        }
-        break;
-      case 11 /* StringLiteral */:
-      case 15 /* NoSubstitutionTemplateLiteral */:
-        return expr.text;
-      case 228 /* TemplateExpression */:
-        return evaluateTemplateExpression(expr, location);
-      case 9 /* NumericLiteral */:
-        checkGrammarNumericLiteral(expr);
-        return +expr.text;
-      case 217 /* ParenthesizedExpression */:
-        return evaluate(expr.expression, location);
-      case 80 /* Identifier */: {
-        const identifier = expr;
-        if (isInfinityOrNaNString(identifier.escapedText) && resolveEntityName(
-          identifier,
-          111551 /* Value */,
-          /*ignoreErrors*/
-          true
-        ) === getGlobalSymbol(
-          identifier.escapedText,
-          111551 /* Value */,
-          /*diagnostic*/
-          void 0
-        )) {
-          return +identifier.escapedText;
-        }
+  function evaluateEntityNameExpression(expr, location) {
+    const symbol = resolveEntityName(
+      expr,
+      111551 /* Value */,
+      /*ignoreErrors*/
+      true
+    );
+    if (!symbol)
+      return void 0;
+    if (expr.kind === 80 /* Identifier */) {
+      const identifier = expr;
+      if (isInfinityOrNaNString(identifier.escapedText) && symbol === getGlobalSymbol(
+        identifier.escapedText,
+        111551 /* Value */,
+        /*diagnostic*/
+        void 0
+      )) {
+        return +identifier.escapedText;
       }
-      case 211 /* PropertyAccessExpression */:
-        if (isEntityNameExpression(expr)) {
-          const symbol = resolveEntityName(
-            expr,
-            111551 /* Value */,
-            /*ignoreErrors*/
-            true
-          );
-          if (symbol) {
-            if (symbol.flags & 8 /* EnumMember */) {
-              return location ? evaluateEnumMember(expr, symbol, location) : getEnumMemberValue(symbol.valueDeclaration);
-            }
-            if (isConstantVariable(symbol)) {
-              const declaration = symbol.valueDeclaration;
-              if (declaration && isVariableDeclaration(declaration) && !declaration.type && declaration.initializer && (!location || declaration !== location && isBlockScopedNameDeclaredBeforeUse(declaration, location))) {
-                return evaluate(declaration.initializer, declaration);
-              }
-            }
-          }
-        }
-        break;
-      case 212 /* ElementAccessExpression */:
-        const root = expr.expression;
-        if (isEntityNameExpression(root) && isStringLiteralLike(expr.argumentExpression)) {
-          const rootSymbol = resolveEntityName(
-            root,
-            111551 /* Value */,
-            /*ignoreErrors*/
-            true
-          );
-          if (rootSymbol && rootSymbol.flags & 384 /* Enum */) {
-            const name = escapeLeadingUnderscores(expr.argumentExpression.text);
-            const member = rootSymbol.exports.get(name);
-            if (member) {
-              return location ? evaluateEnumMember(expr, member, location) : getEnumMemberValue(member.valueDeclaration);
-            }
-          }
+    }
+    if (symbol.flags & 8 /* EnumMember */) {
+      return location ? evaluateEnumMember(expr, symbol, location) : getEnumMemberValue(symbol.valueDeclaration);
+    }
+    if (isConstantVariable(symbol)) {
+      const declaration = symbol.valueDeclaration;
+      if (declaration && isVariableDeclaration(declaration) && !declaration.type && declaration.initializer && (!location || declaration !== location && isBlockScopedNameDeclaredBeforeUse(declaration, location))) {
+        return evaluate(declaration.initializer, declaration);
+      }
+    }
+  }
+  function evaluateElementAccessExpression(expr, location) {
+    const root = expr.expression;
+    if (isEntityNameExpression(root) && isStringLiteralLike(expr.argumentExpression)) {
+      const rootSymbol = resolveEntityName(
+        root,
+        111551 /* Value */,
+        /*ignoreErrors*/
+        true
+      );
+      if (rootSymbol && rootSymbol.flags & 384 /* Enum */) {
+        const name = escapeLeadingUnderscores(expr.argumentExpression.text);
+        const member = rootSymbol.exports.get(name);
+        if (member) {
+          return location ? evaluateEnumMember(expr, member, location) : getEnumMemberValue(member.valueDeclaration);
         }
-        break;
+      }
     }
-    return void 0;
   }
   function evaluateEnumMember(expr, symbol, location) {
     const declaration = symbol.valueDeclaration;
@@ -80706,18 +80901,6 @@ function createTypeChecker(host) {
     }
     return getEnumMemberValue(declaration);
   }
-  function evaluateTemplateExpression(expr, location) {
-    let result = expr.head.text;
-    for (const span of expr.templateSpans) {
-      const value = evaluate(span.expression, location);
-      if (value === void 0) {
-        return void 0;
-      }
-      result += value;
-      result += span.literal.text;
-    }
-    return result;
-  }
   function checkEnumDeclaration(node) {
     addLazyDiagnostic(() => checkEnumDeclarationWorker(node));
   }
@@ -81115,7 +81298,8 @@ 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) {
+      const isTypeOnly = isJSDocImportTag(declaration) || (isImportDeclaration(declaration) ? (_a = declaration.importClause) == null ? void 0 : _a.isTypeOnly : declaration.isTypeOnly);
+      if (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) {
@@ -81566,6 +81750,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 */:
@@ -82369,7 +82555,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
@@ -86510,13 +86696,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)
@@ -90173,7 +90359,7 @@ function transformClassFields(context) {
           /*discarded*/
           true
         );
-      case 354 /* CommaListExpression */:
+      case 355 /* CommaListExpression */:
         return visitCommaListExpression(
           node,
           /*discarded*/
@@ -93266,7 +93452,7 @@ function transformESDecorators(context) {
         return visitForStatement(node);
       case 244 /* ExpressionStatement */:
         return visitExpressionStatement(node);
-      case 354 /* CommaListExpression */:
+      case 355 /* CommaListExpression */:
         return visitCommaListExpression(
           node,
           /*discarded*/
@@ -93278,7 +93464,7 @@ function transformESDecorators(context) {
           /*discarded*/
           false
         );
-      case 353 /* PartiallyEmittedExpression */:
+      case 354 /* PartiallyEmittedExpression */:
         return visitPartiallyEmittedExpression(
           node,
           /*discarded*/
@@ -93364,7 +93550,7 @@ function transformESDecorators(context) {
           /*discarded*/
           true
         );
-      case 354 /* CommaListExpression */:
+      case 355 /* CommaListExpression */:
         return visitCommaListExpression(
           node,
           /*discarded*/
@@ -95955,7 +96141,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);
@@ -99178,7 +99364,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 */:
@@ -102473,7 +102659,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);
@@ -104863,7 +105049,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) {
@@ -107256,7 +107442,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)) {
@@ -109269,6 +109455,8 @@ function transformDeclarations(context) {
     }
     if (isDeclaration(input) && isDeclarationAndNotVisible(input))
       return;
+    if (isJSDocImportTag(input))
+      return;
     if (isFunctionLike(input) && resolver.isImplementationOfOverload(input))
       return;
     let previousEnclosingDeclaration;
@@ -109916,7 +110104,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;
@@ -111484,7 +111672,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)) {
@@ -111585,15 +111775,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");
       }
     }
@@ -113437,6 +113627,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("{");
@@ -114849,7 +115054,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
         emitLeadingComments(
           pos,
           /*isEmittedNode*/
-          node.kind !== 352 /* NotEmittedStatement */
+          node.kind !== 353 /* NotEmittedStatement */
         );
       }
       if (!skipLeadingComments || pos >= 0 && (emitFlags & 1024 /* NoLeadingComments */) !== 0) {
@@ -114873,7 +115078,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);
       }
     }
@@ -115125,7 +115330,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 */) {
@@ -115138,7 +115343,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);
     }
   }
@@ -116877,6 +117082,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     getResolvedProjectReferenceByPath,
     forEachResolvedProjectReference: forEachResolvedProjectReference2,
     isSourceOfProjectReferenceRedirect,
+    getRedirectReferenceForResolutionFromSourceOfProject,
     emitBuildInfo,
     fileExists,
     readFile,
@@ -118019,7 +118225,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;
@@ -118063,7 +118269,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);
@@ -118092,6 +118298,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);
+          }
         }
       }
     }