@typescript-deploys/pr-build 5.5.0-pr-57207-16 → 5.5.0-pr-57589-6

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.20240307`;
+var version = `${versionMajorMinor}.0-insiders.20240308`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -3340,13 +3340,12 @@ var SyntaxKind = /* @__PURE__ */ ((SyntaxKind4) => {
   SyntaxKind4[SyntaxKind4["JSDocPropertyTag"] = 348] = "JSDocPropertyTag";
   SyntaxKind4[SyntaxKind4["JSDocThrowsTag"] = 349] = "JSDocThrowsTag";
   SyntaxKind4[SyntaxKind4["JSDocSatisfiesTag"] = 350] = "JSDocSatisfiesTag";
-  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["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["FirstAssignment"] = 64 /* EqualsToken */] = "FirstAssignment";
   SyntaxKind4[SyntaxKind4["LastAssignment"] = 79 /* CaretEqualsToken */] = "LastAssignment";
   SyntaxKind4[SyntaxKind4["FirstCompoundAssignment"] = 65 /* PlusEqualsToken */] = "FirstCompoundAssignment";
@@ -3375,9 +3374,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"] = 351 /* JSDocImportTag */] = "LastJSDocNode";
+  SyntaxKind4[SyntaxKind4["LastJSDocNode"] = 350 /* JSDocSatisfiesTag */] = "LastJSDocNode";
   SyntaxKind4[SyntaxKind4["FirstJSDocTagNode"] = 327 /* JSDocTag */] = "FirstJSDocTagNode";
-  SyntaxKind4[SyntaxKind4["LastJSDocTagNode"] = 351 /* JSDocImportTag */] = "LastJSDocTagNode";
+  SyntaxKind4[SyntaxKind4["LastJSDocTagNode"] = 350 /* JSDocSatisfiesTag */] = "LastJSDocTagNode";
   SyntaxKind4[SyntaxKind4["FirstContextualKeyword"] = 128 /* AbstractKeyword */] = "FirstContextualKeyword";
   SyntaxKind4[SyntaxKind4["LastContextualKeyword"] = 165 /* OfKeyword */] = "LastContextualKeyword";
   return SyntaxKind4;
@@ -8437,7 +8436,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
   var tokenValue;
   var tokenFlags;
   var commentDirectives;
-  var skipJsDocLeadingAsterisks = 0;
+  var inJSDocType = 0;
   var scriptKind = 0 /* Unknown */;
   var jsDocParsingMode = 0 /* ParseAll */;
   setText(text, start, length2);
@@ -8488,7 +8487,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
     setOnError,
     resetTokenState,
     setTextPos: resetTokenState,
-    setSkipJsDocLeadingAsterisks,
+    setInJSDocType,
     tryScan,
     lookAhead,
     scanRange
@@ -9204,7 +9203,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
             return pos += 2, token = 43 /* AsteriskAsteriskToken */;
           }
           pos++;
-          if (skipJsDocLeadingAsterisks && !asteriskSeen && tokenFlags & 1 /* PrecedingLineBreak */) {
+          if (inJSDocType && !asteriskSeen && tokenFlags & 1 /* PrecedingLineBreak */) {
             asteriskSeen = true;
             continue;
           }
@@ -9982,8 +9981,8 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
     tokenValue = void 0;
     tokenFlags = 0 /* None */;
   }
-  function setSkipJsDocLeadingAsterisks(skip) {
-    skipJsDocLeadingAsterisks += skip ? 1 : -1;
+  function setInJSDocType(inType) {
+    inJSDocType += inType ? 1 : -1;
   }
 }
 function codePointAt(s, i) {
@@ -11036,8 +11035,8 @@ function isExpressionKind(kind) {
     case 230 /* SpreadElement */:
     case 234 /* AsExpression */:
     case 232 /* OmittedExpression */:
-    case 355 /* CommaListExpression */:
-    case 354 /* PartiallyEmittedExpression */:
+    case 354 /* CommaListExpression */:
+    case 353 /* PartiallyEmittedExpression */:
     case 238 /* SatisfiesExpression */:
       return true;
     default:
@@ -11208,7 +11207,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 === 353 /* 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 === 352 /* NotEmittedStatement */;
 }
 function isDeclaration(node) {
   if (node.kind === 168 /* TypeParameter */) {
@@ -11269,10 +11268,10 @@ function isCaseOrDefaultClause(node) {
   return kind === 296 /* CaseClause */ || kind === 297 /* DefaultClause */;
 }
 function isJSDocNode(node) {
-  return node.kind >= 309 /* FirstJSDocNode */ && node.kind <= 351 /* LastJSDocNode */;
+  return node.kind >= 309 /* FirstJSDocNode */ && node.kind <= 350 /* LastJSDocNode */;
 }
 function isJSDocTag(node) {
-  return node.kind >= 327 /* FirstJSDocTagNode */ && node.kind <= 351 /* LastJSDocTagNode */;
+  return node.kind >= 327 /* FirstJSDocTagNode */ && node.kind <= 350 /* LastJSDocTagNode */;
 }
 function isSetAccessor(node) {
   return node.kind === 178 /* SetAccessor */;
@@ -11713,7 +11712,7 @@ function getTokenPosOfNode(node, sourceFile, includeJsDoc) {
   if (includeJsDoc && hasJSDocNodes(node)) {
     return getTokenPosOfNode(node.jsDoc[0], sourceFile);
   }
-  if (node.kind === 352 /* SyntaxList */ && node._children.length > 0) {
+  if (node.kind === 351 /* SyntaxList */ && node._children.length > 0) {
     return getTokenPosOfNode(node._children[0], sourceFile, includeJsDoc);
   }
   return skipTrivia(
@@ -13664,7 +13663,6 @@ 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);
@@ -13686,7 +13684,6 @@ 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;
@@ -13713,7 +13710,7 @@ function getNamespaceDeclarationNode(node) {
   }
 }
 function isDefaultImport(node) {
-  return (node.kind === 272 /* ImportDeclaration */ || node.kind === 351 /* JSDocImportTag */) && !!node.importClause && !!node.importClause.name;
+  return node.kind === 272 /* ImportDeclaration */ && !!node.importClause && !!node.importClause.name;
 }
 function hasQuestionToken(node) {
   if (node) {
@@ -14486,7 +14483,7 @@ function getOperator(expression) {
 }
 function getOperatorPrecedence(nodeKind, operatorKind, hasArguments) {
   switch (nodeKind) {
-    case 355 /* CommaListExpression */:
+    case 354 /* CommaListExpression */:
       return 0 /* Comma */;
     case 230 /* SpreadElement */:
       return 1 /* Spread */;
@@ -16035,7 +16032,7 @@ function getLeftmostExpression(node, stopAtCallExpressions) {
       case 212 /* ElementAccessExpression */:
       case 211 /* PropertyAccessExpression */:
       case 235 /* NonNullExpression */:
-      case 354 /* PartiallyEmittedExpression */:
+      case 353 /* PartiallyEmittedExpression */:
       case 238 /* SatisfiesExpression */:
         node = node.expression;
         continue;
@@ -17422,7 +17419,7 @@ function getContainingNodeArray(node) {
       return parent.types;
     case 189 /* TupleType */:
     case 209 /* ArrayLiteralExpression */:
-    case 355 /* CommaListExpression */:
+    case 354 /* CommaListExpression */:
     case 275 /* NamedImports */:
     case 279 /* NamedExports */:
       return parent.elements;
@@ -18607,8 +18604,6 @@ function createNodeFactory(flags, baseFactory2) {
     updateJSDocImplementsTag,
     createJSDocSeeTag,
     updateJSDocSeeTag,
-    createJSDocImportTag,
-    updateJSDocImportTag,
     createJSDocNameReference,
     updateJSDocNameReference,
     createJSDocMemberName,
@@ -21381,17 +21376,6 @@ 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;
@@ -21789,18 +21773,18 @@ function createNodeFactory(flags, baseFactory2) {
     return node;
   }
   function createSyntaxList(children) {
-    const node = createBaseNode(352 /* SyntaxList */);
+    const node = createBaseNode(351 /* SyntaxList */);
     node._children = children;
     return node;
   }
   function createNotEmittedStatement(original) {
-    const node = createBaseNode(353 /* NotEmittedStatement */);
+    const node = createBaseNode(352 /* NotEmittedStatement */);
     node.original = original;
     setTextRange(node, original);
     return node;
   }
   function createPartiallyEmittedExpression(expression, original) {
-    const node = createBaseNode(354 /* PartiallyEmittedExpression */);
+    const node = createBaseNode(353 /* PartiallyEmittedExpression */);
     node.expression = expression;
     node.original = original;
     node.transformFlags |= propagateChildFlags(node.expression) | 1 /* ContainsTypeScript */;
@@ -21822,7 +21806,7 @@ function createNodeFactory(flags, baseFactory2) {
     return node;
   }
   function createCommaListExpression(elements) {
-    const node = createBaseNode(355 /* CommaListExpression */);
+    const node = createBaseNode(354 /* CommaListExpression */);
     node.elements = createNodeArray(sameFlatMap(elements, flattenCommaElements));
     node.transformFlags |= propagateChildrenFlags(node.elements);
     return node;
@@ -21831,7 +21815,7 @@ function createNodeFactory(flags, baseFactory2) {
     return node.elements !== elements ? update(createCommaListExpression(elements), node) : node;
   }
   function createSyntheticReferenceExpression(expression, thisArg) {
-    const node = createBaseNode(356 /* SyntheticReferenceExpression */);
+    const node = createBaseNode(355 /* SyntheticReferenceExpression */);
     node.expression = expression;
     node.thisArg = thisArg;
     node.transformFlags |= propagateChildFlags(node.expression) | propagateChildFlags(node.thisArg);
@@ -22077,7 +22061,7 @@ function createNodeFactory(flags, baseFactory2) {
         return updateSatisfiesExpression(outerExpression, expression, outerExpression.type);
       case 235 /* NonNullExpression */:
         return updateNonNullExpression(outerExpression, expression);
-      case 354 /* PartiallyEmittedExpression */:
+      case 353 /* PartiallyEmittedExpression */:
         return updatePartiallyEmittedExpression(outerExpression, expression);
     }
   }
@@ -22487,8 +22471,6 @@ function getDefaultTagNameForKind(kind) {
       return "augments";
     case 329 /* JSDocImplementsTag */:
       return "implements";
-    case 351 /* JSDocImportTag */:
-      return "import";
     default:
       return Debug.fail(`Unsupported kind: ${Debug.formatSyntaxKind(kind)}`);
   }
@@ -22629,7 +22611,7 @@ function getTransformFlagsSubtreeExclusions(kind) {
     case 216 /* TypeAssertionExpression */:
     case 238 /* SatisfiesExpression */:
     case 234 /* AsExpression */:
-    case 354 /* PartiallyEmittedExpression */:
+    case 353 /* PartiallyEmittedExpression */:
     case 217 /* ParenthesizedExpression */:
     case 108 /* SuperKeyword */:
       return -2147483648 /* OuterExpressionExcludes */;
@@ -24267,10 +24249,10 @@ function isMetaProperty(node) {
   return node.kind === 236 /* MetaProperty */;
 }
 function isPartiallyEmittedExpression(node) {
-  return node.kind === 354 /* PartiallyEmittedExpression */;
+  return node.kind === 353 /* PartiallyEmittedExpression */;
 }
 function isCommaListExpression(node) {
-  return node.kind === 355 /* CommaListExpression */;
+  return node.kind === 354 /* CommaListExpression */;
 }
 function isTemplateSpan(node) {
   return node.kind === 239 /* TemplateSpan */;
@@ -24393,10 +24375,10 @@ function isExportSpecifier(node) {
   return node.kind === 281 /* ExportSpecifier */;
 }
 function isNotEmittedStatement(node) {
-  return node.kind === 353 /* NotEmittedStatement */;
+  return node.kind === 352 /* NotEmittedStatement */;
 }
 function isSyntheticReference(node) {
-  return node.kind === 356 /* SyntheticReferenceExpression */;
+  return node.kind === 355 /* SyntheticReferenceExpression */;
 }
 function isExternalModuleReference(node) {
   return node.kind === 283 /* ExternalModuleReference */;
@@ -24563,9 +24545,6 @@ 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) {
@@ -24948,7 +24927,7 @@ function isOuterExpression(node, kinds = 15 /* All */) {
       return (kinds & 2 /* TypeAssertions */) !== 0;
     case 235 /* NonNullExpression */:
       return (kinds & 4 /* NonNullAssertions */) !== 0;
-    case 354 /* PartiallyEmittedExpression */:
+    case 353 /* PartiallyEmittedExpression */:
       return (kinds & 8 /* PartiallyEmittedExpressions */) !== 0;
   }
   return false;
@@ -26024,7 +26003,7 @@ var forEachChildTable = {
   [282 /* MissingDeclaration */]: function forEachChildInMissingDeclaration(node, cbNode, cbNodes) {
     return visitNodes(cbNode, cbNodes, node.modifiers);
   },
-  [355 /* CommaListExpression */]: function forEachChildInCommaListExpression(node, cbNode, cbNodes) {
+  [354 /* CommaListExpression */]: function forEachChildInCommaListExpression(node, cbNode, cbNodes) {
     return visitNodes(cbNode, cbNodes, node.elements);
   },
   [284 /* JsxElement */]: function forEachChildInJsxElement(node, cbNode, cbNodes) {
@@ -26119,8 +26098,7 @@ var forEachChildTable = {
   [336 /* JSDocReadonlyTag */]: forEachChildInJSDocTag,
   [331 /* JSDocDeprecatedTag */]: forEachChildInJSDocTag,
   [337 /* JSDocOverrideTag */]: forEachChildInJSDocTag,
-  [351 /* JSDocImportTag */]: forEachChildInJSDocImportTag,
-  [354 /* PartiallyEmittedExpression */]: forEachChildInPartiallyEmittedExpression
+  [353 /* PartiallyEmittedExpression */]: forEachChildInPartiallyEmittedExpression
 };
 function forEachChildInCallOrConstructSignature(node, cbNode, cbNodes) {
   return visitNodes(cbNode, cbNodes, node.typeParameters) || visitNodes(cbNode, cbNodes, node.parameters) || visitNode2(cbNode, node.type);
@@ -26171,9 +26149,6 @@ 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);
 }
@@ -28166,7 +28141,7 @@ var Parser;
     );
   }
   function parseJSDocType() {
-    scanner.setSkipJsDocLeadingAsterisks(true);
+    scanner.setInJSDocType(true);
     const pos = getNodePos();
     if (parseOptional(144 /* ModuleKeyword */)) {
       const moduleTag = factory2.createJSDocNamepathType(
@@ -28185,12 +28160,12 @@ var Parser;
               nextTokenJSDoc();
           }
         }
-      scanner.setSkipJsDocLeadingAsterisks(false);
+      scanner.setInJSDocType(false);
       return finishNode(moduleTag, pos);
     }
     const hasDotDotDot = parseOptional(26 /* DotDotDotToken */);
     let type = parseTypeOrTypePredicate();
-    scanner.setSkipJsDocLeadingAsterisks(false);
+    scanner.setInJSDocType(false);
     if (hasDotDotDot) {
       type = finishNode(factory2.createJSDocVariadicType(type), pos);
     }
@@ -31753,28 +31728,22 @@ 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, pos, isTypeOnly, skipJsDocLeadingAsterisks);
+      importClause = parseImportClause(identifier, afterImportPos, isTypeOnly);
       parseExpected(161 /* FromKeyword */);
     }
-    return importClause;
-  }
-  function tryParseImportAttributes() {
+    const moduleSpecifier = parseModuleSpecifier();
     const currentToken2 = token();
+    let attributes;
     if ((currentToken2 === 118 /* WithKeyword */ || currentToken2 === 132 /* AssertKeyword */) && !scanner.hasPrecedingLineBreak()) {
-      return parseImportAttributes(currentToken2);
+      attributes = parseImportAttributes(currentToken2);
     }
+    parseSemicolon();
+    const node = factory2.createImportDeclaration(modifiers, importClause, moduleSpecifier, attributes);
+    return withJSDoc(finishNode(node, pos), hasJSDoc);
   }
   function parseImportAttribute() {
     const pos = getNodePos();
@@ -31841,14 +31810,10 @@ var Parser;
     const finished = withJSDoc(finishNode(node, pos), hasJSDoc);
     return finished;
   }
-  function parseImportClause(identifier, pos, isTypeOnly, skipJsDocLeadingAsterisks) {
+  function parseImportClause(identifier, pos, isTypeOnly) {
     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);
   }
@@ -32419,9 +32384,6 @@ 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;
@@ -32741,32 +32703,13 @@ 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.setSkipJsDocLeadingAsterisks(true);
+        scanner.setInJSDocType(true);
         const typeArguments = tryParseTypeArguments();
-        scanner.setSkipJsDocLeadingAsterisks(false);
+        scanner.setInJSDocType(false);
         const node = factory2.createExpressionWithTypeArguments(expression, typeArguments);
         const res = finishNode(node, pos);
         if (usedBrace) {
@@ -39442,7 +39385,6 @@ function createBinder() {
   var lastContainer;
   var delayedTypeAliases;
   var seenThisKeyword;
-  var jsDocImports;
   var currentFlow;
   var currentBreakTarget;
   var currentContinueTarget;
@@ -39490,7 +39432,6 @@ function createBinder() {
       file.symbolCount = symbolCount;
       file.classifiableNames = classifiableNames;
       delayedBindJSDocTypedefTag();
-      bindJSDocImports();
     }
     file = void 0;
     options = void 0;
@@ -39501,7 +39442,6 @@ function createBinder() {
     blockScopeContainer = void 0;
     lastContainer = void 0;
     delayedTypeAliases = void 0;
-    jsDocImports = void 0;
     seenThisKeyword = false;
     currentFlow = void 0;
     currentBreakTarget = void 0;
@@ -39936,9 +39876,6 @@ function createBinder() {
       case 340 /* JSDocEnumTag */:
         bindJSDocTypeAlias(node);
         break;
-      case 351 /* JSDocImportTag */:
-        bindJSDocImportTag(node);
-        break;
       case 307 /* SourceFile */: {
         bindEachFunctionsFirst(node.statements);
         bind(node.endOfFileToken);
@@ -40671,12 +40608,6 @@ 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)) {
@@ -40993,31 +40924,6 @@ 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);
@@ -41442,8 +41348,6 @@ 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) {
@@ -45123,7 +45027,6 @@ function createTypeChecker(host) {
           case 346 /* JSDocTypedefTag */:
           case 338 /* JSDocCallbackTag */:
           case 340 /* JSDocEnumTag */:
-          case 351 /* JSDocImportTag */:
             const root = getJSDocRoot(location);
             if (root) {
               location = root.parent;
@@ -46616,7 +46519,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) || (isInJSFile(location) && isJSDocImportTag(location) ? location.moduleSpecifier : void 0) || (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) || (isVariableDeclaration(location) && location.initializer && isRequireCall(
       location.initializer,
       /*requireStringLiteralLikeArgument*/
       true
@@ -50917,20 +50820,19 @@ 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,
+                  /*isTypeOnly*/
+                  false,
                   factory.createIdentifier(localName),
                   /*namedBindings*/
                   void 0
                 ),
                 specifier2,
-                attributes
+                node.parent.attributes
               ),
               0 /* None */
             );
@@ -50939,13 +50841,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,
+                  /*isTypeOnly*/
+                  false,
                   /*name*/
                   void 0,
                   factory.createNamespaceImport(factory.createIdentifier(localName))
@@ -50973,13 +50875,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,
+                  /*isTypeOnly*/
+                  false,
                   /*name*/
                   void 0,
                   factory.createNamedImports([
@@ -77714,9 +77616,6 @@ 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)) {
@@ -80958,7 +80857,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) || isJSDocImportTag(declaration) ? (_a = declaration.importClause) == null ? void 0 : _a.isTypeOnly : declaration.isTypeOnly) {
+      if (isImportDeclaration(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) {
@@ -81409,8 +81308,6 @@ 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 */:
@@ -82214,7 +82111,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) && isJSDocImportTag(node.parent) && 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) && isRequireCall(
           node.parent,
           /*requireStringLiteralLikeArgument*/
           false
@@ -86456,13 +86353,13 @@ var visitEachChildTable = {
     );
   },
   // Transformation nodes
-  [354 /* PartiallyEmittedExpression */]: function visitEachChildOfPartiallyEmittedExpression(node, visitor, context, _nodesVisitor, nodeVisitor, _tokenVisitor) {
+  [353 /* PartiallyEmittedExpression */]: function visitEachChildOfPartiallyEmittedExpression(node, visitor, context, _nodesVisitor, nodeVisitor, _tokenVisitor) {
     return context.factory.updatePartiallyEmittedExpression(
       node,
       Debug.checkDefined(nodeVisitor(node.expression, visitor, isExpression))
     );
   },
-  [355 /* CommaListExpression */]: function visitEachChildOfCommaListExpression(node, visitor, context, nodesVisitor, _nodeVisitor, _tokenVisitor) {
+  [354 /* CommaListExpression */]: function visitEachChildOfCommaListExpression(node, visitor, context, nodesVisitor, _nodeVisitor, _tokenVisitor) {
     return context.factory.updateCommaListExpression(
       node,
       nodesVisitor(node.elements, visitor, isExpression)
@@ -90118,7 +90015,7 @@ function transformClassFields(context) {
           /*discarded*/
           true
         );
-      case 355 /* CommaListExpression */:
+      case 354 /* CommaListExpression */:
         return visitCommaListExpression(
           node,
           /*discarded*/
@@ -93211,7 +93108,7 @@ function transformESDecorators(context) {
         return visitForStatement(node);
       case 244 /* ExpressionStatement */:
         return visitExpressionStatement(node);
-      case 355 /* CommaListExpression */:
+      case 354 /* CommaListExpression */:
         return visitCommaListExpression(
           node,
           /*discarded*/
@@ -93223,7 +93120,7 @@ function transformESDecorators(context) {
           /*discarded*/
           false
         );
-      case 354 /* PartiallyEmittedExpression */:
+      case 353 /* PartiallyEmittedExpression */:
         return visitPartiallyEmittedExpression(
           node,
           /*discarded*/
@@ -93309,7 +93206,7 @@ function transformESDecorators(context) {
           /*discarded*/
           true
         );
-      case 355 /* CommaListExpression */:
+      case 354 /* CommaListExpression */:
         return visitCommaListExpression(
           node,
           /*discarded*/
@@ -95900,7 +95797,7 @@ function transformES2018(context) {
         return visitObjectLiteralExpression(node);
       case 226 /* BinaryExpression */:
         return visitBinaryExpression(node, expressionResultIsUnused2);
-      case 355 /* CommaListExpression */:
+      case 354 /* CommaListExpression */:
         return visitCommaListExpression(node, expressionResultIsUnused2);
       case 299 /* CatchClause */:
         return visitCatchClause(node);
@@ -99123,7 +99020,7 @@ function transformES2015(context) {
         return visitParenthesizedExpression(node, expressionResultIsUnused2);
       case 226 /* BinaryExpression */:
         return visitBinaryExpression(node, expressionResultIsUnused2);
-      case 355 /* CommaListExpression */:
+      case 354 /* CommaListExpression */:
         return visitCommaListExpression(node, expressionResultIsUnused2);
       case 15 /* NoSubstitutionTemplateLiteral */:
       case 16 /* TemplateHead */:
@@ -102418,7 +102315,7 @@ function transformGenerators(context) {
     switch (node.kind) {
       case 226 /* BinaryExpression */:
         return visitBinaryExpression(node);
-      case 355 /* CommaListExpression */:
+      case 354 /* CommaListExpression */:
         return visitCommaListExpression(node);
       case 227 /* ConditionalExpression */:
         return visitConditionalExpression(node);
@@ -104808,7 +104705,7 @@ function transformModule(context) {
         return visitExpressionStatement(node);
       case 217 /* ParenthesizedExpression */:
         return visitParenthesizedExpression(node, valueIsDiscarded);
-      case 354 /* PartiallyEmittedExpression */:
+      case 353 /* PartiallyEmittedExpression */:
         return visitPartiallyEmittedExpression(node, valueIsDiscarded);
       case 213 /* CallExpression */:
         if (isImportCall(node) && currentSourceFile.impliedNodeFormat === void 0) {
@@ -107201,7 +107098,7 @@ function transformSystemModule(context) {
         return visitExpressionStatement(node);
       case 217 /* ParenthesizedExpression */:
         return visitParenthesizedExpression(node, valueIsDiscarded);
-      case 354 /* PartiallyEmittedExpression */:
+      case 353 /* PartiallyEmittedExpression */:
         return visitPartiallyEmittedExpression(node, valueIsDiscarded);
       case 226 /* BinaryExpression */:
         if (isDestructuringAssignment(node)) {
@@ -107944,9 +107841,17 @@ function createGetSymbolAccessibilityDiagnosticForNode(node) {
     return getImportEntityNameVisibilityError;
   } else if (isTypeAliasDeclaration(node) || isJSDocTypeAlias(node)) {
     return getTypeAliasDeclarationVisibilityError;
+  } else if (isExportAssignment(node)) {
+    return getExportAssignmentTypeVisibilityDiagnosticMessage;
   } else {
     return Debug.assertNever(node, `Attempted to set a declaration diagnostic context for unhandled node kind: ${Debug.formatSyntaxKind(node.kind)}`);
   }
+  function getExportAssignmentTypeVisibilityDiagnosticMessage() {
+    return {
+      diagnosticMessage: Diagnostics.Default_export_of_the_module_has_or_is_using_private_name_0,
+      errorNode: node
+    };
+  }
   function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
     if (node.kind === 260 /* VariableDeclaration */ || node.kind === 208 /* BindingElement */) {
       return symbolAccessibilityResult.errorModuleName ? symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ? Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named : Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 : Diagnostics.Exported_variable_0_has_or_is_using_private_name_1;
@@ -108192,6 +108097,7 @@ function transformDeclarations(context) {
   const resolver = context.getEmitResolver();
   const options = context.getCompilerOptions();
   const { noResolve, stripInternal } = options;
+  const strictNullChecks = getStrictOptionValue(options, "strictNullChecks");
   return transformRoot;
   function recordTypeReferenceDirectivesIfNecessary(typeReferenceDirectives) {
     if (!typeReferenceDirectives) {
@@ -108579,7 +108485,7 @@ function transformDeclarations(context) {
       );
     }
   }
-  function ensureParameter(p, modifierMask, type) {
+  function ensureParameter(p, modifierMask) {
     let oldDiag;
     if (!suppressNewDiagnosticContexts) {
       oldDiag = getSymbolAccessibilityDiagnostic;
@@ -108593,7 +108499,6 @@ function transformDeclarations(context) {
       resolver.isOptionalParameter(p) ? p.questionToken || factory2.createToken(58 /* QuestionToken */) : void 0,
       ensureType(
         p,
-        type || p.type,
         /*ignorePrivate*/
         true
       ),
@@ -108614,18 +108519,37 @@ function transformDeclarations(context) {
     }
     return void 0;
   }
-  function ensureType(node, type, ignorePrivate) {
+  function ensureType(node, ignorePrivate) {
     if (!ignorePrivate && hasEffectiveModifier(node, 2 /* Private */)) {
       return;
     }
     if (shouldPrintWithInitializer(node)) {
       return;
     }
-    const shouldAddImplicitUndefined = node.kind === 169 /* Parameter */ && resolver.requiresAddingImplicitUndefined(node);
-    if (type && !shouldAddImplicitUndefined) {
-      return visitNode(type, visitDeclarationSubtree, isTypeNode);
+    return typeFromDeclaration(node);
+  }
+  function inferVariableLikeType(node, addUndefined) {
+    const flags = node.kind === 303 /* PropertyAssignment */ ? 4194304 /* InObjectTypeLiteral */ : 0 /* None */;
+    return resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags | flags, symbolTracker, addUndefined) ?? factory2.createKeywordTypeNode(133 /* AnyKeyword */);
+  }
+  function inferExpressionType(node) {
+    return resolver.createTypeOfExpression(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker) ?? factory2.createKeywordTypeNode(133 /* AnyKeyword */);
+  }
+  function inferReturnTypeOfSignatureSignature(node) {
+    return resolver.createReturnTypeOfSignatureDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker) ?? factory2.createKeywordTypeNode(133 /* AnyKeyword */);
+  }
+  function inferAccessorType(node) {
+    if (node.kind === 177 /* GetAccessor */) {
+      return inferReturnTypeOfSignatureSignature(node);
+    } else {
+      return factory2.createKeywordTypeNode(133 /* AnyKeyword */);
     }
+  }
+  function typeFromDeclaration(node) {
+    const savedErrorNameNode = errorNameNode;
+    const savedErrorFallbackNode = errorFallbackNode;
     errorNameNode = node.name;
+    errorFallbackNode = node;
     let oldDiag;
     if (!suppressNewDiagnosticContexts) {
       oldDiag = getSymbolAccessibilityDiagnostic;
@@ -108634,28 +108558,142 @@ function transformDeclarations(context) {
     let typeNode;
     switch (node.kind) {
       case 169 /* Parameter */:
-      case 171 /* PropertySignature */:
+        typeNode = typeFromParameter(node);
+        break;
+      case 260 /* VariableDeclaration */:
+        typeNode = typeFromVariable(node);
+        break;
       case 172 /* PropertyDeclaration */:
+        typeNode = typeFromProperty(node);
+        break;
+      case 177 /* GetAccessor */:
+        typeNode = typeFromAccessor(node);
+        break;
       case 208 /* BindingElement */:
-      case 260 /* VariableDeclaration */:
-        typeNode = resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker, shouldAddImplicitUndefined);
+        typeNode = inferVariableLikeType(node);
         break;
-      case 262 /* FunctionDeclaration */:
       case 180 /* ConstructSignature */:
+      case 171 /* PropertySignature */:
       case 173 /* MethodSignature */:
-      case 174 /* MethodDeclaration */:
-      case 177 /* GetAccessor */:
       case 179 /* CallSignature */:
-        typeNode = resolver.createReturnTypeOfSignatureDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker);
+        typeNode = visitTypeNode(node.type) ?? factory2.createKeywordTypeNode(133 /* AnyKeyword */);
+        break;
+      case 174 /* MethodDeclaration */:
+      case 262 /* FunctionDeclaration */:
+        typeNode = visitTypeNode(node.type) ?? inferReturnTypeOfSignatureSignature(node);
+        break;
+      case 277 /* ExportAssignment */:
+        typeNode = typeFromExpression(node.expression) ?? inferExpressionType(node.expression);
         break;
       default:
-        Debug.assertNever(node);
+        Debug.assertNever(node, `Node needs to be an inferrable node, found ${Debug.formatSyntaxKind(node.kind)}`);
     }
-    errorNameNode = void 0;
+    errorNameNode = savedErrorNameNode;
+    errorFallbackNode = savedErrorFallbackNode;
     if (!suppressNewDiagnosticContexts) {
       getSymbolAccessibilityDiagnostic = oldDiag;
     }
-    return typeNode ?? factory2.createKeywordTypeNode(133 /* AnyKeyword */);
+    return typeNode;
+  }
+  function visitTypeNode(type) {
+    return visitNode(type, visitDeclarationSubtree, isTypeNode);
+  }
+  function addUndefinedInUnion(type) {
+    if (!strictNullChecks)
+      return type;
+    if (isUnionTypeNode(type)) {
+      const hasUndefined = type.types.some((p) => p.kind === 157 /* UndefinedKeyword */);
+      if (hasUndefined)
+        return type;
+      return factory2.createUnionTypeNode([
+        ...type.types,
+        factory2.createKeywordTypeNode(157 /* UndefinedKeyword */)
+      ]);
+    }
+    return factory2.createUnionTypeNode([
+      type,
+      factory2.createKeywordTypeNode(157 /* UndefinedKeyword */)
+    ]);
+  }
+  function canAddUndefined(node) {
+    if (!strictNullChecks)
+      return true;
+    if (isKeyword(node.kind) || node.kind === 201 /* LiteralType */ || node.kind === 184 /* FunctionType */ || node.kind === 185 /* ConstructorType */ || node.kind === 188 /* ArrayType */ || node.kind === 189 /* TupleType */ || node.kind === 187 /* TypeLiteral */ || node.kind === 203 /* TemplateLiteralType */ || node.kind === 197 /* ThisType */) {
+      return true;
+    }
+    if (node.kind === 196 /* ParenthesizedType */) {
+      return canAddUndefined(node.type);
+    }
+    if (node.kind === 192 /* UnionType */ || node.kind === 193 /* IntersectionType */) {
+      return node.types.every(canAddUndefined);
+    }
+    return false;
+  }
+  function typeFromExpression(node, requiresUndefined) {
+    switch (node.kind) {
+      case 216 /* TypeAssertionExpression */:
+      case 234 /* AsExpression */:
+        const asExpression = node;
+        const type = asExpression.type;
+        if (isConstTypeReference(asExpression.type) || requiresUndefined && !canAddUndefined(type)) {
+          return void 0;
+        } else {
+          return visitTypeNode(type);
+        }
+    }
+    return void 0;
+  }
+  function typeFromAccessor(node) {
+    const accessorDeclarations = resolver.getAllAccessorDeclarations(node);
+    const accessorType = getTypeAnnotationFromAllAccessorDeclarations(node, accessorDeclarations);
+    if (accessorType) {
+      return visitTypeNode(accessorType);
+    }
+    return inferAccessorType(accessorDeclarations.getAccessor ?? node);
+  }
+  function typeFromVariable(node) {
+    const declaredType = node.type;
+    if (declaredType) {
+      return visitNode(declaredType, visitDeclarationSubtree, isTypeNode);
+    }
+    let resultType;
+    if (node.initializer) {
+      resultType = typeFromExpression(node.initializer);
+    }
+    return resultType ?? inferVariableLikeType(node);
+  }
+  function typeFromParameter(node) {
+    const parent = node.parent;
+    if (parent.kind === 178 /* SetAccessor */) {
+      return typeFromAccessor(parent);
+    }
+    const declaredType = node.type;
+    const addUndefined = resolver.requiresAddingImplicitUndefined(node);
+    let resultType;
+    if (!addUndefined) {
+      if (declaredType) {
+        return visitTypeNode(declaredType);
+      }
+      if (node.initializer && isIdentifier(node.name)) {
+        resultType = typeFromExpression(node.initializer);
+      }
+    }
+    return resultType ?? inferVariableLikeType(node, addUndefined);
+  }
+  function typeFromProperty(node) {
+    const declaredType = node.type;
+    if (declaredType) {
+      return visitTypeNode(declaredType);
+    }
+    let resultType;
+    if (node.initializer) {
+      const isOptional = isOptionalDeclaration(node);
+      resultType = typeFromExpression(node.initializer, isOptional);
+      if (isOptional && resultType) {
+        return addUndefinedInUnion(resultType);
+      }
+    }
+    return resultType ?? inferVariableLikeType(node);
   }
   function isDeclarationAndNotVisible(node) {
     node = getParseTreeNode(node);
@@ -108720,12 +108758,10 @@ function transformDeclarations(context) {
       if (!isPrivate) {
         const valueParameter = getSetAccessorValueParameter(input);
         if (valueParameter) {
-          const accessorType = getTypeAnnotationFromAllAccessorDeclarations(input, resolver.getAllAccessorDeclarations(input));
           newValueParameter = ensureParameter(
             valueParameter,
             /*modifierMask*/
-            void 0,
-            accessorType
+            void 0
           );
         }
       }
@@ -108972,7 +109008,7 @@ function transformDeclarations(context) {
             input,
             ensureTypeParams(input, input.typeParameters),
             updateParamsList(input, input.parameters),
-            ensureType(input, input.type)
+            ensureType(input)
           ));
         case 176 /* Constructor */: {
           const ctor = factory2.createConstructorDeclaration(
@@ -108999,7 +109035,7 @@ function transformDeclarations(context) {
             input.questionToken,
             ensureTypeParams(input, input.typeParameters),
             updateParamsList(input, input.parameters),
-            ensureType(input, input.type),
+            ensureType(input),
             /*body*/
             void 0
           );
@@ -109012,13 +109048,12 @@ function transformDeclarations(context) {
               void 0
             );
           }
-          const accessorType = getTypeAnnotationFromAllAccessorDeclarations(input, resolver.getAllAccessorDeclarations(input));
           return cleanup(factory2.updateGetAccessorDeclaration(
             input,
             ensureModifiers(input),
             input.name,
             updateAccessorParamsList(input, hasEffectiveModifier(input, 2 /* Private */)),
-            ensureType(input, accessorType),
+            ensureType(input),
             /*body*/
             void 0
           ));
@@ -109051,7 +109086,7 @@ function transformDeclarations(context) {
             ensureModifiers(input),
             input.name,
             input.questionToken,
-            ensureType(input, input.type),
+            ensureType(input),
             ensureNoInitializer(input)
           ));
         case 171 /* PropertySignature */:
@@ -109066,7 +109101,7 @@ function transformDeclarations(context) {
             ensureModifiers(input),
             input.name,
             input.questionToken,
-            ensureType(input, input.type)
+            ensureType(input)
           ));
         case 173 /* MethodSignature */: {
           if (isPrivateIdentifier(input.name)) {
@@ -109082,7 +109117,7 @@ function transformDeclarations(context) {
             input.questionToken,
             ensureTypeParams(input, input.typeParameters),
             updateParamsList(input, input.parameters),
-            ensureType(input, input.type)
+            ensureType(input)
           ));
         }
         case 179 /* CallSignature */: {
@@ -109091,7 +109126,7 @@ function transformDeclarations(context) {
               input,
               ensureTypeParams(input, input.typeParameters),
               updateParamsList(input, input.parameters),
-              ensureType(input, input.type)
+              ensureType(input)
             )
           );
         }
@@ -109114,7 +109149,7 @@ function transformDeclarations(context) {
             input.name,
             /*exclamationToken*/
             void 0,
-            ensureType(input, input.type),
+            ensureType(input),
             ensureNoInitializer(input)
           ));
         }
@@ -109242,11 +109277,12 @@ function transformDeclarations(context) {
             errorNode: input
           });
           errorFallbackNode = input;
+          const type = ensureType(input);
           const varDecl = factory2.createVariableDeclaration(
             newId,
             /*exclamationToken*/
             void 0,
-            resolver.createTypeOfExpression(input.expression, input, declarationEmitNodeBuilderFlags, symbolTracker),
+            type,
             /*initializer*/
             void 0
           );
@@ -109309,8 +109345,6 @@ function transformDeclarations(context) {
     }
     if (isDeclaration(input) && isDeclarationAndNotVisible(input))
       return;
-    if (isJSDocImportTag(input))
-      return;
     if (isFunctionLike(input) && resolver.isImplementationOfOverload(input))
       return;
     let previousEnclosingDeclaration;
@@ -109356,7 +109390,7 @@ function transformDeclarations(context) {
           input.name,
           ensureTypeParams(input, input.typeParameters),
           updateParamsList(input, input.parameters),
-          ensureType(input, input.type),
+          ensureType(input),
           /*body*/
           void 0
         ));
@@ -109522,7 +109556,7 @@ function transformDeclarations(context) {
                   ensureModifiers(param),
                   param.name,
                   param.questionToken,
-                  ensureType(param, param.type),
+                  ensureType(param),
                   ensureNoInitializer(param)
                 ),
                 param
@@ -109544,11 +109578,7 @@ function transformDeclarations(context) {
                   elem.name,
                   /*questionOrExclamationToken*/
                   void 0,
-                  ensureType(
-                    elem,
-                    /*type*/
-                    void 0
-                  ),
+                  ensureType(elem),
                   /*initializer*/
                   void 0
                 ));
@@ -109697,11 +109727,7 @@ function transformDeclarations(context) {
           e.name,
           /*exclamationToken*/
           void 0,
-          ensureType(
-            e,
-            /*type*/
-            void 0
-          ),
+          ensureType(e),
           /*initializer*/
           void 0
         );
@@ -109958,7 +109984,7 @@ function noEmitNotification(hint, node, callback) {
 }
 function transformNodes(resolver, host, factory2, options, nodes, transformers, allowDtsFiles) {
   var _a, _b;
-  const enabledSyntaxKindFeatures = new Array(357 /* Count */);
+  const enabledSyntaxKindFeatures = new Array(356 /* Count */);
   let lexicalEnvironmentVariableDeclarations;
   let lexicalEnvironmentFunctionDeclarations;
   let lexicalEnvironmentStatements;
@@ -111531,9 +111557,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
           return emitJSDocTypedefTag(node);
         case 347 /* JSDocSeeTag */:
           return emitJSDocSeeTag(node);
-        case 351 /* JSDocImportTag */:
-          return emitJSDocImportTag(node);
-        case 353 /* NotEmittedStatement */:
+        case 352 /* NotEmittedStatement */:
           return;
       }
       if (isExpression(node)) {
@@ -111634,15 +111658,15 @@ function createPrinter(printerOptions = {}, handlers = {}) {
           return emitJsxSelfClosingElement(node);
         case 288 /* JsxFragment */:
           return emitJsxFragment(node);
-        case 352 /* SyntaxList */:
+        case 351 /* SyntaxList */:
           return Debug.fail("SyntaxList should not be printed");
-        case 353 /* NotEmittedStatement */:
+        case 352 /* NotEmittedStatement */:
           return;
-        case 354 /* PartiallyEmittedExpression */:
+        case 353 /* PartiallyEmittedExpression */:
           return emitPartiallyEmittedExpression(node);
-        case 355 /* CommaListExpression */:
+        case 354 /* CommaListExpression */:
           return emitCommaList(node);
-        case 356 /* SyntheticReferenceExpression */:
+        case 355 /* SyntheticReferenceExpression */:
           return Debug.fail("SyntheticReferenceExpression should not be printed");
       }
     }
@@ -113486,21 +113510,6 @@ 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("{");
@@ -114915,7 +114924,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
         emitLeadingComments(
           pos,
           /*isEmittedNode*/
-          node.kind !== 353 /* NotEmittedStatement */
+          node.kind !== 352 /* NotEmittedStatement */
         );
       }
       if (!skipLeadingComments || pos >= 0 && (emitFlags & 1024 /* NoLeadingComments */) !== 0) {
@@ -114939,7 +114948,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
       containerPos = savedContainerPos;
       containerEnd = savedContainerEnd;
       declarationListContainerEnd = savedDeclarationListContainerEnd;
-      if (!skipTrailingComments && node.kind !== 353 /* NotEmittedStatement */) {
+      if (!skipTrailingComments && node.kind !== 352 /* NotEmittedStatement */) {
         emitTrailingComments(end);
       }
     }
@@ -115191,7 +115200,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     const emitFlags = getEmitFlags(node);
     const sourceMapRange = getSourceMapRange(node);
     const source = sourceMapRange.source || sourceMapSource;
-    if (node.kind !== 353 /* NotEmittedStatement */ && (emitFlags & 32 /* NoLeadingSourceMap */) === 0 && sourceMapRange.pos >= 0) {
+    if (node.kind !== 352 /* NotEmittedStatement */ && (emitFlags & 32 /* NoLeadingSourceMap */) === 0 && sourceMapRange.pos >= 0) {
       emitSourcePos(sourceMapRange.source || sourceMapSource, skipSourceTrivia(source, sourceMapRange.pos));
     }
     if (emitFlags & 128 /* NoNestedSourceMaps */) {
@@ -115204,7 +115213,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     if (emitFlags & 128 /* NoNestedSourceMaps */) {
       sourceMapsDisabled = false;
     }
-    if (node.kind !== 353 /* NotEmittedStatement */ && (emitFlags & 64 /* NoTrailingSourceMap */) === 0 && sourceMapRange.end >= 0) {
+    if (node.kind !== 352 /* NotEmittedStatement */ && (emitFlags & 64 /* NoTrailingSourceMap */) === 0 && sourceMapRange.end >= 0) {
       emitSourcePos(sourceMapRange.source || sourceMapSource, sourceMapRange.end);
     }
   }
@@ -118086,7 +118095,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       );
     }
     if (file.flags & 4194304 /* PossiblyContainsDynamicImport */ || isJavaScriptFile) {
-      collectDynamicImportOrRequireOrJsDocImportCalls(file);
+      collectDynamicImportOrRequireCalls(file);
     }
     file.imports = imports || emptyArray;
     file.moduleAugmentations = moduleAugmentations || emptyArray;
@@ -118130,7 +118139,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         }
       }
     }
-    function collectDynamicImportOrRequireOrJsDocImportCalls(file2) {
+    function collectDynamicImportOrRequireCalls(file2) {
       const r = /import|require/g;
       while (r.exec(file2.text) !== null) {
         const node = getNodeAtPosition(file2, r.lastIndex);
@@ -118159,16 +118168,6 @@ 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);
-          }
         }
       }
     }