typescript 4.7.0-dev.20220406 → 4.7.0-dev.20220416

package/lib/tsserverlibrary.js

@@ -294,7 +294,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220406";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220416";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -4854,7 +4854,6 @@ var ts;
         NodeBuilderFlags[NodeBuilderFlags["UseAliasDefinedOutsideCurrentScope"] = 16384] = "UseAliasDefinedOutsideCurrentScope";
         NodeBuilderFlags[NodeBuilderFlags["UseSingleQuotesForStringLiteralType"] = 268435456] = "UseSingleQuotesForStringLiteralType";
         NodeBuilderFlags[NodeBuilderFlags["NoTypeReduction"] = 536870912] = "NoTypeReduction";
-        NodeBuilderFlags[NodeBuilderFlags["NoUndefinedOptionalParameterType"] = 1073741824] = "NoUndefinedOptionalParameterType";
         // Error handling
         NodeBuilderFlags[NodeBuilderFlags["AllowThisInObjectLiteral"] = 32768] = "AllowThisInObjectLiteral";
         NodeBuilderFlags[NodeBuilderFlags["AllowQualifiedNameInPlaceOfIdentifier"] = 65536] = "AllowQualifiedNameInPlaceOfIdentifier";
@@ -8911,6 +8910,7 @@ var ts;
         _0_index_signatures_are_incompatible: diag(2634, ts.DiagnosticCategory.Error, "_0_index_signatures_are_incompatible_2634", "'{0}' index signatures are incompatible."),
         Type_0_has_no_signatures_for_which_the_type_argument_list_is_applicable: diag(2635, ts.DiagnosticCategory.Error, "Type_0_has_no_signatures_for_which_the_type_argument_list_is_applicable_2635", "Type '{0}' has no signatures for which the type argument list is applicable."),
         Type_0_is_not_assignable_to_type_1_as_implied_by_variance_annotation: diag(2636, ts.DiagnosticCategory.Error, "Type_0_is_not_assignable_to_type_1_as_implied_by_variance_annotation_2636", "Type '{0}' is not assignable to type '{1}' as implied by variance annotation."),
+        Variance_annotations_are_only_supported_in_type_aliases_for_object_function_constructor_and_mapped_types: diag(2637, ts.DiagnosticCategory.Error, "Variance_annotations_are_only_supported_in_type_aliases_for_object_function_constructor_and_mapped_t_2637", "Variance annotations are only supported in type aliases for object, function, constructor, and mapped types."),
         Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity: diag(2649, ts.DiagnosticCategory.Error, "Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity_2649", "Cannot augment module '{0}' with value exports because it resolves to a non-module entity."),
         A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums: diag(2651, ts.DiagnosticCategory.Error, "A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_memb_2651", "A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums."),
         Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead: diag(2652, ts.DiagnosticCategory.Error, "Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_d_2652", "Merged declaration '{0}' cannot include a default export declaration. Consider adding a separate 'export default {0}' declaration instead."),
@@ -15159,6 +15159,10 @@ var ts;
         }
     }
     ts.isAnyImportSyntax = isAnyImportSyntax;
+    function isAnyImportOrBareOrAccessedRequire(node) {
+        return isAnyImportSyntax(node) || isVariableDeclarationInitializedToBareOrAccessedRequire(node);
+    }
+    ts.isAnyImportOrBareOrAccessedRequire = isAnyImportOrBareOrAccessedRequire;
     function isLateVisibilityPaintedStatement(node) {
         switch (node.kind) {
             case 266 /* ImportDeclaration */:
@@ -16519,17 +16523,13 @@ var ts;
         if (isPropertyNameLiteral(name) && isPropertyNameLiteral(initializer)) {
             return getTextOfIdentifierOrLiteral(name) === getTextOfIdentifierOrLiteral(initializer);
         }
-        if (ts.isIdentifier(name) && isLiteralLikeAccess(initializer) &&
+        if (ts.isMemberName(name) && isLiteralLikeAccess(initializer) &&
             (initializer.expression.kind === 108 /* ThisKeyword */ ||
                 ts.isIdentifier(initializer.expression) &&
                     (initializer.expression.escapedText === "window" ||
                         initializer.expression.escapedText === "self" ||
                         initializer.expression.escapedText === "global"))) {
-            var nameOrArgument = getNameOrArgument(initializer);
-            if (ts.isPrivateIdentifier(nameOrArgument)) {
-                ts.Debug.fail("Unexpected PrivateIdentifier in name expression with literal-like access.");
-            }
-            return isSameEntityName(name, nameOrArgument);
+            return isSameEntityName(name, getNameOrArgument(initializer));
         }
         if (isLiteralLikeAccess(name) && isLiteralLikeAccess(initializer)) {
             return getElementOrPropertyAccessName(name) === getElementOrPropertyAccessName(initializer)
@@ -16737,14 +16737,14 @@ var ts;
     }
     ts.isFunctionSymbol = isFunctionSymbol;
     function tryGetModuleSpecifierFromDeclaration(node) {
-        var _a, _b, _c;
+        var _a, _b;
         switch (node.kind) {
             case 254 /* VariableDeclaration */:
-                return node.initializer.arguments[0].text;
+                return (_a = ts.findAncestor(node.initializer, function (node) { return isRequireCall(node, /*requireStringLiteralLikeArgument*/ true); })) === null || _a === void 0 ? void 0 : _a.arguments[0];
             case 266 /* ImportDeclaration */:
-                return (_a = ts.tryCast(node.moduleSpecifier, ts.isStringLiteralLike)) === null || _a === void 0 ? void 0 : _a.text;
+                return ts.tryCast(node.moduleSpecifier, ts.isStringLiteralLike);
             case 265 /* ImportEqualsDeclaration */:
-                return (_c = ts.tryCast((_b = ts.tryCast(node.moduleReference, ts.isExternalModuleReference)) === null || _b === void 0 ? void 0 : _b.expression, ts.isStringLiteralLike)) === null || _c === void 0 ? void 0 : _c.text;
+                return ts.tryCast((_b = ts.tryCast(node.moduleReference, ts.isExternalModuleReference)) === null || _b === void 0 ? void 0 : _b.expression, ts.isStringLiteralLike);
             default:
                 ts.Debug.assertNever(node);
         }
@@ -17259,7 +17259,10 @@ var ts;
                 return parent.propertyName === node;
             case 275 /* ExportSpecifier */:
             case 285 /* JsxAttribute */:
-                // Any name in an export specifier or JSX Attribute
+            case 279 /* JsxSelfClosingElement */:
+            case 280 /* JsxOpeningElement */:
+            case 281 /* JsxClosingElement */:
+                // Any name in an export specifier or JSX Attribute or Jsx Element
                 return true;
         }
         return false;
@@ -17275,21 +17278,28 @@ var ts;
     // export = <EntityNameExpression>
     // export default <EntityNameExpression>
     // module.exports = <EntityNameExpression>
-    // {<Identifier>}
-    // {name: <EntityNameExpression>}
+    // module.exports.x = <EntityNameExpression>
+    // const x = require("...")
+    // const { x } = require("...")
+    // const x = require("...").y
+    // const { x } = require("...").y
     function isAliasSymbolDeclaration(node) {
-        return node.kind === 265 /* ImportEqualsDeclaration */ ||
+        if (node.kind === 265 /* ImportEqualsDeclaration */ ||
             node.kind === 264 /* NamespaceExportDeclaration */ ||
             node.kind === 267 /* ImportClause */ && !!node.name ||
             node.kind === 268 /* NamespaceImport */ ||
             node.kind === 274 /* NamespaceExport */ ||
             node.kind === 270 /* ImportSpecifier */ ||
             node.kind === 275 /* ExportSpecifier */ ||
-            node.kind === 271 /* ExportAssignment */ && exportAssignmentIsAlias(node) ||
-            ts.isBinaryExpression(node) && getAssignmentDeclarationKind(node) === 2 /* ModuleExports */ && exportAssignmentIsAlias(node) ||
-            ts.isPropertyAccessExpression(node) && ts.isBinaryExpression(node.parent) && node.parent.left === node && node.parent.operatorToken.kind === 63 /* EqualsToken */ && isAliasableExpression(node.parent.right) ||
-            node.kind === 297 /* ShorthandPropertyAssignment */ ||
-            node.kind === 296 /* PropertyAssignment */ && isAliasableExpression(node.initializer);
+            node.kind === 271 /* ExportAssignment */ && exportAssignmentIsAlias(node)) {
+            return true;
+        }
+        return isInJSFile(node) && (ts.isBinaryExpression(node) && getAssignmentDeclarationKind(node) === 2 /* ModuleExports */ && exportAssignmentIsAlias(node) ||
+            ts.isPropertyAccessExpression(node)
+                && ts.isBinaryExpression(node.parent)
+                && node.parent.left === node
+                && node.parent.operatorToken.kind === 63 /* EqualsToken */
+                && isAliasableExpression(node.parent.right));
     }
     ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
     function getAliasDeclarationFromName(node) {
@@ -17300,6 +17310,7 @@ var ts;
             case 275 /* ExportSpecifier */:
             case 271 /* ExportAssignment */:
             case 265 /* ImportEqualsDeclaration */:
+            case 274 /* NamespaceExport */:
                 return node.parent;
             case 161 /* QualifiedName */:
                 do {
@@ -19126,6 +19137,11 @@ var ts;
             (node.parent.kind === 206 /* PropertyAccessExpression */ && node.parent.name === node);
     }
     ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
+    function isRightSideOfAccessExpression(node) {
+        return ts.isPropertyAccessExpression(node.parent) && node.parent.name === node
+            || ts.isElementAccessExpression(node.parent) && node.parent.argumentExpression === node;
+    }
+    ts.isRightSideOfAccessExpression = isRightSideOfAccessExpression;
     function isRightSideOfQualifiedNameOrPropertyAccessOrJSDocMemberName(node) {
         return ts.isQualifiedName(node.parent) && node.parent.right === node
             || ts.isPropertyAccessExpression(node.parent) && node.parent.name === node
@@ -19777,6 +19793,41 @@ var ts;
         return expr;
     }
     ts.getLeftmostAccessExpression = getLeftmostAccessExpression;
+    function forEachNameInAccessChainWalkingLeft(name, action) {
+        if (isAccessExpression(name.parent) && isRightSideOfAccessExpression(name)) {
+            return walkAccessExpression(name.parent);
+        }
+        function walkAccessExpression(access) {
+            if (access.kind === 206 /* PropertyAccessExpression */) {
+                var res = action(access.name);
+                if (res !== undefined) {
+                    return res;
+                }
+            }
+            else if (access.kind === 207 /* ElementAccessExpression */) {
+                if (ts.isIdentifier(access.argumentExpression) || ts.isStringLiteralLike(access.argumentExpression)) {
+                    var res = action(access.argumentExpression);
+                    if (res !== undefined) {
+                        return res;
+                    }
+                }
+                else {
+                    // Chain interrupted by non-static-name access 'x[expr()].y.z'
+                    return undefined;
+                }
+            }
+            if (isAccessExpression(access.expression)) {
+                return walkAccessExpression(access.expression);
+            }
+            if (ts.isIdentifier(access.expression)) {
+                // End of chain at Identifier 'x.y.z'
+                return action(access.expression);
+            }
+            // End of chain at non-Identifier 'x().y.z'
+            return undefined;
+        }
+    }
+    ts.forEachNameInAccessChainWalkingLeft = forEachNameInAccessChainWalkingLeft;
     function getLeftmostExpression(node, stopAtCallExpressions) {
         while (true) {
             switch (node.kind) {
@@ -20724,6 +20775,7 @@ var ts;
     ts.supportedJSExtensionsFlat = ts.flatten(ts.supportedJSExtensions);
     var allSupportedExtensions = [[".ts" /* Ts */, ".tsx" /* Tsx */, ".d.ts" /* Dts */, ".js" /* Js */, ".jsx" /* Jsx */], [".cts" /* Cts */, ".d.cts" /* Dcts */, ".cjs" /* Cjs */], [".mts" /* Mts */, ".d.mts" /* Dmts */, ".mjs" /* Mjs */]];
     var allSupportedExtensionsWithJson = __spreadArray(__spreadArray([], allSupportedExtensions, true), [[".json" /* Json */]], false);
+    ts.supportedDeclarationExtensions = [".d.ts" /* Dts */, ".d.cts" /* Dcts */, ".d.mts" /* Dmts */];
     function getSupportedExtensions(options, extraFileExtensions) {
         var needJsExtensions = options && getAllowJSCompilerOption(options);
         if (!extraFileExtensions || extraFileExtensions.length === 0) {
@@ -21412,6 +21464,11 @@ var ts;
         return state > 1 /* NodeModules */ ? { topLevelNodeModulesIndex: topLevelNodeModulesIndex, topLevelPackageNameIndex: topLevelPackageNameIndex, packageRootIndex: packageRootIndex, fileNameIndex: fileNameIndex } : undefined;
     }
     ts.getNodeModulePathParts = getNodeModulePathParts;
+    function getParameterTypeNode(parameter) {
+        var _a;
+        return parameter.kind === 340 /* JSDocParameterTag */ ? (_a = parameter.typeExpression) === null || _a === void 0 ? void 0 : _a.type : parameter.type;
+    }
+    ts.getParameterTypeNode = getParameterTypeNode;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
@@ -35565,34 +35622,10 @@ var ts;
                 case 20 /* OpenParenToken */: // foo<x>(
                 case 14 /* NoSubstitutionTemplateLiteral */: // foo<T> `...`
                 case 15 /* TemplateHead */: // foo<T> `...${100}...`
-                // These tokens can't follow in a call expression, nor can they start an
-                // expression. So, consider the type argument list part of an instantiation
-                // expression.
-                // falls through
-                case 27 /* CommaToken */: // foo<x>,
-                case 24 /* DotToken */: // foo<x>.
-                case 28 /* QuestionDotToken */: // foo<x>?.
-                case 21 /* CloseParenToken */: // foo<x>)
-                case 23 /* CloseBracketToken */: // foo<x>]
-                case 58 /* ColonToken */: // foo<x>:
-                case 26 /* SemicolonToken */: // foo<x>;
-                case 57 /* QuestionToken */: // foo<x>?
-                case 34 /* EqualsEqualsToken */: // foo<x> ==
-                case 36 /* EqualsEqualsEqualsToken */: // foo<x> ===
-                case 35 /* ExclamationEqualsToken */: // foo<x> !=
-                case 37 /* ExclamationEqualsEqualsToken */: // foo<x> !==
-                case 55 /* AmpersandAmpersandToken */: // foo<x> &&
-                case 56 /* BarBarToken */: // foo<x> ||
-                case 60 /* QuestionQuestionToken */: // foo<x> ??
-                case 52 /* CaretToken */: // foo<x> ^
-                case 50 /* AmpersandToken */: // foo<x> &
-                case 51 /* BarToken */: // foo<x> |
-                case 19 /* CloseBraceToken */: // foo<x> }
-                case 1 /* EndOfFileToken */: // foo<x>
                     return true;
             }
-            // Treat anything else as an expression.
-            return false;
+            // Consider something a type argument list only if the following token can't start an expression.
+            return !isStartOfExpression();
         }
         function parsePrimaryExpression() {
             switch (token()) {
@@ -38810,7 +38843,7 @@ var ts;
     })(IncrementalParser || (IncrementalParser = {}));
     /** @internal */
     function isDeclarationFileName(fileName) {
-        return ts.fileExtensionIsOneOf(fileName, [".d.ts" /* Dts */, ".d.mts" /* Dmts */, ".d.cts" /* Dcts */]);
+        return ts.fileExtensionIsOneOf(fileName, ts.supportedDeclarationExtensions);
     }
     ts.isDeclarationFileName = isDeclarationFileName;
     function parseResolutionMode(mode, pos, end, reportDiagnostic) {
@@ -42318,7 +42351,8 @@ var ts;
         Extensions[Extensions["JavaScript"] = 1] = "JavaScript";
         Extensions[Extensions["Json"] = 2] = "Json";
         Extensions[Extensions["TSConfig"] = 3] = "TSConfig";
-        Extensions[Extensions["DtsOnly"] = 4] = "DtsOnly"; /** Only '.d.ts' */
+        Extensions[Extensions["DtsOnly"] = 4] = "DtsOnly";
+        Extensions[Extensions["TsOnly"] = 5] = "TsOnly";
     })(Extensions || (Extensions = {}));
     /** Used with `Extensions.DtsOnly` to extract the path from TypeScript results. */
     function resolvedTypeScriptOnly(resolved) {
@@ -43263,7 +43297,21 @@ var ts;
         return nodeModuleNameResolverWorker(NodeResolutionFeatures.None, moduleName, initialDir, { moduleResolution: ts.ModuleResolutionKind.NodeJs, allowJs: true }, host, /*cache*/ undefined, jsOnlyExtensions, /*redirectedReferences*/ undefined);
     }
     function nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, lookupConfig) {
-        return nodeModuleNameResolverWorker(NodeResolutionFeatures.None, moduleName, ts.getDirectoryPath(containingFile), compilerOptions, host, cache, lookupConfig ? tsconfigExtensions : (compilerOptions.resolveJsonModule ? tsPlusJsonExtensions : tsExtensions), redirectedReference);
+        var extensions;
+        if (lookupConfig) {
+            extensions = tsconfigExtensions;
+        }
+        else if (compilerOptions.noDtsResolution) {
+            extensions = [Extensions.TsOnly];
+            if (compilerOptions.allowJs)
+                extensions.push(Extensions.JavaScript);
+            if (compilerOptions.resolveJsonModule)
+                extensions.push(Extensions.Json);
+        }
+        else {
+            extensions = compilerOptions.resolveJsonModule ? tsPlusJsonExtensions : tsExtensions;
+        }
+        return nodeModuleNameResolverWorker(NodeResolutionFeatures.None, moduleName, ts.getDirectoryPath(containingFile), compilerOptions, host, cache, extensions, redirectedReference);
     }
     ts.nodeModuleNameResolver = nodeModuleNameResolver;
     function nodeModuleNameResolverWorker(features, moduleName, containingDirectory, compilerOptions, host, cache, extensions, redirectedReference) {
@@ -43272,6 +43320,10 @@ var ts;
         var failedLookupLocations = [];
         // conditions are only used by the node12/nodenext resolver - there's no priority order in the list,
         //it's essentially a set (priority is determined by object insertion order in the object we look at).
+        var conditions = features & NodeResolutionFeatures.EsmMode ? ["node", "import", "types"] : ["node", "require", "types"];
+        if (compilerOptions.noDtsResolution) {
+            conditions.pop();
+        }
         var state = {
             compilerOptions: compilerOptions,
             host: host,
@@ -43279,7 +43331,7 @@ var ts;
             failedLookupLocations: failedLookupLocations,
             packageJsonInfoCache: cache,
             features: features,
-            conditions: features & NodeResolutionFeatures.EsmMode ? ["node", "import", "types"] : ["node", "require", "types"]
+            conditions: conditions,
         };
         var result = ts.forEach(extensions, function (ext) { return tryResolve(ext); });
         return createResolvedModuleWithFailedLookupLocations((_a = result === null || result === void 0 ? void 0 : result.value) === null || _a === void 0 ? void 0 : _a.resolved, (_b = result === null || result === void 0 ? void 0 : result.value) === null || _b === void 0 ? void 0 : _b.isExternalLibraryImport, failedLookupLocations, state.resultFromCache);
@@ -43455,9 +43507,9 @@ var ts;
         }
     }
     function loadJSOrExactTSFileName(extensions, candidate, onlyRecordFailures, state) {
-        if ((extensions === Extensions.TypeScript || extensions === Extensions.DtsOnly) && ts.fileExtensionIsOneOf(candidate, [".d.ts" /* Dts */, ".d.cts" /* Dcts */, ".d.mts" /* Dmts */])) {
+        if ((extensions === Extensions.TypeScript || extensions === Extensions.DtsOnly) && ts.isDeclarationFileName(candidate)) {
             var result = tryFile(candidate, onlyRecordFailures, state);
-            return result !== undefined ? { path: candidate, ext: ts.forEach([".d.ts" /* Dts */, ".d.cts" /* Dcts */, ".d.mts" /* Dmts */], function (e) { return ts.fileExtensionIs(candidate, e) ? e : undefined; }) } : undefined;
+            return result !== undefined ? { path: candidate, ext: ts.forEach(ts.supportedDeclarationExtensions, function (e) { return ts.fileExtensionIs(candidate, e) ? e : undefined; }) } : undefined;
         }
         return loadModuleFromFileNoImplicitExtensions(extensions, candidate, onlyRecordFailures, state);
     }
@@ -43487,20 +43539,22 @@ var ts;
                     default: return tryExtension(".d.ts" /* Dts */);
                 }
             case Extensions.TypeScript:
+            case Extensions.TsOnly:
+                var useDts = extensions === Extensions.TypeScript;
                 switch (originalExtension) {
                     case ".mjs" /* Mjs */:
                     case ".mts" /* Mts */:
                     case ".d.mts" /* Dmts */:
-                        return tryExtension(".mts" /* Mts */) || tryExtension(".d.mts" /* Dmts */);
+                        return tryExtension(".mts" /* Mts */) || (useDts ? tryExtension(".d.mts" /* Dmts */) : undefined);
                     case ".cjs" /* Cjs */:
                     case ".cts" /* Cts */:
                     case ".d.cts" /* Dcts */:
-                        return tryExtension(".cts" /* Cts */) || tryExtension(".d.cts" /* Dcts */);
+                        return tryExtension(".cts" /* Cts */) || (useDts ? tryExtension(".d.cts" /* Dcts */) : undefined);
                     case ".json" /* Json */:
                         candidate += ".json" /* Json */;
-                        return tryExtension(".d.ts" /* Dts */);
+                        return useDts ? tryExtension(".d.ts" /* Dts */) : undefined;
                     default:
-                        return tryExtension(".ts" /* Ts */) || tryExtension(".tsx" /* Tsx */) || tryExtension(".d.ts" /* Dts */);
+                        return tryExtension(".ts" /* Ts */) || tryExtension(".tsx" /* Tsx */) || (useDts ? tryExtension(".d.ts" /* Dts */) : undefined);
                 }
             case Extensions.JavaScript:
                 switch (originalExtension) {
@@ -43727,6 +43781,7 @@ var ts;
             switch (extensions) {
                 case Extensions.JavaScript:
                 case Extensions.Json:
+                case Extensions.TsOnly:
                     packageFile = readPackageJsonMainField(jsonContent, candidate, state);
                     break;
                 case Extensions.TypeScript:
@@ -43799,14 +43854,16 @@ var ts;
     function extensionIsOk(extensions, extension) {
         switch (extensions) {
             case Extensions.JavaScript:
-                return extension === ".js" /* Js */ || extension === ".jsx" /* Jsx */;
+                return extension === ".js" /* Js */ || extension === ".jsx" /* Jsx */ || extension === ".mjs" /* Mjs */ || extension === ".cjs" /* Cjs */;
             case Extensions.TSConfig:
             case Extensions.Json:
                 return extension === ".json" /* Json */;
             case Extensions.TypeScript:
-                return extension === ".ts" /* Ts */ || extension === ".tsx" /* Tsx */ || extension === ".d.ts" /* Dts */;
+                return extension === ".ts" /* Ts */ || extension === ".tsx" /* Tsx */ || extension === ".mts" /* Mts */ || extension === ".cts" /* Cts */ || extension === ".d.ts" /* Dts */ || extension === ".d.mts" /* Dmts */ || extension === ".d.cts" /* Dcts */;
+            case Extensions.TsOnly:
+                return extension === ".ts" /* Ts */ || extension === ".tsx" /* Tsx */ || extension === ".mts" /* Mts */ || extension === ".cts" /* Cts */;
             case Extensions.DtsOnly:
-                return extension === ".d.ts" /* Dts */;
+                return extension === ".d.ts" /* Dts */ || extension === ".d.mts" /* Dmts */ || extension === ".d.cts" /* Dcts */;
         }
     }
     /* @internal */
@@ -45966,6 +46023,7 @@ var ts;
                 case 261 /* ModuleDeclaration */:
                 case 259 /* TypeAliasDeclaration */:
                 case 195 /* MappedType */:
+                case 176 /* IndexSignature */:
                     return 1 /* IsContainer */ | 32 /* HasLocals */;
                 case 305 /* SourceFile */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */;
@@ -45984,7 +46042,6 @@ var ts;
                 case 317 /* JSDocFunctionType */:
                 case 179 /* FunctionType */:
                 case 175 /* ConstructSignature */:
-                case 176 /* IndexSignature */:
                 case 180 /* ConstructorType */:
                 case 170 /* ClassStaticBlockDeclaration */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
@@ -50562,27 +50619,27 @@ var ts;
         function resolveAlias(symbol) {
             ts.Debug.assert((symbol.flags & 2097152 /* Alias */) !== 0, "Should only get Alias here.");
             var links = getSymbolLinks(symbol);
-            if (!links.target) {
-                links.target = resolvingSymbol;
+            if (!links.aliasTarget) {
+                links.aliasTarget = resolvingSymbol;
                 var node = getDeclarationOfAliasSymbol(symbol);
                 if (!node)
                     return ts.Debug.fail();
                 var target = getTargetOfAliasDeclaration(node);
-                if (links.target === resolvingSymbol) {
-                    links.target = target || unknownSymbol;
+                if (links.aliasTarget === resolvingSymbol) {
+                    links.aliasTarget = target || unknownSymbol;
                 }
                 else {
                     error(node, ts.Diagnostics.Circular_definition_of_import_alias_0, symbolToString(symbol));
                 }
             }
-            else if (links.target === resolvingSymbol) {
-                links.target = unknownSymbol;
+            else if (links.aliasTarget === resolvingSymbol) {
+                links.aliasTarget = unknownSymbol;
             }
-            return links.target;
+            return links.aliasTarget;
         }
         function tryResolveAlias(symbol) {
             var links = getSymbolLinks(symbol);
-            if (links.target !== resolvingSymbol) {
+            if (links.aliasTarget !== resolvingSymbol) {
                 return resolveAlias(symbol);
             }
             return undefined;
@@ -52379,13 +52436,37 @@ var ts;
                 return ts.Debug.fail("Should be unreachable.");
                 function conditionalTypeToTypeNode(type) {
                     var checkTypeNode = typeToTypeNodeHelper(type.checkType, context);
+                    context.approximateLength += 15;
+                    if (context.flags & 4 /* GenerateNamesForShadowedTypeParams */ && type.root.isDistributive && !(type.checkType.flags & 262144 /* TypeParameter */)) {
+                        var newParam = createTypeParameter(createSymbol(262144 /* TypeParameter */, "T"));
+                        var name = typeParameterToName(newParam, context);
+                        var newTypeVariable = ts.factory.createTypeReferenceNode(name);
+                        context.approximateLength += 37; // 15 each for two added conditionals, 7 for an added infer type
+                        var newMapper = prependTypeMapping(type.root.checkType, newParam, type.combinedMapper || type.mapper);
+                        var saveInferTypeParameters_1 = context.inferTypeParameters;
+                        context.inferTypeParameters = type.root.inferTypeParameters;
+                        var extendsTypeNode_1 = typeToTypeNodeHelper(instantiateType(type.root.extendsType, newMapper), context);
+                        context.inferTypeParameters = saveInferTypeParameters_1;
+                        var trueTypeNode_1 = typeToTypeNodeOrCircularityElision(instantiateType(getTypeFromTypeNode(type.root.node.trueType), newMapper));
+                        var falseTypeNode_1 = typeToTypeNodeOrCircularityElision(instantiateType(getTypeFromTypeNode(type.root.node.falseType), newMapper));
+                        // outermost conditional makes `T` a type parameter, allowing the inner conditionals to be distributive
+                        // second conditional makes `T` have `T & checkType` substitution, so it is correctly usable as the checkType
+                        // inner conditional runs the check the user provided on the check type (distributively) and returns the result
+                        // checkType extends infer T ? T extends checkType ? T extends extendsType<T> ? trueType<T> : falseType<T> : never : never;
+                        // this is potentially simplifiable to
+                        // checkType extends infer T ? T extends checkType & extendsType<T> ? trueType<T> : falseType<T> : never;
+                        // but that may confuse users who read the output more.
+                        // On the other hand,
+                        // checkType extends infer T extends checkType ? T extends extendsType<T> ? trueType<T> : falseType<T> : never;
+                        // may also work with `infer ... extends ...` in, but would produce declarations only compatible with the latest TS.
+                        return ts.factory.createConditionalTypeNode(checkTypeNode, ts.factory.createInferTypeNode(ts.factory.createTypeParameterDeclaration(/*modifiers*/ undefined, ts.factory.cloneNode(newTypeVariable.typeName))), ts.factory.createConditionalTypeNode(ts.factory.createTypeReferenceNode(ts.factory.cloneNode(name)), typeToTypeNodeHelper(type.checkType, context), ts.factory.createConditionalTypeNode(newTypeVariable, extendsTypeNode_1, trueTypeNode_1, falseTypeNode_1), ts.factory.createKeywordTypeNode(143 /* NeverKeyword */)), ts.factory.createKeywordTypeNode(143 /* NeverKeyword */));
+                    }
                     var saveInferTypeParameters = context.inferTypeParameters;
                     context.inferTypeParameters = type.root.inferTypeParameters;
                     var extendsTypeNode = typeToTypeNodeHelper(type.extendsType, context);
                     context.inferTypeParameters = saveInferTypeParameters;
                     var trueTypeNode = typeToTypeNodeOrCircularityElision(getTrueTypeFromConditionalType(type));
                     var falseTypeNode = typeToTypeNodeOrCircularityElision(getFalseTypeFromConditionalType(type));
-                    context.approximateLength += 15;
                     return ts.factory.createConditionalTypeNode(checkTypeNode, extendsTypeNode, trueTypeNode, falseTypeNode);
                 }
                 function typeToTypeNodeOrCircularityElision(type) {
@@ -53084,9 +53165,6 @@ var ts;
                 if (parameterDeclaration && isRequiredInitializedParameter(parameterDeclaration)) {
                     parameterType = getOptionalType(parameterType);
                 }
-                if ((context.flags & 1073741824 /* NoUndefinedOptionalParameterType */) && parameterDeclaration && !ts.isJSDocParameterTag(parameterDeclaration) && isOptionalUninitializedParameter(parameterDeclaration)) {
-                    parameterType = getTypeWithFacts(parameterType, 524288 /* NEUndefined */);
-                }
                 var parameterTypeNode = serializeTypeForDeclaration(context, parameterType, parameterSymbol, context.enclosingDeclaration, privateSymbolVisitor, bundledImports);
                 var modifiers = !(context.flags & 8192 /* OmitParameterModifiers */) && preserveModifierFlags && parameterDeclaration && parameterDeclaration.modifiers ? parameterDeclaration.modifiers.map(ts.factory.cloneNode) : undefined;
                 var isRest = parameterDeclaration && ts.isRestParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 32768 /* RestParameter */;
@@ -53645,7 +53723,7 @@ var ts;
                     if (declWithExistingAnnotation && !ts.isFunctionLikeDeclaration(declWithExistingAnnotation) && !ts.isGetAccessorDeclaration(declWithExistingAnnotation)) {
                         // try to reuse the existing annotation
                         var existing = ts.getEffectiveTypeAnnotationNode(declWithExistingAnnotation);
-                        if (getTypeFromTypeNode(existing) === type && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type)) {
+                        if (typeNodeIsEquivalentToType(existing, declWithExistingAnnotation, type) && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type)) {
                             var result_6 = serializeExistingTypeNode(context, existing, includePrivateSymbol, bundled);
                             if (result_6) {
                                 return result_6;
@@ -53662,6 +53740,16 @@ var ts;
                 context.flags = oldFlags;
                 return result;
             }
+            function typeNodeIsEquivalentToType(typeNode, annotatedDeclaration, type) {
+                var typeFromTypeNode = getTypeFromTypeNode(typeNode);
+                if (typeFromTypeNode === type) {
+                    return true;
+                }
+                if (ts.isParameter(annotatedDeclaration) && annotatedDeclaration.questionToken) {
+                    return getTypeWithFacts(type, 524288 /* NEUndefined */) === typeFromTypeNode;
+                }
+                return false;
+            }
             function serializeReturnTypeForSignature(context, type, signature, includePrivateSymbol, bundled) {
                 if (!isErrorType(type) && context.enclosingDeclaration) {
                     var annotation = signature.declaration && ts.getEffectiveReturnTypeNode(signature.declaration);
@@ -55933,7 +56021,7 @@ var ts;
                         }
                     }
                     var sourceTypes = ts.some(constructorTypes, function (t) { return !!(t.flags & ~98304 /* Nullable */); }) ? constructorTypes : types; // TODO: GH#18217
-                    type = getUnionType(sourceTypes, 2 /* Subtype */);
+                    type = getUnionType(sourceTypes);
                 }
             }
             var widened = getWidenedType(addOptionality(type, /*isProperty*/ false, definedInMethod && !definedInConstructor));
@@ -58682,8 +58770,9 @@ var ts;
                     // levels of nesting, we are presumably exploring a repeating pattern with a long cycle that hasn't
                     // yet triggered the deeply nested limiter. We have no test cases that actually get to 50 levels of
                     // nesting, so it is effectively just a safety stop.
-                    if (stack.length < 10 || stack.length < 50 && !isDeeplyNestedType(t, stack, stack.length)) {
-                        stack.push(t);
+                    var identity_1 = getRecursionIdentity(t);
+                    if (stack.length < 10 || stack.length < 50 && !ts.contains(stack, identity_1)) {
+                        stack.push(identity_1);
                         result = computeBaseConstraint(getSimplifiedType(t, /*writing*/ false));
                         stack.pop();
                     }
@@ -66881,12 +66970,12 @@ var ts;
         function isDeeplyNestedType(type, stack, depth, maxDepth) {
             if (maxDepth === void 0) { maxDepth = 3; }
             if (depth >= maxDepth) {
-                var identity_1 = getRecursionIdentity(type);
+                var identity_2 = getRecursionIdentity(type);
                 var count = 0;
                 var lastTypeId = 0;
                 for (var i = 0; i < depth; i++) {
                     var t = stack[i];
-                    if (getRecursionIdentity(t) === identity_1) {
+                    if (getRecursionIdentity(t) === identity_2) {
                         // We only count occurrences with a higher type id than the previous occurrence, since higher
                         // type ids are an indicator of newer instantiations caused by recursion.
                         if (t.id >= lastTypeId) {
@@ -76888,7 +76977,7 @@ var ts;
             var newSymbol = createSymbol(2097152 /* Alias */, "default" /* Default */);
             newSymbol.parent = originalSymbol;
             newSymbol.nameType = getStringLiteralType("default");
-            newSymbol.target = resolveSymbol(symbol);
+            newSymbol.aliasTarget = resolveSymbol(symbol);
             memberTable.set("default" /* Default */, newSymbol);
             return createAnonymousType(anonymousSymbol, memberTable, ts.emptyArray, ts.emptyArray, ts.emptyArray);
         }
@@ -79700,19 +79789,28 @@ var ts;
             if (constraintType && defaultType) {
                 checkTypeAssignableTo(defaultType, getTypeWithThisArgument(instantiateType(constraintType, makeUnaryTypeMapper(typeParameter, defaultType)), defaultType), node.default, ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
             }
-            if (node.parent.kind === 258 /* InterfaceDeclaration */ || node.parent.kind === 257 /* ClassDeclaration */ || node.parent.kind === 259 /* TypeAliasDeclaration */) {
+            checkNodeDeferred(node);
+            addLazyDiagnostic(function () { return checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_parameter_name_cannot_be_0); });
+        }
+        function checkTypeParameterDeferred(node) {
+            if (ts.isInterfaceDeclaration(node.parent) || ts.isClassLike(node.parent) || ts.isTypeAliasDeclaration(node.parent)) {
+                var typeParameter = getDeclaredTypeOfTypeParameter(getSymbolOfNode(node));
                 var modifiers = getVarianceModifiers(typeParameter);
-                if (modifiers === 32768 /* In */ || modifiers === 65536 /* Out */) {
+                if (modifiers) {
                     var symbol = getSymbolOfNode(node.parent);
-                    var source = createMarkerType(symbol, typeParameter, modifiers === 65536 /* Out */ ? markerSubType : markerSuperType);
-                    var target = createMarkerType(symbol, typeParameter, modifiers === 65536 /* Out */ ? markerSuperType : markerSubType);
-                    var saveVarianceTypeParameter = typeParameter;
-                    varianceTypeParameter = typeParameter;
-                    checkTypeAssignableTo(source, target, node, ts.Diagnostics.Type_0_is_not_assignable_to_type_1_as_implied_by_variance_annotation);
-                    varianceTypeParameter = saveVarianceTypeParameter;
+                    if (ts.isTypeAliasDeclaration(node.parent) && !(ts.getObjectFlags(getDeclaredTypeOfSymbol(symbol)) & (16 /* Anonymous */ | 32 /* Mapped */))) {
+                        error(node, ts.Diagnostics.Variance_annotations_are_only_supported_in_type_aliases_for_object_function_constructor_and_mapped_types);
+                    }
+                    else if (modifiers === 32768 /* In */ || modifiers === 65536 /* Out */) {
+                        var source = createMarkerType(symbol, typeParameter, modifiers === 65536 /* Out */ ? markerSubType : markerSuperType);
+                        var target = createMarkerType(symbol, typeParameter, modifiers === 65536 /* Out */ ? markerSuperType : markerSubType);
+                        var saveVarianceTypeParameter = typeParameter;
+                        varianceTypeParameter = typeParameter;
+                        checkTypeAssignableTo(source, target, node, ts.Diagnostics.Type_0_is_not_assignable_to_type_1_as_implied_by_variance_annotation);
+                        varianceTypeParameter = saveVarianceTypeParameter;
+                    }
                 }
             }
-            addLazyDiagnostic(function () { return checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_parameter_name_cannot_be_0); });
         }
         function checkParameter(node) {
             // Grammar checking
@@ -80202,7 +80300,7 @@ var ts;
                                         superCallStatement = statement;
                                         break;
                                     }
-                                    if (!ts.isPrologueDirective(statement) && nodeImmediatelyReferencesSuperOrThis(statement)) {
+                                    if (nodeImmediatelyReferencesSuperOrThis(statement)) {
                                         break;
                                     }
                                 }
@@ -85555,6 +85653,9 @@ var ts;
                 case 226 /* ClassExpression */:
                     checkClassExpressionDeferred(node);
                     break;
+                case 163 /* TypeParameter */:
+                    checkTypeParameterDeferred(node);
+                    break;
                 case 279 /* JsxSelfClosingElement */:
                     checkJsxSelfClosingElementDeferred(node);
                     break;
@@ -86369,11 +86470,11 @@ var ts;
                 var _a = symbol, leftSpread = _a.leftSpread, rightSpread = _a.rightSpread, syntheticOrigin = _a.syntheticOrigin;
                 return leftSpread ? [leftSpread, rightSpread]
                     : syntheticOrigin ? [syntheticOrigin]
-                        : ts.singleElementArray(tryGetAliasTarget(symbol));
+                        : ts.singleElementArray(tryGetTarget(symbol));
             }
             return undefined;
         }
-        function tryGetAliasTarget(symbol) {
+        function tryGetTarget(symbol) {
             var target;
             var next = symbol;
             while (next = getSymbolLinks(next).target) {
@@ -86603,7 +86704,7 @@ var ts;
                 if (links === null || links === void 0 ? void 0 : links.referenced) {
                     return true;
                 }
-                var target = getSymbolLinks(symbol).target; // TODO: GH#18217
+                var target = getSymbolLinks(symbol).aliasTarget; // TODO: GH#18217
                 if (target && ts.getEffectiveModifierFlags(node) & 1 /* Export */ &&
                     target.flags & 111551 /* Value */ &&
                     (ts.shouldPreserveConstEnums(compilerOptions) || !isConstEnumOrConstEnumOnlyModule(target))) {
@@ -86651,11 +86752,6 @@ var ts;
                 !parameter.initializer &&
                 ts.hasSyntacticModifier(parameter, 16476 /* ParameterPropertyModifier */);
         }
-        function isOptionalUninitializedParameter(parameter) {
-            return !!strictNullChecks &&
-                isOptionalParameter(parameter) &&
-                !parameter.initializer;
-        }
         function isExpandoFunctionDeclaration(node) {
             var declaration = ts.getParseTreeNode(node, ts.isFunctionDeclaration);
             if (!declaration) {
@@ -87572,8 +87668,7 @@ var ts;
                     case 144 /* OutKeyword */:
                         var inOutFlag = modifier.kind === 101 /* InKeyword */ ? 32768 /* In */ : 65536 /* Out */;
                         var inOutText = modifier.kind === 101 /* InKeyword */ ? "in" : "out";
-                        if (node.kind !== 163 /* TypeParameter */ || (node.parent.kind !== 258 /* InterfaceDeclaration */ &&
-                            node.parent.kind !== 257 /* ClassDeclaration */ && node.parent.kind !== 259 /* TypeAliasDeclaration */)) {
+                        if (node.kind !== 163 /* TypeParameter */ || !(ts.isInterfaceDeclaration(node.parent) || ts.isClassLike(node.parent) || ts.isTypeAliasDeclaration(node.parent))) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_can_only_appear_on_a_type_parameter_of_a_class_interface_or_type_alias, inOutText);
                         }
                         if (flags & inOutFlag) {
@@ -92807,11 +92902,11 @@ var ts;
             }
             var statements = [];
             resumeLexicalEnvironment();
-            var indexAfterLastPrologueStatement = factory.copyPrologue(body.statements, statements, /*ensureUseStrict*/ false, visitor);
-            var superStatementIndex = ts.findSuperStatementIndex(body.statements, indexAfterLastPrologueStatement);
+            var prologueStatementCount = factory.copyPrologue(body.statements, statements, /*ensureUseStrict*/ false, visitor);
+            var superStatementIndex = ts.findSuperStatementIndex(body.statements, prologueStatementCount);
             // If there was a super call, visit existing statements up to and including it
             if (superStatementIndex >= 0) {
-                ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, indexAfterLastPrologueStatement, superStatementIndex + 1 - indexAfterLastPrologueStatement));
+                ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, prologueStatementCount, superStatementIndex + 1 - prologueStatementCount));
             }
             // Transform parameters into property assignments. Transforms this:
             //
@@ -92830,12 +92925,12 @@ var ts;
             if (superStatementIndex >= 0) {
                 ts.addRange(statements, parameterPropertyAssignments);
             }
-            // Since there was no super() call, parameter properties are the first statements in the constructor
+            // Since there was no super() call, parameter properties are the first statements in the constructor after any prologue statements
             else {
-                statements = ts.addRange(parameterPropertyAssignments, statements);
+                statements = __spreadArray(__spreadArray(__spreadArray([], statements.slice(0, prologueStatementCount), true), parameterPropertyAssignments, true), statements.slice(prologueStatementCount), true);
             }
-            // Add remaining statements from the body, skipping the super() call if it was found
-            ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, superStatementIndex + 1));
+            // Add remaining statements from the body, skipping the super() call if it was found and any (already added) prologue statements
+            ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, superStatementIndex + 1 + prologueStatementCount));
             // End the lexical environment.
             statements = factory.mergeLexicalEnvironment(statements, endLexicalEnvironment());
             var block = factory.createBlock(ts.setTextRange(factory.createNodeArray(statements), body.statements), /*multiLine*/ true);
@@ -108599,6 +108694,10 @@ var ts;
             return factory.updateModifiers(statement, modifiers);
         }
         function transformTopLevelDeclaration(input) {
+            if (lateMarkedStatements) {
+                while (ts.orderedRemoveItem(lateMarkedStatements, input))
+                    ;
+            }
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {
@@ -109730,7 +109829,7 @@ var ts;
         addOutput(buildInfoPath);
     }
     function getOwnOutputFileNames(configFile, inputFileName, ignoreCase, addOutput, getCommonSourceDirectory) {
-        if (ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */))
+        if (ts.isDeclarationFileName(inputFileName))
             return;
         var js = getOutputJSFileName(inputFileName, configFile, ignoreCase, getCommonSourceDirectory);
         addOutput(js);
@@ -109775,7 +109874,7 @@ var ts;
     /*@internal*/
     function getCommonSourceDirectoryOfConfig(_a, ignoreCase) {
         var options = _a.options, fileNames = _a.fileNames;
-        return getCommonSourceDirectory(options, function () { return ts.filter(fileNames, function (file) { return !(options.noEmitForJsFiles && ts.fileExtensionIsOneOf(file, ts.supportedJSExtensionsFlat)) && !ts.fileExtensionIs(file, ".d.ts" /* Dts */); }); }, ts.getDirectoryPath(ts.normalizeSlashes(ts.Debug.checkDefined(options.configFilePath))), ts.createGetCanonicalFileName(!ignoreCase));
+        return getCommonSourceDirectory(options, function () { return ts.filter(fileNames, function (file) { return !(options.noEmitForJsFiles && ts.fileExtensionIsOneOf(file, ts.supportedJSExtensionsFlat)) && !ts.isDeclarationFileName(file); }); }, ts.getDirectoryPath(ts.normalizeSlashes(ts.Debug.checkDefined(options.configFilePath))), ts.createGetCanonicalFileName(!ignoreCase));
     }
     ts.getCommonSourceDirectoryOfConfig = getCommonSourceDirectoryOfConfig;
     /*@internal*/
@@ -109817,7 +109916,7 @@ var ts;
         var getCommonSourceDirectory = ts.memoize(function () { return getCommonSourceDirectoryOfConfig(configFile, ignoreCase); });
         for (var _a = 0, _b = configFile.fileNames; _a < _b.length; _a++) {
             var inputFileName = _b[_a];
-            if (ts.fileExtensionIs(inputFileName, ".d.ts" /* Dts */))
+            if (ts.isDeclarationFileName(inputFileName))
                 continue;
             var jsFilePath = getOutputJSFileName(inputFileName, configFile, ignoreCase, getCommonSourceDirectory);
             if (jsFilePath)
@@ -115167,7 +115266,7 @@ var ts;
         if (ts.outFile(options) || options.outDir)
             return false;
         // File if emitted next to input needs to be ignored
-        if (ts.fileExtensionIs(fileOrDirectoryPath, ".d.ts" /* Dts */)) {
+        if (ts.isDeclarationFileName(fileOrDirectoryPath)) {
             // If its declaration directory: its not ignored if not excluded by config
             if (options.declarationDir)
                 return false;
@@ -116340,7 +116439,7 @@ var ts;
                                 var getCommonSourceDirectory_2 = ts.memoize(function () { return ts.getCommonSourceDirectoryOfConfig(parsedRef.commandLine, !host.useCaseSensitiveFileNames()); });
                                 for (var _b = 0, _c = parsedRef.commandLine.fileNames; _b < _c.length; _b++) {
                                     var fileName = _c[_b];
-                                    if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) && !ts.fileExtensionIs(fileName, ".json" /* Json */)) {
+                                    if (!ts.isDeclarationFileName(fileName) && !ts.fileExtensionIs(fileName, ".json" /* Json */)) {
                                         processProjectReferenceFile(ts.getOutputDeclarationFileName(fileName, parsedRef.commandLine, !host.useCaseSensitiveFileNames(), getCommonSourceDirectory_2), { kind: ts.FileIncludeKind.OutputFromProjectReference, index: index });
                                     }
                                 }
@@ -116531,7 +116630,7 @@ var ts;
         }
         function getRedirectReferenceForResolution(file) {
             var redirect = getResolvedProjectReferenceToRedirect(file.originalFileName);
-            if (redirect || !ts.fileExtensionIsOneOf(file.originalFileName, [".d.ts" /* Dts */, ".d.cts" /* Dcts */, ".d.mts" /* Dmts */]))
+            if (redirect || !ts.isDeclarationFileName(file.originalFileName))
                 return redirect;
             // The originalFileName could not be actual source file name if file found was d.ts from referecned project
             // So in this case try to look up if this is output from referenced project, if it is use the redirected project in that case
@@ -117922,7 +118021,7 @@ var ts;
         }
         function getProjectReferenceRedirectProject(fileName) {
             // Ignore dts or any json files
-            if (!resolvedProjectReferences || !resolvedProjectReferences.length || ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) || ts.fileExtensionIs(fileName, ".json" /* Json */)) {
+            if (!resolvedProjectReferences || !resolvedProjectReferences.length || ts.isDeclarationFileName(fileName) || ts.fileExtensionIs(fileName, ".json" /* Json */)) {
                 return undefined;
             }
             // If this file is produced by a referenced project, we need to rewrite it to
@@ -117971,7 +118070,7 @@ var ts;
                     else {
                         var getCommonSourceDirectory_3 = ts.memoize(function () { return ts.getCommonSourceDirectoryOfConfig(resolvedRef.commandLine, !host.useCaseSensitiveFileNames()); });
                         ts.forEach(resolvedRef.commandLine.fileNames, function (fileName) {
-                            if (!ts.fileExtensionIs(fileName, ".d.ts" /* Dts */) && !ts.fileExtensionIs(fileName, ".json" /* Json */)) {
+                            if (!ts.isDeclarationFileName(fileName) && !ts.fileExtensionIs(fileName, ".json" /* Json */)) {
                                 var outputDts = ts.getOutputDeclarationFileName(fileName, resolvedRef.commandLine, !host.useCaseSensitiveFileNames(), getCommonSourceDirectory_3);
                                 mapFromToProjectReferenceRedirectSource.set(toPath(outputDts), fileName);
                             }
@@ -118772,7 +118871,7 @@ var ts;
             if (options.outDir) {
                 return ts.containsPath(options.outDir, filePath, currentDirectory, !host.useCaseSensitiveFileNames());
             }
-            if (ts.fileExtensionIsOneOf(filePath, ts.supportedJSExtensionsFlat) || ts.fileExtensionIs(filePath, ".d.ts" /* Dts */)) {
+            if (ts.fileExtensionIsOneOf(filePath, ts.supportedJSExtensionsFlat) || ts.isDeclarationFileName(filePath)) {
                 // Otherwise just check if sourceFile with the name exists
                 var filePathWithoutExtension = ts.removeFileExtension(filePath);
                 return !!getSourceFileByPath((filePathWithoutExtension + ".ts" /* Ts */)) ||
@@ -119105,13 +119204,9 @@ var ts;
     ts.getFileEmitOutput = getFileEmitOutput;
     var BuilderState;
     (function (BuilderState) {
-        var manyToManyPathMapCount = 0;
         function createManyToManyPathMap() {
             function create(forward, reverse, deleted) {
-                var version = 0;
                 var map = {
-                    id: manyToManyPathMapCount++,
-                    version: function () { return version; },
                     clone: function () { return create(new ts.Map(forward), new ts.Map(reverse), deleted && new ts.Set(deleted)); },
                     forEach: function (fn) { return forward.forEach(fn); },
                     getKeys: function (v) { return reverse.get(v); },
@@ -119127,30 +119222,29 @@ var ts;
                         }
                         set.forEach(function (v) { return deleteFromMultimap(reverse, v, k); });
                         forward.delete(k);
-                        version++;
                         return true;
                     },
                     set: function (k, vSet) {
-                        var changed = !!(deleted === null || deleted === void 0 ? void 0 : deleted.delete(k));
+                        deleted === null || deleted === void 0 ? void 0 : deleted.delete(k);
                         var existingVSet = forward.get(k);
                         forward.set(k, vSet);
                         existingVSet === null || existingVSet === void 0 ? void 0 : existingVSet.forEach(function (v) {
                             if (!vSet.has(v)) {
-                                changed = true;
                                 deleteFromMultimap(reverse, v, k);
                             }
                         });
                         vSet.forEach(function (v) {
                             if (!(existingVSet === null || existingVSet === void 0 ? void 0 : existingVSet.has(v))) {
-                                changed = true;
                                 addToMultimap(reverse, v, k);
                             }
                         });
-                        if (changed) {
-                            version++;
-                        }
                         return map;
                     },
+                    clear: function () {
+                        forward.clear();
+                        reverse.clear();
+                        deleted === null || deleted === void 0 ? void 0 : deleted.clear();
+                    }
                 };
                 return map;
             }
@@ -119165,11 +119259,10 @@ var ts;
             }
             set.add(v);
         }
-        function deleteFromMultimap(map, k, v, removeEmpty) {
-            if (removeEmpty === void 0) { removeEmpty = true; }
+        function deleteFromMultimap(map, k, v) {
             var set = map.get(k);
             if (set === null || set === void 0 ? void 0 : set.delete(v)) {
-                if (removeEmpty && !set.size) {
+                if (!set.size) {
                     map.delete(k);
                 }
                 return true;
@@ -119398,7 +119491,7 @@ var ts;
                 /*forceDtsEmit*/ true);
                 var firstDts_1 = ts.firstOrUndefined(emitOutput_1.outputFiles);
                 if (firstDts_1) {
-                    ts.Debug.assert(ts.fileExtensionIsOneOf(firstDts_1.name, [".d.ts" /* Dts */, ".d.mts" /* Dmts */, ".d.cts" /* Dcts */]), "File extension for signature expected to be dts", function () { return "Found: " + ts.getAnyExtensionFromPath(firstDts_1.name) + " for " + firstDts_1.name + ":: All output files: " + JSON.stringify(emitOutput_1.outputFiles.map(function (f) { return f.name; })); });
+                    ts.Debug.assert(ts.isDeclarationFileName(firstDts_1.name), "File extension for signature expected to be dts", function () { return "Found: " + ts.getAnyExtensionFromPath(firstDts_1.name) + " for " + firstDts_1.name + ":: All output files: " + JSON.stringify(emitOutput_1.outputFiles.map(function (f) { return f.name; })); });
                     latestSignature = (computeHash || ts.generateDjb2Hash)(firstDts_1.text);
                     if (exportedModulesMapCache && latestSignature !== prevSignature) {
                         updateExportedModules(sourceFile, emitOutput_1.exportedModulesFromDeclarationEmit, exportedModulesMapCache);
@@ -119456,20 +119549,6 @@ var ts;
             var _a;
             if (exportedModulesMapCache) {
                 ts.Debug.assert(!!state.exportedModulesMap);
-                var cacheId = exportedModulesMapCache.id;
-                var cacheVersion = exportedModulesMapCache.version();
-                if (state.previousCache) {
-                    if (state.previousCache.id === cacheId && state.previousCache.version === cacheVersion) {
-                        // If this is the same cache at the same version as last time this BuilderState
-                        // was updated, there's no need to update again
-                        return;
-                    }
-                    state.previousCache.id = cacheId;
-                    state.previousCache.version = cacheVersion;
-                }
-                else {
-                    state.previousCache = { id: cacheId, version: cacheVersion };
-                }
                 (_a = exportedModulesMapCache.deletedKeys()) === null || _a === void 0 ? void 0 : _a.forEach(function (path) { return state.exportedModulesMap.deleteKey(path); });
                 exportedModulesMapCache.forEach(function (exportedModules, path) { return state.exportedModulesMap.set(path, exportedModules); });
             }
@@ -119803,7 +119882,8 @@ var ts;
      * This is to allow the callers to be able to actually remove affected file only when the operation is complete
      * eg. if during diagnostics check cancellation token ends up cancelling the request, the affected file should be retained
      */
-    function getNextAffectedFile(state, cancellationToken, computeHash) {
+    function getNextAffectedFile(state, cancellationToken, computeHash, host) {
+        var _a;
         while (true) {
             var affectedFiles = state.affectedFiles;
             if (affectedFiles) {
@@ -119814,7 +119894,7 @@ var ts;
                     if (!seenAffectedFiles.has(affectedFile.resolvedPath)) {
                         // Set the next affected file as seen and remove the cached semantic diagnostics
                         state.affectedFilesIndex = affectedFilesIndex;
-                        handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash);
+                        handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash, host);
                         return affectedFile;
                     }
                     affectedFilesIndex++;
@@ -119826,6 +119906,7 @@ var ts;
                 ts.BuilderState.updateSignaturesFromCache(state, state.currentAffectedFilesSignatures);
                 state.currentAffectedFilesSignatures.clear();
                 ts.BuilderState.updateExportedFilesMapFromCache(state, state.currentAffectedFilesExportedModulesMap);
+                (_a = state.currentAffectedFilesExportedModulesMap) === null || _a === void 0 ? void 0 : _a.clear();
                 state.affectedFiles = undefined;
             }
             // Get next changed file
@@ -119855,6 +119936,11 @@ var ts;
                 state.seenAffectedFiles = new ts.Set();
         }
     }
+    function clearAffectedFilesPendingEmit(state) {
+        state.affectedFilesPendingEmit = undefined;
+        state.affectedFilesPendingEmitKind = undefined;
+        state.affectedFilesPendingEmitIndex = undefined;
+    }
     /**
      * Returns next file to be emitted from files that retrieved semantic diagnostics but did not emit yet
      */
@@ -119874,9 +119960,7 @@ var ts;
                     }
                 }
             }
-            state.affectedFilesPendingEmit = undefined;
-            state.affectedFilesPendingEmitKind = undefined;
-            state.affectedFilesPendingEmitIndex = undefined;
+            clearAffectedFilesPendingEmit(state);
         }
         return undefined;
     }
@@ -119884,7 +119968,7 @@ var ts;
      *  Handles semantic diagnostics and dts emit for affectedFile and files, that are referencing modules that export entities from affected file
      *  This is because even though js emit doesnt change, dts emit / type used can change resulting in need for dts emit and js change
      */
-    function handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash) {
+    function handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash, host) {
         var _a;
         removeSemanticDiagnosticsOf(state, affectedFile.resolvedPath);
         // If affected files is everything except default library, then nothing more to do
@@ -119909,14 +119993,14 @@ var ts;
             ts.Debug.assert(state.hasCalledUpdateShapeSignature.has(affectedFile.resolvedPath) || ((_a = state.currentAffectedFilesSignatures) === null || _a === void 0 ? void 0 : _a.has(affectedFile.resolvedPath)), "Signature not updated for affected file: " + affectedFile.fileName);
         }
         if (!state.compilerOptions.assumeChangesOnlyAffectDirectDependencies) {
-            forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, function (state, path) { return handleDtsMayChangeOf(state, path, cancellationToken, computeHash); });
+            forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, function (state, path) { return handleDtsMayChangeOf(state, path, cancellationToken, computeHash, host); });
         }
     }
     /**
      * Handle the dts may change, so they need to be added to pending emit if dts emit is enabled,
      * Also we need to make sure signature is updated for these files
      */
-    function handleDtsMayChangeOf(state, path, cancellationToken, computeHash) {
+    function handleDtsMayChangeOf(state, path, cancellationToken, computeHash, host) {
         removeSemanticDiagnosticsOf(state, path);
         if (!state.changedFilesSet.has(path)) {
             var program = ts.Debug.checkDefined(state.program);
@@ -119927,8 +120011,7 @@ var ts;
                 // This ensures that we dont later during incremental builds considering wrong signature.
                 // Eg where this also is needed to ensure that .tsbuildinfo generated by incremental build should be same as if it was first fresh build
                 // But we avoid expensive full shape computation, as using file version as shape is enough for correctness.
-                ts.BuilderState.updateShapeSignature(state, program, sourceFile, ts.Debug.checkDefined(state.currentAffectedFilesSignatures), cancellationToken, computeHash, state.currentAffectedFilesExportedModulesMap, 
-                /* useFileVersionAsSignature */ true);
+                ts.BuilderState.updateShapeSignature(state, program, sourceFile, ts.Debug.checkDefined(state.currentAffectedFilesSignatures), cancellationToken, computeHash, state.currentAffectedFilesExportedModulesMap, !host.disableUseFileVersionAsSignature);
                 // If not dts emit, nothing more to do
                 if (ts.getEmitDeclarations(state.compilerOptions)) {
                     addToAffectedFilesPendingEmit(state, path, 0 /* DtsOnly */);
@@ -120125,13 +120208,18 @@ var ts;
             var signature = state.currentAffectedFilesSignatures && state.currentAffectedFilesSignatures.get(key);
             var actualSignature = signature !== null && signature !== void 0 ? signature : value.signature;
             return value.version === actualSignature ?
-                value.affectsGlobalScope ?
-                    { version: value.version, signature: undefined, affectsGlobalScope: true, impliedFormat: value.impliedFormat } :
+                value.affectsGlobalScope || value.impliedFormat ?
+                    // If file version is same as signature, dont serialize signature
+                    { version: value.version, signature: undefined, affectsGlobalScope: value.affectsGlobalScope, impliedFormat: value.impliedFormat } :
+                    // If file info only contains version and signature and both are same we can just write string
                     value.version :
-                actualSignature !== undefined ?
+                actualSignature !== undefined ? // If signature is not same as version, encode signature in the fileInfo
                     signature === undefined ?
+                        // If we havent computed signature, use fileInfo as is
                         value :
+                        // Serialize fileInfo with new updated signature
                         { version: value.version, signature: signature, affectsGlobalScope: value.affectsGlobalScope, impliedFormat: value.impliedFormat } :
+                    // Signature of the FileInfo is undefined, serialize it as false
                     { version: value.version, signature: false, affectsGlobalScope: value.affectsGlobalScope, impliedFormat: value.impliedFormat };
         });
         var referencedMap;
@@ -120376,7 +120464,7 @@ var ts;
          * in that order would be used to write the files
          */
         function emitNextAffectedFile(writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
-            var affected = getNextAffectedFile(state, cancellationToken, computeHash);
+            var affected = getNextAffectedFile(state, cancellationToken, computeHash, host);
             var emitKind = 1 /* Full */;
             var isPendingEmitFile = false;
             if (!affected) {
@@ -120421,54 +120509,48 @@ var ts;
          * in that order would be used to write the files
          */
         function emit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
-            var restorePendingEmitOnHandlingNoEmitSuccess = false;
-            var savedAffectedFilesPendingEmit;
-            var savedAffectedFilesPendingEmitKind;
-            var savedAffectedFilesPendingEmitIndex;
-            // Backup and restore affected pendings emit state for non emit Builder if noEmitOnError is enabled and emitBuildInfo could be written in case there are errors
-            // This ensures pending files to emit is updated in tsbuildinfo
-            // Note that when there are no errors, emit proceeds as if everything is emitted as it is callers reponsibility to write the files to disk if at all (because its builder that doesnt track files to emit)
-            if (kind !== BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram &&
-                !targetSourceFile &&
-                !ts.outFile(state.compilerOptions) &&
-                !state.compilerOptions.noEmit &&
-                state.compilerOptions.noEmitOnError) {
-                restorePendingEmitOnHandlingNoEmitSuccess = true;
-                savedAffectedFilesPendingEmit = state.affectedFilesPendingEmit && state.affectedFilesPendingEmit.slice();
-                savedAffectedFilesPendingEmitKind = state.affectedFilesPendingEmitKind && new ts.Map(state.affectedFilesPendingEmitKind);
-                savedAffectedFilesPendingEmitIndex = state.affectedFilesPendingEmitIndex;
-            }
+            var _a;
             if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
                 assertSourceFileOkWithoutNextAffectedCall(state, targetSourceFile);
             }
             var result = ts.handleNoEmitOptions(builderProgram, targetSourceFile, writeFile, cancellationToken);
             if (result)
                 return result;
-            if (restorePendingEmitOnHandlingNoEmitSuccess) {
-                state.affectedFilesPendingEmit = savedAffectedFilesPendingEmit;
-                state.affectedFilesPendingEmitKind = savedAffectedFilesPendingEmitKind;
-                state.affectedFilesPendingEmitIndex = savedAffectedFilesPendingEmitIndex;
-            }
             // Emit only affected files if using builder for emit
-            if (!targetSourceFile && kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
-                // Emit and report any errors we ran into.
-                var sourceMaps = [];
-                var emitSkipped = false;
-                var diagnostics = void 0;
-                var emittedFiles = [];
-                var affectedEmitResult = void 0;
-                while (affectedEmitResult = emitNextAffectedFile(writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers)) {
-                    emitSkipped = emitSkipped || affectedEmitResult.result.emitSkipped;
-                    diagnostics = ts.addRange(diagnostics, affectedEmitResult.result.diagnostics);
-                    emittedFiles = ts.addRange(emittedFiles, affectedEmitResult.result.emittedFiles);
-                    sourceMaps = ts.addRange(sourceMaps, affectedEmitResult.result.sourceMaps);
+            if (!targetSourceFile) {
+                if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
+                    // Emit and report any errors we ran into.
+                    var sourceMaps = [];
+                    var emitSkipped = false;
+                    var diagnostics = void 0;
+                    var emittedFiles = [];
+                    var affectedEmitResult = void 0;
+                    while (affectedEmitResult = emitNextAffectedFile(writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers)) {
+                        emitSkipped = emitSkipped || affectedEmitResult.result.emitSkipped;
+                        diagnostics = ts.addRange(diagnostics, affectedEmitResult.result.diagnostics);
+                        emittedFiles = ts.addRange(emittedFiles, affectedEmitResult.result.emittedFiles);
+                        sourceMaps = ts.addRange(sourceMaps, affectedEmitResult.result.sourceMaps);
+                    }
+                    return {
+                        emitSkipped: emitSkipped,
+                        diagnostics: diagnostics || ts.emptyArray,
+                        emittedFiles: emittedFiles,
+                        sourceMaps: sourceMaps
+                    };
+                }
+                // In non Emit builder, clear affected files pending emit
+                else if ((_a = state.affectedFilesPendingEmitKind) === null || _a === void 0 ? void 0 : _a.size) {
+                    ts.Debug.assert(kind === BuilderProgramKind.SemanticDiagnosticsBuilderProgram);
+                    // State can clear affected files pending emit if
+                    if (!emitOnlyDtsFiles // If we are doing complete emit, affected files pending emit can be cleared
+                        // If every file pending emit is pending on only dts emit
+                        || ts.every(state.affectedFilesPendingEmit, function (path, index) {
+                            return index < state.affectedFilesPendingEmitIndex ||
+                                state.affectedFilesPendingEmitKind.get(path) === 0 /* DtsOnly */;
+                        })) {
+                        clearAffectedFilesPendingEmit(state);
+                    }
                 }
-                return {
-                    emitSkipped: emitSkipped,
-                    diagnostics: diagnostics || ts.emptyArray,
-                    emittedFiles: emittedFiles,
-                    sourceMaps: sourceMaps
-                };
             }
             return ts.Debug.checkDefined(state.program).emit(targetSourceFile, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
         }
@@ -120478,7 +120560,7 @@ var ts;
          */
         function getSemanticDiagnosticsOfNextAffectedFile(cancellationToken, ignoreSourceFile) {
             while (true) {
-                var affected = getNextAffectedFile(state, cancellationToken, computeHash);
+                var affected = getNextAffectedFile(state, cancellationToken, computeHash, host);
                 if (!affected) {
                     // Done
                     return undefined;
@@ -123598,9 +123680,6 @@ var ts;
     function newer(date1, date2) {
         return date2 > date1 ? date2 : date1;
     }
-    function isDeclarationFile(fileName) {
-        return ts.fileExtensionIs(fileName, ".d.ts" /* Dts */);
-    }
     /*@internal*/
     function isCircularBuildOrder(buildOrder) {
         return !!buildOrder && !!buildOrder.buildOrder;
@@ -124163,7 +124242,7 @@ var ts;
             outputFiles.forEach(function (_a) {
                 var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
                 var priorChangeTime;
-                if (!anyDtsChanged && isDeclarationFile(name)) {
+                if (!anyDtsChanged && ts.isDeclarationFileName(name)) {
                     // Check for unchanged .d.ts files
                     if (host.fileExists(name) && state.readFileWithCache(name) === text) {
                         priorChangeTime = host.getModifiedTime(name);
@@ -124504,7 +124583,7 @@ var ts;
                 // In addition to file timestamps, we also keep track of when a .d.ts file
                 // had its file touched but not had its contents changed - this allows us
                 // to skip a downstream typecheck
-                if (isDeclarationFile(output)) {
+                if (ts.isDeclarationFileName(output)) {
                     var outputModifiedTime = ts.getModifiedTime(host, output);
                     newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);
                 }
@@ -124658,7 +124737,7 @@ var ts;
                     reportVerbose = false;
                     reportStatus(state, verboseMessage, proj.options.configFilePath);
                 }
-                if (isDeclarationFile(file)) {
+                if (ts.isDeclarationFileName(file)) {
                     priorNewestUpdateTime = newer(priorNewestUpdateTime, ts.getModifiedTime(host, file));
                 }
                 host.setModifiedTime(file, now);
@@ -131970,17 +132049,13 @@ var ts;
                 }
             }
             if (origin && originIsObjectLiteralMethod(origin)) {
-                var importAdder = void 0;
-                (insertText = origin.insertText, isSnippet = origin.isSnippet, importAdder = origin.importAdder, labelDetails = origin.labelDetails);
+                (insertText = origin.insertText, isSnippet = origin.isSnippet, labelDetails = origin.labelDetails);
                 if (!preferences.useLabelDetailsInCompletionEntries) {
                     name = name + labelDetails.detail;
                     labelDetails = undefined;
                 }
                 source = CompletionSource.ObjectLiteralMethodSnippet;
                 sortText = Completions.SortText.SortBelow(sortText);
-                if (importAdder.hasFixes()) {
-                    hasAction = true;
-                }
             }
             if (isJsxIdentifierExpected && !isRightOfOpenTag && preferences.includeCompletionsWithSnippetText && preferences.jsxAttributeCompletionStyle && preferences.jsxAttributeCompletionStyle !== "none") {
                 var useBraces_1 = preferences.jsxAttributeCompletionStyle === "braces";
@@ -132203,8 +132278,7 @@ var ts;
             var isSnippet = preferences.includeCompletionsWithSnippetText || undefined;
             var insertText = name;
             var sourceFile = enclosingDeclaration.getSourceFile();
-            var importAdder = ts.codefix.createImportAdder(sourceFile, program, preferences, host);
-            var method = createObjectLiteralMethod(symbol, enclosingDeclaration, sourceFile, program, host, preferences, importAdder);
+            var method = createObjectLiteralMethod(symbol, enclosingDeclaration, sourceFile, program, host, preferences);
             if (!method) {
                 return undefined;
             }
@@ -132233,16 +132307,15 @@ var ts;
             /*modifiers*/ undefined, 
             /*name*/ "", method.questionToken, method.typeParameters, method.parameters, method.type);
             var labelDetails = { detail: signaturePrinter.printNode(4 /* Unspecified */, methodSignature, sourceFile) };
-            return { isSnippet: isSnippet, insertText: insertText, importAdder: importAdder, labelDetails: labelDetails };
+            return { isSnippet: isSnippet, insertText: insertText, labelDetails: labelDetails };
         }
         ;
-        function createObjectLiteralMethod(symbol, enclosingDeclaration, sourceFile, program, host, preferences, importAdder) {
+        function createObjectLiteralMethod(symbol, enclosingDeclaration, sourceFile, program, host, preferences) {
             var declarations = symbol.getDeclarations();
             if (!(declarations && declarations.length)) {
                 return undefined;
             }
             var checker = program.getTypeChecker();
-            var scriptTarget = ts.getEmitScriptTarget(program.getCompilerOptions());
             var declaration = declarations[0];
             var name = ts.getSynthesizedDeepClone(ts.getNameOfDeclaration(declaration), /*includeTrivia*/ false);
             var type = checker.getWidenedType(checker.getTypeOfSymbolAtLocation(symbol, enclosingDeclaration));
@@ -132275,11 +132348,6 @@ var ts;
                     if (!typeNode || !ts.isFunctionTypeNode(typeNode)) {
                         return undefined;
                     }
-                    var importableReference = ts.codefix.tryGetAutoImportableReferenceFromTypeNode(typeNode, scriptTarget);
-                    if (importableReference) {
-                        typeNode = importableReference.typeNode;
-                        ts.codefix.importSymbols(importAdder, importableReference.symbols);
-                    }
                     var body = void 0;
                     if (preferences.includeCompletionsWithSnippetText) {
                         var emptyStmt = ts.factory.createEmptyStatement();
@@ -132289,11 +132357,19 @@ var ts;
                     else {
                         body = ts.factory.createBlock([], /* multiline */ true);
                     }
+                    var parameters = typeNode.parameters.map(function (typedParam) {
+                        return ts.factory.createParameterDeclaration(
+                        /*decorators*/ undefined, 
+                        /*modifiers*/ undefined, typedParam.dotDotDotToken, typedParam.name, typedParam.questionToken, 
+                        /*type*/ undefined, typedParam.initializer);
+                    });
                     return ts.factory.createMethodDeclaration(
                     /*decorators*/ undefined, 
                     /*modifiers*/ undefined, 
                     /*asteriskToken*/ undefined, name, 
-                    /*questionToken*/ undefined, typeNode.typeParameters, typeNode.parameters, typeNode.type, body);
+                    /*questionToken*/ undefined, 
+                    /*typeParameters*/ undefined, parameters, 
+                    /*type*/ undefined, body);
                 }
                 default:
                     return undefined;
@@ -132656,20 +132732,6 @@ var ts;
                     };
                 }
             }
-            if (source === CompletionSource.ObjectLiteralMethodSnippet) {
-                var enclosingDeclaration = tryGetObjectLikeCompletionContainer(contextToken);
-                var importAdder = getEntryForObjectLiteralMethodCompletion(symbol, name, enclosingDeclaration, program, host, compilerOptions, preferences, formatContext).importAdder;
-                if (importAdder.hasFixes()) {
-                    var changes = ts.textChanges.ChangeTracker.with({ host: host, formatContext: formatContext, preferences: preferences }, importAdder.writeFixes);
-                    return {
-                        sourceDisplay: undefined,
-                        codeActions: [{
-                                changes: changes,
-                                description: ts.diagnosticToString([ts.Diagnostics.Includes_imports_of_types_referenced_by_0, name]),
-                            }],
-                    };
-                }
-            }
             if (originIsTypeOnlyAlias(origin)) {
                 var codeAction_1 = ts.codefix.getPromoteTypeOnlyCompletionAction(sourceFile, origin.declaration.name, program, host, formatContext, preferences);
                 ts.Debug.assertIsDefined(codeAction_1, "Expected to have a code action for promoting type-only alias");
@@ -135490,7 +135552,7 @@ var ts;
                 // It is fairly suspicious to have one path in two buckets - you'd expect dependencies to have similar configurations.
                 // If this occurs unexpectedly, the fix is likely to synchronize the project settings.
                 // Skip .d.ts files to reduce noise (should also cover most of node_modules).
-                var otherBucketKey = !ts.fileExtensionIs(path, ".d.ts" /* Dts */) &&
+                var otherBucketKey = !ts.isDeclarationFileName(path) &&
                     ts.forEachEntry(buckets, function (bucket, bucketKey) { return bucketKey !== key && bucket.has(path) && bucketKey; });
                 if (otherBucketKey) {
                     ts.tracing.instant("session" /* Session */, "documentRegistryBucketOverlap", { path: path, key1: otherBucketKey, key2: key });
@@ -137430,6 +137492,30 @@ var ts;
                 }
             }
             Core.eachSymbolReferenceInFile = eachSymbolReferenceInFile;
+            function getTopMostDeclarationNamesInFile(declarationName, sourceFile) {
+                var candidates = ts.filter(getPossibleSymbolReferenceNodes(sourceFile, declarationName), function (name) { return !!ts.getDeclarationFromName(name); });
+                return candidates.reduce(function (topMost, decl) {
+                    var depth = getDepth(decl);
+                    if (!ts.some(topMost.declarationNames) || depth === topMost.depth) {
+                        topMost.declarationNames.push(decl);
+                        topMost.depth = depth;
+                    }
+                    else if (depth < topMost.depth) {
+                        topMost.declarationNames = [decl];
+                        topMost.depth = depth;
+                    }
+                    return topMost;
+                }, { depth: Infinity, declarationNames: [] }).declarationNames;
+                function getDepth(declaration) {
+                    var depth = 0;
+                    while (declaration) {
+                        declaration = ts.getContainerNode(declaration);
+                        depth++;
+                    }
+                    return depth;
+                }
+            }
+            Core.getTopMostDeclarationNamesInFile = getTopMostDeclarationNamesInFile;
             function someSignatureUsage(signature, sourceFiles, checker, cb) {
                 if (!signature.name || !ts.isIdentifier(signature.name))
                     return false;
@@ -139066,7 +139152,9 @@ var ts;
 (function (ts) {
     var GoToDefinition;
     (function (GoToDefinition) {
-        function getDefinitionAtPosition(program, sourceFile, position) {
+        function getDefinitionAtPosition(program, sourceFile, position, searchOtherFilesOnly) {
+            var _a;
+            var _b;
             var resolvedRef = getReferenceAtPosition(sourceFile, position, program);
             var fileReferenceDefinition = resolvedRef && [getDefinitionInfoForFileReference(resolvedRef.reference.fileName, resolvedRef.fileName, resolvedRef.unverified)] || ts.emptyArray;
             if (resolvedRef === null || resolvedRef === void 0 ? void 0 : resolvedRef.file) {
@@ -139089,33 +139177,63 @@ var ts;
             }
             if (ts.isStaticModifier(node) && ts.isClassStaticBlockDeclaration(node.parent)) {
                 var classDecl = node.parent.parent;
-                var symbol_1 = getSymbol(classDecl, typeChecker);
+                var _c = getSymbol(classDecl, typeChecker), symbol_1 = _c.symbol, failedAliasResolution_1 = _c.failedAliasResolution;
                 var staticBlocks = ts.filter(classDecl.members, ts.isClassStaticBlockDeclaration);
                 var containerName_1 = symbol_1 ? typeChecker.symbolToString(symbol_1, classDecl) : "";
                 var sourceFile_1 = node.getSourceFile();
                 return ts.map(staticBlocks, function (staticBlock) {
                     var pos = ts.moveRangePastModifiers(staticBlock).pos;
                     pos = ts.skipTrivia(sourceFile_1.text, pos);
-                    return createDefinitionInfoFromName(typeChecker, staticBlock, "constructor" /* constructorImplementationElement */, "static {}", containerName_1, { start: pos, length: "static".length });
+                    return createDefinitionInfoFromName(typeChecker, staticBlock, "constructor" /* constructorImplementationElement */, "static {}", containerName_1, /*unverified*/ false, failedAliasResolution_1, { start: pos, length: "static".length });
                 });
             }
-            var symbol = getSymbol(node, typeChecker);
+            var _d = getSymbol(node, typeChecker), symbol = _d.symbol, failedAliasResolution = _d.failedAliasResolution;
+            var fallbackNode = node;
+            if (searchOtherFilesOnly && failedAliasResolution) {
+                // We couldn't resolve the specific import, try on the module specifier.
+                var importDeclaration = ts.forEach(__spreadArray([node], (symbol === null || symbol === void 0 ? void 0 : symbol.declarations) || ts.emptyArray, true), function (n) { return ts.findAncestor(n, ts.isAnyImportOrBareOrAccessedRequire); });
+                var moduleSpecifier = importDeclaration && ts.tryGetModuleSpecifierFromDeclaration(importDeclaration);
+                if (moduleSpecifier) {
+                    (_a = getSymbol(moduleSpecifier, typeChecker), symbol = _a.symbol, failedAliasResolution = _a.failedAliasResolution);
+                    fallbackNode = moduleSpecifier;
+                }
+            }
+            if (!symbol && ts.isModuleSpecifierLike(fallbackNode)) {
+                // We couldn't resolve the module specifier as an external module, but it could
+                // be that module resolution succeeded but the target was not a module.
+                var ref = (_b = sourceFile.resolvedModules) === null || _b === void 0 ? void 0 : _b.get(fallbackNode.text, ts.getModeForUsageLocation(sourceFile, fallbackNode));
+                if (ref) {
+                    return [{
+                            name: fallbackNode.text,
+                            fileName: ref.resolvedFileName,
+                            containerName: undefined,
+                            containerKind: undefined,
+                            kind: "script" /* scriptElement */,
+                            textSpan: ts.createTextSpan(0, 0),
+                            failedAliasResolution: failedAliasResolution,
+                            isAmbient: ts.isDeclarationFileName(ref.resolvedFileName),
+                            unverified: fallbackNode !== node,
+                        }];
+                }
+            }
             // Could not find a symbol e.g. node is string or number keyword,
             // or the symbol was an internal symbol and does not have a declaration e.g. undefined symbol
             if (!symbol) {
                 return ts.concatenate(fileReferenceDefinition, getDefinitionInfoForIndexSignatures(node, typeChecker));
             }
+            if (searchOtherFilesOnly && ts.every(symbol.declarations, function (d) { return d.getSourceFile().fileName === sourceFile.fileName; }))
+                return undefined;
             var calledDeclaration = tryGetSignatureDeclaration(typeChecker, node);
             // Don't go to the component constructor definition for a JSX element, just go to the component definition.
             if (calledDeclaration && !(ts.isJsxOpeningLikeElement(node.parent) && isConstructorLike(calledDeclaration))) {
-                var sigInfo = createDefinitionFromSignatureDeclaration(typeChecker, calledDeclaration);
+                var sigInfo = createDefinitionFromSignatureDeclaration(typeChecker, calledDeclaration, failedAliasResolution);
                 // For a function, if this is the original function definition, return just sigInfo.
                 // If this is the original constructor definition, parent is the class.
                 if (typeChecker.getRootSymbols(symbol).some(function (s) { return symbolMatchesSignature(s, calledDeclaration); })) {
                     return [sigInfo];
                 }
                 else {
-                    var defs = getDefinitionFromSymbol(typeChecker, symbol, node, calledDeclaration) || ts.emptyArray;
+                    var defs = getDefinitionFromSymbol(typeChecker, symbol, node, failedAliasResolution, calledDeclaration) || ts.emptyArray;
                     // For a 'super()' call, put the signature first, else put the variable first.
                     return node.kind === 106 /* SuperKeyword */ ? __spreadArray([sigInfo], defs, true) : __spreadArray(__spreadArray([], defs, true), [sigInfo], false);
                 }
@@ -139127,7 +139245,7 @@ var ts;
             // assignment. This case and others are handled by the following code.
             if (node.parent.kind === 297 /* ShorthandPropertyAssignment */) {
                 var shorthandSymbol_1 = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
-                var definitions = (shorthandSymbol_1 === null || shorthandSymbol_1 === void 0 ? void 0 : shorthandSymbol_1.declarations) ? shorthandSymbol_1.declarations.map(function (decl) { return createDefinitionInfo(decl, typeChecker, shorthandSymbol_1, node); }) : ts.emptyArray;
+                var definitions = (shorthandSymbol_1 === null || shorthandSymbol_1 === void 0 ? void 0 : shorthandSymbol_1.declarations) ? shorthandSymbol_1.declarations.map(function (decl) { return createDefinitionInfo(decl, typeChecker, shorthandSymbol_1, node, /*unverified*/ false, failedAliasResolution); }) : ts.emptyArray;
                 return ts.concatenate(definitions, getDefinitionFromObjectLiteralElement(typeChecker, node) || ts.emptyArray);
             }
             // If the node is the name of a BindingElement within an ObjectBindingPattern instead of just returning the
@@ -139150,7 +139268,7 @@ var ts;
                     return prop && getDefinitionFromSymbol(typeChecker, prop, node);
                 });
             }
-            return ts.concatenate(fileReferenceDefinition, getDefinitionFromObjectLiteralElement(typeChecker, node) || getDefinitionFromSymbol(typeChecker, symbol, node));
+            return ts.concatenate(fileReferenceDefinition, getDefinitionFromObjectLiteralElement(typeChecker, node) || getDefinitionFromSymbol(typeChecker, symbol, node, failedAliasResolution));
         }
         GoToDefinition.getDefinitionAtPosition = getDefinitionAtPosition;
         /**
@@ -139248,24 +139366,24 @@ var ts;
                 return undefined;
             }
             if (ts.isImportMeta(node.parent) && node.parent.name === node) {
-                return definitionFromType(typeChecker.getTypeAtLocation(node.parent), typeChecker, node.parent);
+                return definitionFromType(typeChecker.getTypeAtLocation(node.parent), typeChecker, node.parent, /*failedAliasResolution*/ false);
             }
-            var symbol = getSymbol(node, typeChecker);
+            var _a = getSymbol(node, typeChecker), symbol = _a.symbol, failedAliasResolution = _a.failedAliasResolution;
             if (!symbol)
                 return undefined;
             var typeAtLocation = typeChecker.getTypeOfSymbolAtLocation(symbol, node);
             var returnType = tryGetReturnTypeOfFunction(symbol, typeAtLocation, typeChecker);
-            var fromReturnType = returnType && definitionFromType(returnType, typeChecker, node);
+            var fromReturnType = returnType && definitionFromType(returnType, typeChecker, node, failedAliasResolution);
             // If a function returns 'void' or some other type with no definition, just return the function definition.
-            var typeDefinitions = fromReturnType && fromReturnType.length !== 0 ? fromReturnType : definitionFromType(typeAtLocation, typeChecker, node);
+            var typeDefinitions = fromReturnType && fromReturnType.length !== 0 ? fromReturnType : definitionFromType(typeAtLocation, typeChecker, node, failedAliasResolution);
             return typeDefinitions.length ? typeDefinitions
-                : !(symbol.flags & 111551 /* Value */) && symbol.flags & 788968 /* Type */ ? getDefinitionFromSymbol(typeChecker, ts.skipAlias(symbol, typeChecker), node)
+                : !(symbol.flags & 111551 /* Value */) && symbol.flags & 788968 /* Type */ ? getDefinitionFromSymbol(typeChecker, ts.skipAlias(symbol, typeChecker), node, failedAliasResolution)
                     : undefined;
         }
         GoToDefinition.getTypeDefinitionAtPosition = getTypeDefinitionAtPosition;
-        function definitionFromType(type, checker, node) {
+        function definitionFromType(type, checker, node, failedAliasResolution) {
             return ts.flatMap(type.isUnion() && !(type.flags & 32 /* Enum */) ? type.types : [type], function (t) {
-                return t.symbol && getDefinitionFromSymbol(checker, t.symbol, node);
+                return t.symbol && getDefinitionFromSymbol(checker, t.symbol, node, failedAliasResolution);
             });
         }
         function tryGetReturnTypeOfFunction(symbol, type, checker) {
@@ -139307,13 +139425,17 @@ var ts;
             // get the aliased symbol instead. This allows for goto def on an import e.g.
             //   import {A, B} from "mod";
             // to jump to the implementation directly.
+            var failedAliasResolution = false;
             if ((symbol === null || symbol === void 0 ? void 0 : symbol.declarations) && symbol.flags & 2097152 /* Alias */ && shouldSkipAlias(node, symbol.declarations[0])) {
                 var aliased = checker.getAliasedSymbol(symbol);
                 if (aliased.declarations) {
-                    return aliased;
+                    return { symbol: aliased };
+                }
+                else {
+                    failedAliasResolution = true;
                 }
             }
-            return symbol;
+            return { symbol: symbol, failedAliasResolution: failedAliasResolution };
         }
         // Go to the original declaration for cases:
         //
@@ -139327,26 +139449,45 @@ var ts;
             if (node.parent === declaration) {
                 return true;
             }
-            switch (declaration.kind) {
-                case 267 /* ImportClause */:
-                case 265 /* ImportEqualsDeclaration */:
-                    return true;
-                case 270 /* ImportSpecifier */:
-                    return declaration.parent.kind === 269 /* NamedImports */;
-                case 203 /* BindingElement */:
-                case 254 /* VariableDeclaration */:
-                    return ts.isInJSFile(declaration) && ts.isVariableDeclarationInitializedToBareOrAccessedRequire(declaration);
-                default:
-                    return false;
+            if (declaration.kind === 268 /* NamespaceImport */) {
+                return false;
             }
+            return true;
         }
-        function getDefinitionFromSymbol(typeChecker, symbol, node, declarationNode) {
-            // There are cases when you extend a function by adding properties to it afterwards,
-            // we want to strip those extra properties.
-            // For deduping purposes, we also want to exclude any declarationNodes if provided.
-            var filteredDeclarations = ts.filter(symbol.declarations, function (d) { return d !== declarationNode && (!ts.isAssignmentDeclaration(d) || d === symbol.valueDeclaration); })
-                || undefined;
-            return getConstructSignatureDefinition() || getCallSignatureDefinition() || ts.map(filteredDeclarations, function (declaration) { return createDefinitionInfo(declaration, typeChecker, symbol, node); });
+        /**
+         * ```ts
+         * function f() {}
+         * f.foo = 0;
+         * ```
+         *
+         * Here, `f` has two declarations: the function declaration, and the identifier in the next line.
+         * The latter is a declaration for `f` because it gives `f` the `SymbolFlags.Namespace` meaning so
+         * it can contain `foo`. However, that declaration is pretty uninteresting and not intuitively a
+         * "definition" for `f`. Ideally, the question we'd like to answer is "what SymbolFlags does this
+         * declaration contribute to the symbol for `f`?" If the answer is just `Namespace` and the
+         * declaration looks like an assignment, that declaration is in no sense a definition for `f`.
+         * But that information is totally lost during binding and/or symbol merging, so we need to do
+         * our best to reconstruct it or use other heuristics. This function (and the logic around its
+         * calling) covers our tests but feels like a hack, and it would be great if someone could come
+         * up with a more precise definition of what counts as a definition.
+         */
+        function isExpandoDeclaration(node) {
+            if (!ts.isAssignmentDeclaration(node))
+                return false;
+            var containingAssignment = ts.findAncestor(node, function (p) {
+                if (ts.isAssignmentExpression(p))
+                    return true;
+                if (!ts.isAssignmentDeclaration(p))
+                    return "quit";
+                return false;
+            });
+            return !!containingAssignment && ts.getAssignmentDeclarationKind(containingAssignment) === 5 /* Property */;
+        }
+        function getDefinitionFromSymbol(typeChecker, symbol, node, failedAliasResolution, excludeDeclaration) {
+            var filteredDeclarations = ts.filter(symbol.declarations, function (d) { return d !== excludeDeclaration; });
+            var withoutExpandos = ts.filter(filteredDeclarations, function (d) { return !isExpandoDeclaration(d); });
+            var results = ts.some(withoutExpandos) ? withoutExpandos : filteredDeclarations;
+            return getConstructSignatureDefinition() || getCallSignatureDefinition() || ts.map(results, function (declaration) { return createDefinitionInfo(declaration, typeChecker, symbol, node, /*unverified*/ false, failedAliasResolution); });
             function getConstructSignatureDefinition() {
                 // Applicable only if we are in a new expression, or we are on a constructor declaration
                 // and in either case the symbol has a construct signature definition, i.e. class
@@ -139370,26 +139511,27 @@ var ts;
                 return declarations.length
                     ? declarationsWithBody.length !== 0
                         ? declarationsWithBody.map(function (x) { return createDefinitionInfo(x, typeChecker, symbol, node); })
-                        : [createDefinitionInfo(ts.last(declarations), typeChecker, symbol, node)]
+                        : [createDefinitionInfo(ts.last(declarations), typeChecker, symbol, node, /*unverified*/ false, failedAliasResolution)]
                     : undefined;
             }
         }
         /** Creates a DefinitionInfo from a Declaration, using the declaration's name if possible. */
-        function createDefinitionInfo(declaration, checker, symbol, node) {
+        function createDefinitionInfo(declaration, checker, symbol, node, unverified, failedAliasResolution) {
             var symbolName = checker.symbolToString(symbol); // Do not get scoped name, just the name of the symbol
             var symbolKind = ts.SymbolDisplay.getSymbolKind(checker, symbol, node);
             var containerName = symbol.parent ? checker.symbolToString(symbol.parent, node) : "";
-            return createDefinitionInfoFromName(checker, declaration, symbolKind, symbolName, containerName);
+            return createDefinitionInfoFromName(checker, declaration, symbolKind, symbolName, containerName, unverified, failedAliasResolution);
         }
+        GoToDefinition.createDefinitionInfo = createDefinitionInfo;
         /** Creates a DefinitionInfo directly from the name of a declaration. */
-        function createDefinitionInfoFromName(checker, declaration, symbolKind, symbolName, containerName, textSpan) {
+        function createDefinitionInfoFromName(checker, declaration, symbolKind, symbolName, containerName, unverified, failedAliasResolution, textSpan) {
             var sourceFile = declaration.getSourceFile();
             if (!textSpan) {
                 var name = ts.getNameOfDeclaration(declaration) || declaration;
                 textSpan = ts.createTextSpanFromNode(name, sourceFile);
             }
             return __assign(__assign({ fileName: sourceFile.fileName, textSpan: textSpan, kind: symbolKind, name: symbolName, containerKind: undefined, // TODO: GH#18217
-                containerName: containerName }, ts.FindAllReferences.toContextSpan(textSpan, sourceFile, ts.FindAllReferences.getContextNode(declaration))), { isLocal: !isDefinitionVisible(checker, declaration) });
+                containerName: containerName }, ts.FindAllReferences.toContextSpan(textSpan, sourceFile, ts.FindAllReferences.getContextNode(declaration))), { isLocal: !isDefinitionVisible(checker, declaration), isAmbient: !!(declaration.flags & 16777216 /* Ambient */), unverified: unverified, failedAliasResolution: failedAliasResolution });
         }
         function isDefinitionVisible(checker, declaration) {
             if (checker.isDeclarationVisible(declaration))
@@ -139422,8 +139564,8 @@ var ts;
                     return false;
             }
         }
-        function createDefinitionFromSignatureDeclaration(typeChecker, decl) {
-            return createDefinitionInfo(decl, typeChecker, decl.symbol, decl);
+        function createDefinitionFromSignatureDeclaration(typeChecker, decl, failedAliasResolution) {
+            return createDefinitionInfo(decl, typeChecker, decl.symbol, decl, /*unverified*/ false, failedAliasResolution);
         }
         function findReferenceInPosition(refs, pos) {
             return ts.find(refs, function (ref) { return ts.textRangeContainsPositionInclusive(ref, pos); });
@@ -152538,9 +152680,10 @@ var ts;
             //     2. add "member3" to the second import statement's import list
             // and it is up to the user to decide which one fits best.
             return ts.firstDefined(existingImports, function (_a) {
+                var _b;
                 var declaration = _a.declaration;
                 var namespacePrefix = getNamespaceLikeImportText(declaration);
-                var moduleSpecifier = ts.tryGetModuleSpecifierFromDeclaration(declaration);
+                var moduleSpecifier = (_b = ts.tryGetModuleSpecifierFromDeclaration(declaration)) === null || _b === void 0 ? void 0 : _b.text;
                 if (namespacePrefix && moduleSpecifier) {
                     var moduleSymbol = getTargetModuleFromNamespaceLikeImport(declaration, checker);
                     if (moduleSymbol && moduleSymbol.exports.has(ts.escapeLeadingUnderscores(symbolName))) {
@@ -152716,8 +152859,9 @@ var ts;
             return existingDeclaration ? [existingDeclaration] : getNewImportFixes(program, sourceFile, position, isValidTypeOnlyUseSite, useRequire, exportInfos, host, preferences).fixes;
         }
         function newImportInfoFromExistingSpecifier(_a, isValidTypeOnlyUseSite, useRequire, checker, compilerOptions) {
+            var _b;
             var declaration = _a.declaration, importKind = _a.importKind, symbol = _a.symbol, targetFlags = _a.targetFlags;
-            var moduleSpecifier = ts.tryGetModuleSpecifierFromDeclaration(declaration);
+            var moduleSpecifier = (_b = ts.tryGetModuleSpecifierFromDeclaration(declaration)) === null || _b === void 0 ? void 0 : _b.text;
             if (moduleSpecifier) {
                 var addAsTypeOnly = useRequire
                     ? 4 /* NotAllowed */
@@ -157075,7 +157219,6 @@ var ts;
             var checker = program.getTypeChecker();
             var scriptTarget = ts.getEmitScriptTarget(program.getCompilerOptions());
             var flags = 1 /* NoTruncation */
-                | 1073741824 /* NoUndefinedOptionalParameterType */
                 | 256 /* SuppressAnyReturnType */
                 | 524288 /* AllowEmptyTuple */
                 | (quotePreference === 0 /* Single */ ? 268435456 /* UseSingleQuotesForStringLiteralType */ : 0 /* None */);
@@ -159454,6 +159597,7 @@ var ts;
                 Messages.cannotAccessVariablesFromNestedScopes = createMessage("Cannot access variables from nested scopes");
                 Messages.cannotExtractToJSClass = createMessage("Cannot extract constant to a class scope in JS");
                 Messages.cannotExtractToExpressionArrowFunction = createMessage("Cannot extract constant to an arrow function without a block");
+                Messages.cannotExtractFunctionsContainingThisToMethod = createMessage("Cannot extract functions containing this to method");
             })(Messages = extractSymbol.Messages || (extractSymbol.Messages = {}));
             var RangeFacts;
             (function (RangeFacts) {
@@ -159462,10 +159606,11 @@ var ts;
                 RangeFacts[RangeFacts["IsGenerator"] = 2] = "IsGenerator";
                 RangeFacts[RangeFacts["IsAsyncFunction"] = 4] = "IsAsyncFunction";
                 RangeFacts[RangeFacts["UsesThis"] = 8] = "UsesThis";
+                RangeFacts[RangeFacts["UsesThisInFunction"] = 16] = "UsesThisInFunction";
                 /**
                  * The range is in a function which needs the 'static' modifier in a class
                  */
-                RangeFacts[RangeFacts["InStaticRegion"] = 16] = "InStaticRegion";
+                RangeFacts[RangeFacts["InStaticRegion"] = 32] = "InStaticRegion";
             })(RangeFacts || (RangeFacts = {}));
             /**
              * getRangeToExtract takes a span inside a text file and returns either an expression or an array
@@ -159496,6 +159641,7 @@ var ts;
                 // We'll modify these flags as we walk the tree to collect data
                 // about what things need to be done as part of the extraction.
                 var rangeFacts = RangeFacts.None;
+                var thisNode;
                 if (!start || !end) {
                     // cannot find either start or end node
                     return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractRange)] };
@@ -159534,7 +159680,7 @@ var ts;
                         // the expression.
                         return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractRange)] };
                     }
-                    return { targetRange: { range: statements, facts: rangeFacts, declarations: declarations } };
+                    return { targetRange: { range: statements, facts: rangeFacts, declarations: declarations, thisNode: thisNode } };
                 }
                 if (ts.isReturnStatement(start) && !start.expression) {
                     // Makes no sense to extract an expression-less return statement.
@@ -159546,7 +159692,7 @@ var ts;
                 if (errors) {
                     return { errors: errors };
                 }
-                return { targetRange: { range: getStatementOrExpressionRange(node), facts: rangeFacts, declarations: declarations } }; // TODO: GH#18217
+                return { targetRange: { range: getStatementOrExpressionRange(node), facts: rangeFacts, declarations: declarations, thisNode: thisNode } }; // TODO: GH#18217
                 /**
                  * Attempt to refine the extraction node (generally, by shrinking it) to produce better results.
                  * @param node The unrefined extraction node.
@@ -159638,6 +159784,14 @@ var ts;
                     var permittedJumps = 4 /* Return */;
                     var seenLabels;
                     visit(nodeToCheck);
+                    if (rangeFacts & RangeFacts.UsesThis) {
+                        var container = ts.getThisContainer(nodeToCheck, /** includeArrowFunctions */ false);
+                        if (container.kind === 256 /* FunctionDeclaration */ ||
+                            (container.kind === 169 /* MethodDeclaration */ && container.parent.kind === 205 /* ObjectLiteralExpression */) ||
+                            container.kind === 213 /* FunctionExpression */) {
+                            rangeFacts |= RangeFacts.UsesThisInFunction;
+                        }
+                    }
                     return errors;
                     function visit(node) {
                         if (errors) {
@@ -159676,6 +159830,7 @@ var ts;
                                 }
                                 else {
                                     rangeFacts |= RangeFacts.UsesThis;
+                                    thisNode = node;
                                 }
                                 break;
                             case 214 /* ArrowFunction */:
@@ -159683,6 +159838,7 @@ var ts;
                                 ts.forEachChild(node, function check(n) {
                                     if (ts.isThis(n)) {
                                         rangeFacts |= RangeFacts.UsesThis;
+                                        thisNode = node;
                                     }
                                     else if (ts.isClassLike(n) || (ts.isFunctionLike(n) && !ts.isArrowFunction(n))) {
                                         return false;
@@ -159739,6 +159895,7 @@ var ts;
                             case 192 /* ThisType */:
                             case 108 /* ThisKeyword */:
                                 rangeFacts |= RangeFacts.UsesThis;
+                                thisNode = node;
                                 break;
                             case 250 /* LabeledStatement */: {
                                 var label = node.label;
@@ -159826,7 +159983,7 @@ var ts;
              */
             function collectEnclosingScopes(range) {
                 var current = isReadonlyArray(range.range) ? ts.first(range.range) : range.range;
-                if (range.facts & RangeFacts.UsesThis) {
+                if (range.facts & RangeFacts.UsesThis && !(range.facts & RangeFacts.UsesThisInFunction)) {
                     // if range uses this as keyword or as type inside the class then it can only be extracted to a method of the containing class
                     var containingClass = ts.getContainingClass(current);
                     if (containingClass) {
@@ -160032,6 +160189,7 @@ var ts;
                 var _b = transformFunctionBody(node, exposedVariableDeclarations, writes, substitutions, !!(range.facts & RangeFacts.HasReturn)), body = _b.body, returnValueProperty = _b.returnValueProperty;
                 ts.suppressLeadingAndTrailingTrivia(body);
                 var newFunction;
+                var callThis = !!(range.facts & RangeFacts.UsesThisInFunction);
                 if (ts.isClassLike(scope)) {
                     // always create private method in TypeScript files
                     var modifiers = isJS ? [] : [ts.factory.createModifier(121 /* PrivateKeyword */)];
@@ -160046,6 +160204,15 @@ var ts;
                     /*questionToken*/ undefined, typeParameters, parameters, returnType, body);
                 }
                 else {
+                    if (callThis) {
+                        parameters.unshift(ts.factory.createParameterDeclaration(
+                        /*decorators*/ undefined, 
+                        /*modifiers*/ undefined, 
+                        /*dotDotDotToken*/ undefined, 
+                        /*name*/ "this", 
+                        /*questionToken*/ undefined, checker.typeToTypeNode(checker.getTypeAtLocation(range.thisNode), scope, 1 /* NoTruncation */), 
+                        /*initializer*/ undefined));
+                    }
                     newFunction = ts.factory.createFunctionDeclaration(
                     /*decorators*/ undefined, range.facts & RangeFacts.IsAsyncFunction ? [ts.factory.createToken(131 /* AsyncKeyword */)] : undefined, range.facts & RangeFacts.IsGenerator ? ts.factory.createToken(41 /* AsteriskToken */) : undefined, functionName, typeParameters, parameters, returnType, body);
                 }
@@ -160062,7 +160229,10 @@ var ts;
                 var newNodes = [];
                 // replace range with function call
                 var called = getCalledExpression(scope, range, functionNameText);
-                var call = ts.factory.createCallExpression(called, callTypeArguments, // Note that no attempt is made to take advantage of type argument inference
+                if (callThis) {
+                    callArguments.unshift(ts.factory.createIdentifier("this"));
+                }
+                var call = ts.factory.createCallExpression(callThis ? ts.factory.createPropertyAccessExpression(called, "call") : called, callTypeArguments, // Note that no attempt is made to take advantage of type argument inference
                 callArguments);
                 if (range.facts & RangeFacts.IsGenerator) {
                     call = ts.factory.createYieldExpression(ts.factory.createToken(41 /* AsteriskToken */), call);
@@ -160673,6 +160843,9 @@ var ts;
                         var errorNode = isReadonlyArray(targetRange.range) ? targetRange.range[0] : targetRange.range;
                         constantErrorsPerScope[i].push(ts.createDiagnosticForNode(errorNode, Messages.cannotAccessVariablesFromNestedScopes));
                     }
+                    if (targetRange.facts & RangeFacts.UsesThisInFunction && ts.isClassLike(scopes[i])) {
+                        functionErrorsPerScope[i].push(ts.createDiagnosticForNode(targetRange.thisNode, Messages.cannotExtractFunctionsContainingThisToMethod));
+                    }
                     var hasWrite = false;
                     var readonlyClassPropertyWrite;
                     usagesPerScope[i].usages.forEach(function (value) {
@@ -164626,9 +164799,9 @@ var ts;
             }
         }
         /// Goto definition
-        function getDefinitionAtPosition(fileName, position) {
+        function getDefinitionAtPosition(fileName, position, searchOtherFilesOnly) {
             synchronizeHostData();
-            return ts.GoToDefinition.getDefinitionAtPosition(program, getValidSourceFile(fileName), position);
+            return ts.GoToDefinition.getDefinitionAtPosition(program, getValidSourceFile(fileName), position, searchOtherFilesOnly);
         }
         function getDefinitionAndBoundSpan(fileName, position) {
             synchronizeHostData();
@@ -167169,6 +167342,11 @@ var ts;
             return "/dev/null/autoImportProviderProject" + counter + "*";
         }
         server.makeAutoImportProviderProjectName = makeAutoImportProviderProjectName;
+        /*@internal*/
+        function makeAuxiliaryProjectName(counter) {
+            return "/dev/null/auxiliaryProject" + counter + "*";
+        }
+        server.makeAuxiliaryProjectName = makeAuxiliaryProjectName;
         function createSortedArray() {
             return []; // TODO: GH#19873
         }
@@ -167382,6 +167560,7 @@ var ts;
                 CommandTypes["SignatureHelp"] = "signatureHelp";
                 /* @internal */
                 CommandTypes["SignatureHelpFull"] = "signatureHelp-full";
+                CommandTypes["FindSourceDefinition"] = "findSourceDefinition";
                 CommandTypes["Status"] = "status";
                 CommandTypes["TypeDefinition"] = "typeDefinition";
                 CommandTypes["ProjectInfo"] = "projectInfo";
@@ -167961,7 +168140,7 @@ var ts;
                     case 0:
                         return server.Errors.ThrowNoProject();
                     case 1:
-                        return ensureNotAutoImportProvider(this.containingProjects[0]);
+                        return ensurePrimaryProjectKind(this.containingProjects[0]);
                     default:
                         // If this file belongs to multiple projects, below is the order in which default project is used
                         // - for open script info, its default configured project during opening is default if info is part of it
@@ -167999,7 +168178,7 @@ var ts;
                                 firstInferredProject = project;
                             }
                         }
-                        return ensureNotAutoImportProvider(defaultConfiguredProject ||
+                        return ensurePrimaryProjectKind(defaultConfiguredProject ||
                             firstNonSourceOfProjectReferenceRedirect ||
                             firstConfiguredProject ||
                             firstExternalProject ||
@@ -168075,8 +168254,8 @@ var ts;
                 return !ts.forEach(this.containingProjects, function (p) { return !p.isOrphan(); });
             };
             /*@internal*/
-            ScriptInfo.prototype.isContainedByAutoImportProvider = function () {
-                return ts.some(this.containingProjects, function (p) { return p.projectKind === server.ProjectKind.AutoImportProvider; });
+            ScriptInfo.prototype.isContainedByBackgroundProject = function () {
+                return ts.some(this.containingProjects, function (p) { return p.projectKind === server.ProjectKind.AutoImportProvider || p.projectKind === server.ProjectKind.Auxiliary; });
             };
             /**
              *  @param line 1 based index
@@ -168110,8 +168289,13 @@ var ts;
             return ScriptInfo;
         }());
         server.ScriptInfo = ScriptInfo;
-        function ensureNotAutoImportProvider(project) {
-            if (!project || project.projectKind === server.ProjectKind.AutoImportProvider) {
+        /**
+         * Throws an error if `project` is an AutoImportProvider or AuxiliaryProject,
+         * which are used in the background by other Projects and should never be
+         * reported as the default project for a ScriptInfo.
+         */
+        function ensurePrimaryProjectKind(project) {
+            if (!project || project.projectKind === server.ProjectKind.AutoImportProvider || project.projectKind === server.ProjectKind.Auxiliary) {
                 return server.Errors.ThrowNoProject();
             }
             return project;
@@ -168251,6 +168435,7 @@ var ts;
             ProjectKind[ProjectKind["Configured"] = 1] = "Configured";
             ProjectKind[ProjectKind["External"] = 2] = "External";
             ProjectKind[ProjectKind["AutoImportProvider"] = 3] = "AutoImportProvider";
+            ProjectKind[ProjectKind["Auxiliary"] = 4] = "Auxiliary";
         })(ProjectKind = server.ProjectKind || (server.ProjectKind = {}));
         /* @internal */
         function countEachFileTypes(infos, includeSizes) {
@@ -168276,7 +168461,7 @@ var ts;
                         result.jsxSize += fileSize;
                         break;
                     case 3 /* TS */:
-                        if (ts.fileExtensionIs(info.fileName, ".d.ts" /* Dts */)) {
+                        if (ts.isDeclarationFileName(info.fileName)) {
                             result.dts += 1;
                             result.dtsSize += fileSize;
                         }
@@ -168314,7 +168499,7 @@ var ts;
         server.allFilesAreJsOrDts = allFilesAreJsOrDts;
         /* @internal */
         function hasNoTypeScriptSource(fileNames) {
-            return !fileNames.some(function (fileName) { return (ts.fileExtensionIs(fileName, ".ts" /* Ts */) && !ts.fileExtensionIs(fileName, ".d.ts" /* Dts */)) || ts.fileExtensionIs(fileName, ".tsx" /* Tsx */); });
+            return !fileNames.some(function (fileName) { return (ts.fileExtensionIs(fileName, ".ts" /* Ts */) && !ts.isDeclarationFileName(fileName)) || ts.fileExtensionIs(fileName, ".tsx" /* Tsx */); });
         }
         server.hasNoTypeScriptSource = hasNoTypeScriptSource;
         function isGeneratedFileWatcher(watch) {
@@ -168718,7 +168903,7 @@ var ts;
                     }
                     // Update the signature
                     if (this.builderState && ts.getEmitDeclarations(this.compilerOptions)) {
-                        var dtsFiles = outputFiles.filter(function (f) { return ts.fileExtensionIs(f.name, ".d.ts" /* Dts */); });
+                        var dtsFiles = outputFiles.filter(function (f) { return ts.isDeclarationFileName(f.name); });
                         if (dtsFiles.length === 1) {
                             var sourceFile = this.program.getSourceFile(scriptInfo.fileName);
                             var signature = this.projectService.host.createHash ?
@@ -168837,6 +169022,10 @@ var ts;
                     this.autoImportProviderHost.close();
                 }
                 this.autoImportProviderHost = undefined;
+                if (this.noDtsResolutionProject) {
+                    this.noDtsResolutionProject.close();
+                }
+                this.noDtsResolutionProject = undefined;
                 // signal language service to release source files acquired from document registry
                 this.languageService.dispose();
                 this.languageService = undefined;
@@ -169359,11 +169548,13 @@ var ts;
                 }
             };
             Project.prototype.setCompilerOptions = function (compilerOptions) {
+                var _a;
                 if (compilerOptions) {
                     compilerOptions.allowNonTsExtensions = true;
                     var oldOptions = this.compilerOptions;
                     this.compilerOptions = compilerOptions;
                     this.setInternalCompilerOptionsForEmittingJsFiles();
+                    (_a = this.noDtsResolutionProject) === null || _a === void 0 ? void 0 : _a.setCompilerOptions(this.getCompilerOptionsForNoDtsResolutionProject());
                     if (ts.changesAffectModuleResolution(oldOptions, compilerOptions)) {
                         // reset cached unresolved imports if changes in compiler options affected module resolution
                         this.cachedUnresolvedImportsPerFile.clear();
@@ -169703,6 +169894,31 @@ var ts;
             Project.prototype.getIncompleteCompletionsCache = function () {
                 return this.projectService.getIncompleteCompletionsCache();
             };
+            /*@internal*/
+            Project.prototype.getNoDtsResolutionProject = function (rootFileNames) {
+                var _this = this;
+                ts.Debug.assert(this.projectService.serverMode === ts.LanguageServiceMode.Semantic);
+                if (!this.noDtsResolutionProject) {
+                    this.noDtsResolutionProject = new AuxiliaryProject(this.projectService, this.documentRegistry, this.getCompilerOptionsForNoDtsResolutionProject());
+                }
+                ts.enumerateInsertsAndDeletes(rootFileNames.map(server.toNormalizedPath), this.noDtsResolutionProject.getRootFiles(), ts.getStringComparer(!this.useCaseSensitiveFileNames()), function (pathToAdd) {
+                    var info = _this.projectService.getOrCreateScriptInfoNotOpenedByClient(pathToAdd, _this.currentDirectory, _this.noDtsResolutionProject.directoryStructureHost);
+                    if (info) {
+                        _this.noDtsResolutionProject.addRoot(info, pathToAdd);
+                    }
+                }, function (pathToRemove) {
+                    // It may be preferable to remove roots only once project grows to a certain size?
+                    var info = _this.noDtsResolutionProject.getScriptInfo(pathToRemove);
+                    if (info) {
+                        _this.noDtsResolutionProject.removeRoot(info);
+                    }
+                });
+                return this.noDtsResolutionProject;
+            };
+            /*@internal*/
+            Project.prototype.getCompilerOptionsForNoDtsResolutionProject = function () {
+                return __assign(__assign({}, this.getCompilerOptions()), { noDtsResolution: true, allowJs: true, maxNodeModuleJsDepth: 3, diagnostics: false, skipLibCheck: true, sourceMap: false, types: ts.emptyArray, lib: ts.emptyArray, noLib: true });
+            };
             return Project;
         }());
         server.Project = Project;
@@ -169818,6 +170034,26 @@ var ts;
             return InferredProject;
         }(Project));
         server.InferredProject = InferredProject;
+        var AuxiliaryProject = /** @class */ (function (_super) {
+            __extends(AuxiliaryProject, _super);
+            function AuxiliaryProject(projectService, documentRegistry, compilerOptions) {
+                return _super.call(this, projectService.newAuxiliaryProjectName(), ProjectKind.Auxiliary, projectService, documentRegistry, 
+                /*hasExplicitListOfFiles*/ false, 
+                /*lastFileExceededProgramSize*/ undefined, compilerOptions, 
+                /*compileOnSaveEnabled*/ false, 
+                /*watchOptions*/ undefined, projectService.host, 
+                /*currentDirectory*/ undefined) || this;
+            }
+            AuxiliaryProject.prototype.isOrphan = function () {
+                return true;
+            };
+            /*@internal*/
+            AuxiliaryProject.prototype.scheduleInvalidateResolutionsOfFailedLookupLocations = function () {
+                // Invalidation will happen on-demand as part of updateGraph
+                return;
+            };
+            return AuxiliaryProject;
+        }(Project));
         var AutoImportProviderProject = /** @class */ (function (_super) {
             __extends(AutoImportProviderProject, _super);
             /*@internal*/
@@ -169969,6 +170205,11 @@ var ts;
                 }
                 return hasSameSetOfFiles;
             };
+            /*@internal*/
+            AutoImportProviderProject.prototype.scheduleInvalidateResolutionsOfFailedLookupLocations = function () {
+                // Invalidation will happen on-demand as part of updateGraph
+                return;
+            };
             AutoImportProviderProject.prototype.hasRoots = function () {
                 var _a;
                 return !!((_a = this.rootFileNames) === null || _a === void 0 ? void 0 : _a.length);
@@ -170654,6 +170895,8 @@ var ts;
                 this.newInferredProjectName = createProjectNameFactoryWithCounter(server.makeInferredProjectName);
                 /*@internal*/
                 this.newAutoImportProviderProjectName = createProjectNameFactoryWithCounter(server.makeAutoImportProviderProjectName);
+                /*@internal*/
+                this.newAuxiliaryProjectName = createProjectNameFactoryWithCounter(server.makeAuxiliaryProjectName);
                 /**
                  * Open files: with value being project root path, and key being Path of the file that is open
                  */
@@ -170857,13 +171100,15 @@ var ts;
             ProjectService.prototype.delayUpdateProjectGraph = function (project) {
                 var _this = this;
                 project.markAsDirty();
-                var projectName = project.getProjectName();
-                this.pendingProjectUpdates.set(projectName, project);
-                this.throttledOperations.schedule(projectName, /*delay*/ 250, function () {
-                    if (_this.pendingProjectUpdates.delete(projectName)) {
-                        updateProjectIfDirty(project);
-                    }
-                });
+                if (project.projectKind !== server.ProjectKind.AutoImportProvider && project.projectKind !== server.ProjectKind.Auxiliary) {
+                    var projectName_1 = project.getProjectName();
+                    this.pendingProjectUpdates.set(projectName_1, project);
+                    this.throttledOperations.schedule(projectName_1, /*delay*/ 250, function () {
+                        if (_this.pendingProjectUpdates.delete(projectName_1)) {
+                            updateProjectIfDirty(project);
+                        }
+                    });
+                }
             };
             /*@internal*/
             ProjectService.prototype.hasPendingProjectUpdate = function (project) {
@@ -173144,7 +173389,7 @@ var ts;
                 var toRemoveScriptInfos = new ts.Map(this.filenameToScriptInfo);
                 this.filenameToScriptInfo.forEach(function (info) {
                     // If script info is open or orphan, retain it and its dependencies
-                    if (!info.isScriptOpen() && info.isOrphan() && !info.isContainedByAutoImportProvider()) {
+                    if (!info.isScriptOpen() && info.isOrphan() && !info.isContainedByBackgroundProject()) {
                         // Otherwise if there is any source info that is alive, this alive too
                         if (!info.sourceMapFilePath)
                             return;
@@ -174440,6 +174685,9 @@ var ts;
                     _a[server.CommandNames.DefinitionAndBoundSpanFull] = function (request) {
                         return _this.requiredResponse(_this.getDefinitionAndBoundSpan(request.arguments, /*simplifiedResult*/ false));
                     },
+                    _a[server.CommandNames.FindSourceDefinition] = function (request) {
+                        return _this.requiredResponse(_this.findSourceDefinition(request.arguments));
+                    },
                     _a[server.CommandNames.EmitOutput] = function (request) {
                         return _this.requiredResponse(_this.getEmitOutput(request.arguments));
                     },
@@ -175181,7 +175429,7 @@ var ts;
             Session.prototype.mapDefinitionInfoLocations = function (definitions, project) {
                 return definitions.map(function (info) {
                     var newDocumentSpan = getMappedDocumentSpan(info, project);
-                    return !newDocumentSpan ? info : __assign(__assign(__assign({}, newDocumentSpan), { containerKind: info.containerKind, containerName: info.containerName, kind: info.kind, name: info.name }), info.unverified && { unverified: info.unverified });
+                    return !newDocumentSpan ? info : __assign(__assign(__assign({}, newDocumentSpan), { containerKind: info.containerKind, containerName: info.containerName, kind: info.kind, name: info.name, failedAliasResolution: info.failedAliasResolution }), info.unverified && { unverified: info.unverified });
                 });
             };
             Session.prototype.getDefinitionAndBoundSpan = function (args, simplifiedResult) {
@@ -175208,6 +175456,152 @@ var ts;
                     textSpan: textSpan,
                 };
             };
+            Session.prototype.findSourceDefinition = function (args) {
+                var _a;
+                var _b = this.getFileAndProject(args), file = _b.file, project = _b.project;
+                var position = this.getPositionInFile(args, file);
+                var unmappedDefinitions = project.getLanguageService().getDefinitionAtPosition(file, position);
+                var definitions = this.mapDefinitionInfoLocations(unmappedDefinitions || server.emptyArray, project).slice();
+                var needsJsResolution = this.projectService.serverMode === ts.LanguageServiceMode.Semantic && (!ts.some(definitions, function (d) { return server.toNormalizedPath(d.fileName) !== file && !d.isAmbient; }) ||
+                    ts.some(definitions, function (d) { return !!d.failedAliasResolution; }));
+                if (needsJsResolution) {
+                    var definitionSet_1 = ts.createSet(function (d) { return d.textSpan.start; }, ts.documentSpansEqual);
+                    definitions === null || definitions === void 0 ? void 0 : definitions.forEach(function (d) { return definitionSet_1.add(d); });
+                    var noDtsProject = project.getNoDtsResolutionProject([file]);
+                    var ls = noDtsProject.getLanguageService();
+                    var jsDefinitions = (_a = ls.getDefinitionAtPosition(file, position, /*searchOtherFilesOnly*/ true)) === null || _a === void 0 ? void 0 : _a.filter(function (d) { return server.toNormalizedPath(d.fileName) !== file; });
+                    if (ts.some(jsDefinitions)) {
+                        for (var _i = 0, jsDefinitions_1 = jsDefinitions; _i < jsDefinitions_1.length; _i++) {
+                            var jsDefinition = jsDefinitions_1[_i];
+                            if (jsDefinition.unverified) {
+                                var refined = tryRefineDefinition(jsDefinition, project.getLanguageService().getProgram(), ls.getProgram());
+                                if (ts.some(refined)) {
+                                    for (var _c = 0, refined_1 = refined; _c < refined_1.length; _c++) {
+                                        var def = refined_1[_c];
+                                        definitionSet_1.add(def);
+                                    }
+                                    continue;
+                                }
+                            }
+                            definitionSet_1.add(jsDefinition);
+                        }
+                    }
+                    else {
+                        var ambientCandidates = definitions.filter(function (d) { return server.toNormalizedPath(d.fileName) !== file && d.isAmbient; });
+                        for (var _d = 0, _e = ts.some(ambientCandidates) ? ambientCandidates : getAmbientCandidatesByClimbingAccessChain(); _d < _e.length; _d++) {
+                            var candidate = _e[_d];
+                            var fileNameToSearch = findImplementationFileFromDtsFileName(candidate.fileName, file, noDtsProject);
+                            if (!fileNameToSearch || !ensureRoot(noDtsProject, fileNameToSearch)) {
+                                continue;
+                            }
+                            var noDtsProgram = ls.getProgram();
+                            var fileToSearch = ts.Debug.checkDefined(noDtsProgram.getSourceFile(fileNameToSearch));
+                            for (var _f = 0, _g = searchForDeclaration(candidate.name, fileToSearch, noDtsProgram); _f < _g.length; _f++) {
+                                var match = _g[_f];
+                                definitionSet_1.add(match);
+                            }
+                        }
+                    }
+                    definitions = ts.arrayFrom(definitionSet_1.values());
+                }
+                definitions = definitions.filter(function (d) { return !d.isAmbient && !d.failedAliasResolution; });
+                return this.mapDefinitionInfo(definitions, project);
+                function findImplementationFileFromDtsFileName(fileName, resolveFromFile, auxiliaryProject) {
+                    var _a;
+                    var nodeModulesPathParts = ts.getNodeModulePathParts(fileName);
+                    if (nodeModulesPathParts && fileName.lastIndexOf(ts.nodeModulesPathPart) === nodeModulesPathParts.topLevelNodeModulesIndex) {
+                        // Second check ensures the fileName only contains one `/node_modules/`. If there's more than one I give up.
+                        var packageDirectory = fileName.substring(0, nodeModulesPathParts.packageRootIndex);
+                        var packageJsonCache = (_a = project.getModuleResolutionCache()) === null || _a === void 0 ? void 0 : _a.getPackageJsonInfoCache();
+                        var compilerOptions = project.getCompilationSettings();
+                        var packageJson = ts.getPackageScopeForPath(project.toPath(packageDirectory + "/package.json"), packageJsonCache, project, compilerOptions);
+                        if (!packageJson)
+                            return undefined;
+                        // Use fake options instead of actual compiler options to avoid following export map if the project uses node12 or nodenext -
+                        // Mapping from an export map entry across packages is out of scope for now. Returned entrypoints will only be what can be
+                        // resolved from the package root under --moduleResolution node
+                        var entrypoints = ts.getEntrypointsFromPackageJsonInfo(packageJson, { moduleResolution: ts.ModuleResolutionKind.NodeJs }, project, project.getModuleResolutionCache());
+                        // This substring is correct only because we checked for a single `/node_modules/` at the top.
+                        var packageNamePathPart = fileName.substring(nodeModulesPathParts.topLevelPackageNameIndex + 1, nodeModulesPathParts.packageRootIndex);
+                        var packageName = ts.getPackageNameFromTypesPackageName(ts.unmangleScopedPackageName(packageNamePathPart));
+                        var path_1 = project.toPath(fileName);
+                        if (entrypoints && ts.some(entrypoints, function (e) { return project.toPath(e) === path_1; })) {
+                            // This file was the main entrypoint of a package. Try to resolve that same package name with
+                            // the auxiliary project that only resolves to implementation files.
+                            var implementationResolution = auxiliaryProject.resolveModuleNames([packageName], resolveFromFile)[0];
+                            return implementationResolution === null || implementationResolution === void 0 ? void 0 : implementationResolution.resolvedFileName;
+                        }
+                        else {
+                            // It wasn't the main entrypoint but we are in node_modules. Try a subpath into the package.
+                            var pathToFileInPackage = fileName.substring(nodeModulesPathParts.packageRootIndex + 1);
+                            var specifier = packageName + "/" + ts.removeFileExtension(pathToFileInPackage);
+                            var implementationResolution = auxiliaryProject.resolveModuleNames([specifier], resolveFromFile)[0];
+                            return implementationResolution === null || implementationResolution === void 0 ? void 0 : implementationResolution.resolvedFileName;
+                        }
+                    }
+                    // We're not in node_modules, and we only get to this function if non-dts module resolution failed.
+                    // I'm not sure what else I can do here that isn't already covered by that module resolution.
+                    return undefined;
+                }
+                // In 'foo.bar./**/baz', if we got not results on 'baz', see if we can get an ambient definition
+                // for 'bar' or 'foo' (in that order) so we can search for declarations of 'baz' later.
+                function getAmbientCandidatesByClimbingAccessChain() {
+                    var ls = project.getLanguageService();
+                    var program = ls.getProgram();
+                    var initialNode = ts.getTouchingPropertyName(program.getSourceFile(file), position);
+                    if ((ts.isStringLiteralLike(initialNode) || ts.isIdentifier(initialNode)) && ts.isAccessExpression(initialNode.parent)) {
+                        return ts.forEachNameInAccessChainWalkingLeft(initialNode, function (nameInChain) {
+                            var _a;
+                            if (nameInChain === initialNode)
+                                return undefined;
+                            var candidates = (_a = ls.getDefinitionAtPosition(file, nameInChain.getStart(), /*searchOtherFilesOnly*/ true)) === null || _a === void 0 ? void 0 : _a.filter(function (d) { return server.toNormalizedPath(d.fileName) !== file && d.isAmbient; }).map(function (d) { return ({
+                                fileName: d.fileName,
+                                name: ts.getTextOfIdentifierOrLiteral(initialNode)
+                            }); });
+                            if (ts.some(candidates)) {
+                                return candidates;
+                            }
+                        }) || server.emptyArray;
+                    }
+                    return server.emptyArray;
+                }
+                function tryRefineDefinition(definition, program, noDtsProgram) {
+                    var _a;
+                    var fileToSearch = noDtsProgram.getSourceFile(definition.fileName);
+                    if (!fileToSearch) {
+                        return undefined;
+                    }
+                    var initialNode = ts.getTouchingPropertyName(program.getSourceFile(file), position);
+                    var symbol = program.getTypeChecker().getSymbolAtLocation(initialNode);
+                    var importSpecifier = symbol && ts.getDeclarationOfKind(symbol, 270 /* ImportSpecifier */);
+                    if (!importSpecifier)
+                        return undefined;
+                    var nameToSearch = ((_a = importSpecifier.propertyName) === null || _a === void 0 ? void 0 : _a.text) || importSpecifier.name.text;
+                    return searchForDeclaration(nameToSearch, fileToSearch, noDtsProgram);
+                }
+                function searchForDeclaration(declarationName, fileToSearch, noDtsProgram) {
+                    var matches = ts.FindAllReferences.Core.getTopMostDeclarationNamesInFile(declarationName, fileToSearch);
+                    return ts.mapDefined(matches, function (match) {
+                        var symbol = noDtsProgram.getTypeChecker().getSymbolAtLocation(match);
+                        var decl = ts.getDeclarationFromName(match);
+                        if (symbol && decl) {
+                            // I think the last argument to this is supposed to be the start node, but it doesn't seem important.
+                            // Callers internal to GoToDefinition already get confused about this.
+                            return ts.GoToDefinition.createDefinitionInfo(decl, noDtsProgram.getTypeChecker(), symbol, decl, /*unverified*/ true);
+                        }
+                    });
+                }
+                function ensureRoot(project, fileName) {
+                    var info = project.getScriptInfo(fileName);
+                    if (!info)
+                        return false;
+                    if (!project.containsScriptInfo(info)) {
+                        project.addRoot(info);
+                        project.updateGraph();
+                    }
+                    return true;
+                }
+            };
             Session.prototype.getEmitOutput = function (args) {
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
                 if (!project.shouldEmitFile(project.getScriptInfo(file))) {
@@ -175771,7 +176165,7 @@ var ts;
                         return undefined;
                     }
                     var compilationSettings = project.getCompilationSettings();
-                    if (!!compilationSettings.noEmit || ts.fileExtensionIs(info.fileName, ".d.ts" /* Dts */) && !dtsChangeCanAffectEmit(compilationSettings)) {
+                    if (!!compilationSettings.noEmit || ts.isDeclarationFileName(info.fileName) && !dtsChangeCanAffectEmit(compilationSettings)) {
                         // avoid triggering emit when a change is made in a .d.ts when declaration emit and decorator metadata emit are disabled
                         return undefined;
                     }
@@ -176251,7 +176645,7 @@ var ts;
                     else {
                         var info = this.projectService.getScriptInfo(fileNameInProject); // TODO: GH#18217
                         if (!info.isScriptOpen()) {
-                            if (ts.fileExtensionIs(fileNameInProject, ".d.ts" /* Dts */)) {
+                            if (ts.isDeclarationFileName(fileNameInProject)) {
                                 veryLowPriorityFiles.push(fileNameInProject);
                             }
                             else {