@typescript-deploys/pr-build 4.7.0-pr-48294-7 → 4.7.0-pr-48264-4

package/lib/tsserverlibrary.js

@@ -15144,6 +15144,10 @@ var ts;
         }
     }
     ts.isAnyImportSyntax = isAnyImportSyntax;
+    function isAnyImportOrBareOrAccessedRequire(node) {
+        return isAnyImportSyntax(node) || isVariableDeclarationInitializedToBareOrAccessedRequire(node);
+    }
+    ts.isAnyImportOrBareOrAccessedRequire = isAnyImportOrBareOrAccessedRequire;
     function isLateVisibilityPaintedStatement(node) {
         switch (node.kind) {
             case 265 /* ImportDeclaration */:
@@ -16722,14 +16726,14 @@ var ts;
     }
     ts.isFunctionSymbol = isFunctionSymbol;
     function tryGetModuleSpecifierFromDeclaration(node) {
-        var _a, _b, _c;
+        var _a, _b;
         switch (node.kind) {
             case 253 /* 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 265 /* 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 264 /* 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);
         }
@@ -17256,21 +17260,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 === 264 /* ImportEqualsDeclaration */ ||
+        if (node.kind === 264 /* ImportEqualsDeclaration */ ||
             node.kind === 263 /* NamespaceExportDeclaration */ ||
             node.kind === 266 /* ImportClause */ && !!node.name ||
             node.kind === 267 /* NamespaceImport */ ||
             node.kind === 273 /* NamespaceExport */ ||
             node.kind === 269 /* ImportSpecifier */ ||
             node.kind === 274 /* ExportSpecifier */ ||
-            node.kind === 270 /* 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 === 296 /* ShorthandPropertyAssignment */ ||
-            node.kind === 295 /* PropertyAssignment */ && isAliasableExpression(node.initializer);
+            node.kind === 270 /* 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) {
@@ -17281,6 +17292,7 @@ var ts;
             case 274 /* ExportSpecifier */:
             case 270 /* ExportAssignment */:
             case 264 /* ImportEqualsDeclaration */:
+            case 273 /* NamespaceExport */:
                 return node.parent;
             case 160 /* QualifiedName */:
                 do {
@@ -39639,6 +39651,13 @@ var ts;
             description: ts.Diagnostics.Allow_accessing_UMD_globals_from_modules,
             defaultValueDescription: false,
         },
+        {
+            name: "noDtsResolution",
+            type: "boolean",
+            affectsModuleResolution: true,
+            category: ts.Diagnostics.Modules,
+            defaultValueDescription: false,
+        },
         // Source Maps
         {
             name: "sourceRoot",
@@ -42018,7 +42037,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["TypeScriptButNotDts"] = 5] = "TypeScriptButNotDts";
     })(Extensions || (Extensions = {}));
     /** Used with `Extensions.DtsOnly` to extract the path from TypeScript results. */
     function resolvedTypeScriptOnly(resolved) {
@@ -42963,7 +42983,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.TypeScriptButNotDts];
+            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) {
@@ -42972,6 +43006,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,
@@ -42979,7 +43017,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);
@@ -43187,20 +43225,22 @@ var ts;
                     default: return tryExtension(".d.ts" /* Dts */);
                 }
             case Extensions.TypeScript:
+            case Extensions.TypeScriptButNotDts:
+                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) {
@@ -43418,6 +43458,7 @@ var ts;
             switch (extensions) {
                 case Extensions.JavaScript:
                 case Extensions.Json:
+                case Extensions.TypeScriptButNotDts:
                     packageFile = readPackageJsonMainField(jsonContent, candidate, state);
                     break;
                 case Extensions.TypeScript:
@@ -43496,6 +43537,8 @@ var ts;
                 return extension === ".json" /* Json */;
             case Extensions.TypeScript:
                 return extension === ".ts" /* Ts */ || extension === ".tsx" /* Tsx */ || extension === ".d.ts" /* Dts */;
+            case Extensions.TypeScriptButNotDts:
+                return extension === ".ts" /* Ts */ || extension === ".tsx" /* Tsx */;
             case Extensions.DtsOnly:
                 return extension === ".d.ts" /* Dts */;
         }
@@ -55112,7 +55155,7 @@ var ts;
                 if (!omitTypeAlias) {
                     return errorType;
                 }
-                return getGlobalTypeAliasInstantiation(omitTypeAlias, [source, omitKeyType]);
+                return getTypeAliasInstantiation(omitTypeAlias, [source, omitKeyType]);
             }
             var members = ts.createSymbolTable();
             for (var _b = 0, spreadableProperties_1 = spreadableProperties; _b < spreadableProperties_1.length; _b++) {
@@ -55564,7 +55607,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));
@@ -56879,7 +56922,7 @@ var ts;
                     }
                 }
                 if (memberTypeList.length) {
-                    var enumType_1 = getUnionType(memberTypeList, 1 /* Literal */, symbol, /*aliasTypeArguments*/ undefined, /*aliasMapper*/ undefined);
+                    var enumType_1 = getUnionType(memberTypeList, 1 /* Literal */, symbol, /*aliasTypeArguments*/ undefined);
                     if (enumType_1.flags & 1048576 /* Union */) {
                         enumType_1.flags |= 1024 /* EnumLiteral */;
                         enumType_1.symbol = symbol;
@@ -59602,7 +59645,7 @@ var ts;
             type.resolvedTypeArguments = source.resolvedTypeArguments;
             return type;
         }
-        function createDeferredTypeReference(target, node, mapper, aliasSymbol, aliasTypeArguments, aliasMapper) {
+        function createDeferredTypeReference(target, node, mapper, aliasSymbol, aliasTypeArguments) {
             if (!aliasSymbol) {
                 aliasSymbol = getAliasSymbolForTypeNode(node);
                 var localAliasTypeArguments = getTypeArgumentsForAliasSymbol(aliasSymbol);
@@ -59614,7 +59657,6 @@ var ts;
             type.mapper = mapper;
             type.aliasSymbol = aliasSymbol;
             type.aliasTypeArguments = aliasTypeArguments;
-            type.aliasMapper = aliasMapper;
             return type;
         }
         function getTypeArguments(type) {
@@ -59679,7 +59721,7 @@ var ts;
             }
             return checkNoTypeArguments(node, symbol) ? type : errorType;
         }
-        function getGlobalTypeAliasInstantiation(symbol, typeArguments, aliasSymbol, aliasTypeArguments) {
+        function getTypeAliasInstantiation(symbol, typeArguments, aliasSymbol, aliasTypeArguments) {
             var type = getDeclaredTypeOfSymbol(symbol);
             if (type === intrinsicMarkerType && intrinsicTypeKinds.has(symbol.escapedName) && typeArguments && typeArguments.length === 1) {
                 return getStringMappingType(symbol, typeArguments[0]);
@@ -59693,33 +59735,6 @@ var ts;
             }
             return instantiation;
         }
-        function getLocalTypeAliasInstantiation(symbol, typeArguments, outerTypeParameterMapper, aliasSymbol, aliasTypeArguments) {
-            var type = getDeclaredTypeOfSymbol(symbol);
-            if (type === intrinsicMarkerType && intrinsicTypeKinds.has(symbol.escapedName) && typeArguments && typeArguments.length === 1) {
-                return getStringMappingType(symbol, typeArguments[0]);
-            }
-            var links = getSymbolLinks(symbol);
-            var outerTypeParameters = getOuterTypeParametersOfAlias(symbol);
-            var mappedOuterParams = outerTypeParameterMapper && outerTypeParameters && instantiateTypes(outerTypeParameters, outerTypeParameterMapper);
-            var typeParameters = links.typeParameters;
-            var id = getTypeListId(ts.concatenate(mappedOuterParams, typeArguments)) + getAliasId(aliasSymbol, aliasTypeArguments);
-            var instantiation = links.instantiations.get(id);
-            if (!instantiation) {
-                var outerTypeArgumentMapper = outerTypeParameters && mappedOuterParams && createTypeMapper(outerTypeParameters, mappedOuterParams);
-                var argumentMapper = createTypeMapper(typeParameters, fillMissingTypeArguments(typeArguments, typeParameters, getMinTypeArgumentCount(typeParameters), ts.isInJSFile(symbol.valueDeclaration)));
-                var combinedMapper = outerTypeArgumentMapper ? combineTypeMappers(argumentMapper, outerTypeArgumentMapper) : argumentMapper;
-                links.instantiations.set(id, instantiation = instantiateTypeWithAlias(type, combinedMapper, aliasSymbol, aliasTypeArguments));
-            }
-            return instantiation;
-        }
-        function getOuterTypeParametersOfAlias(symbol) {
-            var _a;
-            var links = getSymbolLinks(symbol);
-            if (!links.outerTypeParameters) {
-                links.outerTypeParameters = ((_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a[0]) && getOuterTypeParameters(symbol.declarations[0], /*includeThisTypes*/ true);
-            }
-            return links.outerTypeParameters;
-        }
         /**
          * Get type from reference to type alias. When a type alias is generic, the declared type of the type alias may include
          * references to the type parameters of the alias. We replace those with the actual type arguments by instantiating the
@@ -59755,7 +59770,7 @@ var ts;
                 // a .d.ts file. See #43622 for an example.
                 var aliasSymbol = getAliasSymbolForTypeNode(node);
                 var newAliasSymbol = aliasSymbol && (isLocalTypeAlias(symbol) || !isLocalTypeAlias(aliasSymbol)) ? aliasSymbol : undefined;
-                return getGlobalTypeAliasInstantiation(symbol, typeArgumentsFromTypeReferenceNode(node), newAliasSymbol, getTypeArgumentsForAliasSymbol(newAliasSymbol));
+                return getTypeAliasInstantiation(symbol, typeArgumentsFromTypeReferenceNode(node), newAliasSymbol, getTypeArgumentsForAliasSymbol(newAliasSymbol));
             }
             return checkNoTypeArguments(node, symbol) ? type : errorType;
         }
@@ -60670,7 +60685,14 @@ var ts;
             result.types = types;
             return result;
         }
-        function getUnionType(types, unionReduction, aliasSymbol, aliasTypeArguments, aliasMapper, origin) {
+        // We sort and deduplicate the constituent types based on object identity. If the subtypeReduction
+        // flag is specified we also reduce the constituent type set to only include types that aren't subtypes
+        // of other types. Subtype reduction is expensive for large union types and is possible only when union
+        // types are known not to circularly reference themselves (as is the case with union types created by
+        // expression constructs such as array literals and the || and ?: operators). Named types can
+        // circularly reference themselves and therefore cannot be subtype reduced during their declaration.
+        // For example, "type Item = string | (() => Item" is a named type that circularly references itself.
+        function getUnionType(types, unionReduction, aliasSymbol, aliasTypeArguments, origin) {
             if (unionReduction === void 0) { unionReduction = 1 /* Literal */; }
             if (types.length === 0) {
                 return neverType;
@@ -60739,7 +60761,7 @@ var ts;
             }
             var objectFlags = (includes & 36323363 /* NotPrimitiveUnion */ ? 0 : 65536 /* PrimitiveUnion */) |
                 (includes & 2097152 /* Intersection */ ? 33554432 /* ContainsIntersections */ : 0);
-            return getUnionTypeFromSortedList(typeSet, objectFlags, aliasSymbol, aliasTypeArguments, aliasMapper, origin);
+            return getUnionTypeFromSortedList(typeSet, objectFlags, aliasSymbol, aliasTypeArguments, origin);
         }
         function getUnionOrIntersectionTypePredicate(signatures, kind) {
             var first;
@@ -60777,7 +60799,7 @@ var ts;
             return a.kind === b.kind && a.parameterIndex === b.parameterIndex;
         }
         // This function assumes the constituent type list is sorted and deduplicated.
-        function getUnionTypeFromSortedList(types, objectFlags, aliasSymbol, aliasTypeArguments, aliasMapper, origin) {
+        function getUnionTypeFromSortedList(types, objectFlags, aliasSymbol, aliasTypeArguments, origin) {
             if (types.length === 0) {
                 return neverType;
             }
@@ -60797,7 +60819,6 @@ var ts;
                 type.origin = origin;
                 type.aliasSymbol = aliasSymbol;
                 type.aliasTypeArguments = aliasTypeArguments;
-                type.aliasMapper = aliasMapper;
                 if (types.length === 2 && types[0].flags & 512 /* BooleanLiteral */ && types[1].flags & 512 /* BooleanLiteral */) {
                     type.flags |= 16 /* Boolean */;
                     type.intrinsicName = "boolean";
@@ -60810,7 +60831,7 @@ var ts;
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 var aliasSymbol = getAliasSymbolForTypeNode(node);
-                links.resolvedType = getUnionType(ts.map(node.types, getTypeFromTypeNode), 1 /* Literal */, aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol), /*aliasMapper*/ undefined);
+                links.resolvedType = getUnionType(ts.map(node.types, getTypeFromTypeNode), 1 /* Literal */, aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol));
             }
             return links.resolvedType;
         }
@@ -60969,16 +60990,25 @@ var ts;
             types[index] = getUnionTypeFromSortedList(result, 65536 /* PrimitiveUnion */);
             return true;
         }
-        function createIntersectionType(types, aliasSymbol, aliasTypeArguments, aliasMapper) {
+        function createIntersectionType(types, aliasSymbol, aliasTypeArguments) {
             var result = createType(2097152 /* Intersection */);
             result.objectFlags = getPropagatingFlagsOfTypes(types, /*excludeKinds*/ 98304 /* Nullable */);
             result.types = types;
             result.aliasSymbol = aliasSymbol;
             result.aliasTypeArguments = aliasTypeArguments;
-            result.aliasMapper = aliasMapper;
             return result;
         }
-        function getIntersectionType(types, aliasSymbol, aliasTypeArguments, aliasMapper) {
+        // We normalize combinations of intersection and union types based on the distributive property of the '&'
+        // operator. Specifically, because X & (A | B) is equivalent to X & A | X & B, we can transform intersection
+        // types with union type constituents into equivalent union types with intersection type constituents and
+        // effectively ensure that union types are always at the top level in type representations.
+        //
+        // We do not perform structural deduplication on intersection types. Intersection types are created only by the &
+        // type operator and we can't reduce those because we want to support recursive intersection types. For example,
+        // a type alias of the form "type List<T> = T & { next: List<T> }" cannot be reduced during its declaration.
+        // Also, unlike union types, the order of the constituent types is preserved in order that overload resolution
+        // for intersections of types with signatures can be deterministic.
+        function getIntersectionType(types, aliasSymbol, aliasTypeArguments) {
             var typeMembershipMap = new ts.Map();
             var includes = addTypesToIntersection(typeMembershipMap, 0, types);
             var typeSet = ts.arrayFrom(typeMembershipMap.values());
@@ -61038,16 +61068,16 @@ var ts;
                         // When the intersection creates a reduced set (which might mean that *all* union types have
                         // disappeared), we restart the operation to get a new set of combined flags. Once we have
                         // reduced we'll never reduce again, so this occurs at most once.
-                        result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments, aliasMapper);
+                        result = getIntersectionType(typeSet, aliasSymbol, aliasTypeArguments);
                     }
                     else if (eachIsUnionContaining(typeSet, 32768 /* Undefined */)) {
                         var undefinedOrMissingType = exactOptionalPropertyTypes && ts.some(typeSet, function (t) { return containsType(t.types, missingType); }) ? missingType : undefinedType;
                         removeFromEach(typeSet, 32768 /* Undefined */);
-                        result = getUnionType([getIntersectionType(typeSet), undefinedOrMissingType], 1 /* Literal */, aliasSymbol, aliasTypeArguments, aliasMapper);
+                        result = getUnionType([getIntersectionType(typeSet), undefinedOrMissingType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
                     }
                     else if (eachIsUnionContaining(typeSet, 65536 /* Null */)) {
                         removeFromEach(typeSet, 65536 /* Null */);
-                        result = getUnionType([getIntersectionType(typeSet), nullType], 1 /* Literal */, aliasSymbol, aliasTypeArguments, aliasMapper);
+                        result = getUnionType([getIntersectionType(typeSet), nullType], 1 /* Literal */, aliasSymbol, aliasTypeArguments);
                     }
                     else {
                         // We are attempting to construct a type of the form X & (A | B) & (C | D). Transform this into a type of
@@ -61060,7 +61090,7 @@ var ts;
                         // We attach a denormalized origin type when at least one constituent of the cross-product union is an
                         // intersection (i.e. when the intersection didn't just reduce one or more unions to smaller unions).
                         var origin = ts.some(constituents, function (t) { return !!(t.flags & 2097152 /* Intersection */); }) ? createOriginUnionOrIntersectionType(2097152 /* Intersection */, typeSet) : undefined;
-                        result = getUnionType(constituents, 1 /* Literal */, aliasSymbol, aliasTypeArguments, aliasMapper, origin);
+                        result = getUnionType(constituents, 1 /* Literal */, aliasSymbol, aliasTypeArguments, origin);
                     }
                 }
                 else {
@@ -61106,7 +61136,7 @@ var ts;
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 var aliasSymbol = getAliasSymbolForTypeNode(node);
-                links.resolvedType = getIntersectionType(ts.map(node.types, getTypeFromTypeNode), aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol), /*aliasMapper*/ undefined);
+                links.resolvedType = getIntersectionType(ts.map(node.types, getTypeFromTypeNode), aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol));
             }
             return links.resolvedType;
         }
@@ -61225,7 +61255,7 @@ var ts;
             var indexKeyTypes = ts.map(getIndexInfosOfType(type), function (info) { return info !== enumNumberIndexInfo && isKeyTypeIncluded(info.keyType, include) ?
                 info.keyType === stringType && include & 8 /* Number */ ? stringOrNumberType : info.keyType : neverType; });
             return getUnionType(ts.concatenate(propertyTypes, indexKeyTypes), 1 /* Literal */, 
-            /*aliasSymbol*/ undefined, /*aliasTypeArguments*/ undefined, /*aliasMapper*/ undefined, origin);
+            /*aliasSymbol*/ undefined, /*aliasTypeArguments*/ undefined, origin);
         }
         /**
          * A union type which is reducible upon instantiation (meaning some members are removed under certain instantiations)
@@ -61258,7 +61288,7 @@ var ts;
                 return type;
             }
             var extractTypeAlias = getGlobalExtractSymbol();
-            return extractTypeAlias ? getGlobalTypeAliasInstantiation(extractTypeAlias, [type, stringType]) : stringType;
+            return extractTypeAlias ? getTypeAliasInstantiation(extractTypeAlias, [type, stringType]) : stringType;
         }
         function getIndexTypeOrString(type) {
             var indexType = getExtractStringType(getIndexType(type));
@@ -61388,14 +61418,13 @@ var ts;
             result.type = type;
             return result;
         }
-        function createIndexedAccessType(objectType, indexType, accessFlags, aliasSymbol, aliasTypeArguments, aliasMapper) {
+        function createIndexedAccessType(objectType, indexType, accessFlags, aliasSymbol, aliasTypeArguments) {
             var type = createType(8388608 /* IndexedAccess */);
             type.objectType = objectType;
             type.indexType = indexType;
             type.accessFlags = accessFlags;
             type.aliasSymbol = aliasSymbol;
             type.aliasTypeArguments = aliasTypeArguments;
-            type.aliasMapper = aliasMapper;
             return type;
         }
         /**
@@ -61753,9 +61782,9 @@ var ts;
             var templateMapper = combineTypeMappers(objectType.mapper, mapper);
             return instantiateType(getTemplateTypeFromMappedType(objectType), templateMapper);
         }
-        function getIndexedAccessType(objectType, indexType, accessFlags, accessNode, aliasSymbol, aliasTypeArguments, aliasMapper) {
+        function getIndexedAccessType(objectType, indexType, accessFlags, accessNode, aliasSymbol, aliasTypeArguments) {
             if (accessFlags === void 0) { accessFlags = 0 /* None */; }
-            return getIndexedAccessTypeOrUndefined(objectType, indexType, accessFlags, accessNode, aliasSymbol, aliasTypeArguments, aliasMapper) || (accessNode ? errorType : unknownType);
+            return getIndexedAccessTypeOrUndefined(objectType, indexType, accessFlags, accessNode, aliasSymbol, aliasTypeArguments) || (accessNode ? errorType : unknownType);
         }
         function indexTypeLessThan(indexType, limit) {
             return everyType(indexType, function (t) {
@@ -61769,7 +61798,7 @@ var ts;
                 return false;
             });
         }
-        function getIndexedAccessTypeOrUndefined(objectType, indexType, accessFlags, accessNode, aliasSymbol, aliasTypeArguments, aliasMapper) {
+        function getIndexedAccessTypeOrUndefined(objectType, indexType, accessFlags, accessNode, aliasSymbol, aliasTypeArguments) {
             if (accessFlags === void 0) { accessFlags = 0 /* None */; }
             if (objectType === wildcardType || indexType === wildcardType) {
                 return wildcardType;
@@ -61800,7 +61829,7 @@ var ts;
                 var id = objectType.id + "," + indexType.id + "," + persistentAccessFlags + getAliasId(aliasSymbol, aliasTypeArguments);
                 var type = indexedAccessTypes.get(id);
                 if (!type) {
-                    indexedAccessTypes.set(id, type = createIndexedAccessType(objectType, indexType, persistentAccessFlags, aliasSymbol, aliasTypeArguments, aliasMapper));
+                    indexedAccessTypes.set(id, type = createIndexedAccessType(objectType, indexType, persistentAccessFlags, aliasSymbol, aliasTypeArguments));
                 }
                 return type;
             }
@@ -61830,8 +61859,8 @@ var ts;
                     return undefined;
                 }
                 return accessFlags & 4 /* Writing */
-                    ? getIntersectionType(propTypes, aliasSymbol, aliasTypeArguments, aliasMapper)
-                    : getUnionType(propTypes, 1 /* Literal */, aliasSymbol, aliasTypeArguments, aliasMapper);
+                    ? getIntersectionType(propTypes, aliasSymbol, aliasTypeArguments)
+                    : getUnionType(propTypes, 1 /* Literal */, aliasSymbol, aliasTypeArguments);
             }
             return getPropertyTypeForIndexType(objectType, apparentObjectType, indexType, indexType, accessNode, accessFlags | 8 /* CacheSymbol */ | 64 /* ReportDeprecated */);
         }
@@ -61841,7 +61870,7 @@ var ts;
                 var objectType = getTypeFromTypeNode(node.objectType);
                 var indexType = getTypeFromTypeNode(node.indexType);
                 var potentialAlias = getAliasSymbolForTypeNode(node);
-                var resolved = getIndexedAccessType(objectType, indexType, 0 /* None */, node, potentialAlias, getTypeArgumentsForAliasSymbol(potentialAlias), /*aliasMapper*/ undefined);
+                var resolved = getIndexedAccessType(objectType, indexType, 0 /* None */, node, potentialAlias, getTypeArgumentsForAliasSymbol(potentialAlias));
                 links.resolvedType = resolved.flags & 8388608 /* IndexedAccess */ &&
                     resolved.objectType === objectType &&
                     resolved.indexType === indexType ?
@@ -62008,7 +62037,6 @@ var ts;
                 result.combinedMapper = combinedMapper;
                 result.aliasSymbol = aliasSymbol || root.aliasSymbol;
                 result.aliasTypeArguments = aliasSymbol ? aliasTypeArguments : instantiateTypes(root.aliasTypeArguments, mapper); // TODO: GH#18217
-                result.aliasMapper = result.aliasSymbol ? mapper : undefined;
                 return "break";
             };
             // We loop here for an immediately nested conditional type in the false position, effectively treating
@@ -62804,7 +62832,7 @@ var ts;
                 var result = target.instantiations.get(id);
                 if (!result) {
                     var newMapper = createTypeMapper(typeParameters, typeArguments);
-                    result = target.objectFlags & 4 /* Reference */ ? createDeferredTypeReference(type.target, type.node, newMapper, newAliasSymbol, newAliasTypeArguments, mapper) :
+                    result = target.objectFlags & 4 /* Reference */ ? createDeferredTypeReference(type.target, type.node, newMapper, newAliasSymbol, newAliasTypeArguments) :
                         target.objectFlags & 32 /* Mapped */ ? instantiateMappedType(target, newMapper, newAliasSymbol, newAliasTypeArguments) :
                             instantiateAnonymousType(target, newMapper, newAliasSymbol, newAliasTypeArguments);
                     target.instantiations.set(id, result);
@@ -62893,7 +62921,7 @@ var ts;
                             return instantiateAnonymousType(type, prependTypeMapping(typeVariable, t, mapper));
                         }
                         return t;
-                    }, aliasSymbol, aliasTypeArguments, mapper);
+                    }, aliasSymbol, aliasTypeArguments);
                 }
             }
             // If the constraint type of the instantiation is the wildcard type, return the wildcard type.
@@ -62962,7 +62990,6 @@ var ts;
             result.mapper = mapper;
             result.aliasSymbol = aliasSymbol || type.aliasSymbol;
             result.aliasTypeArguments = aliasSymbol ? aliasTypeArguments : instantiateTypes(type.aliasTypeArguments, mapper);
-            result.aliasMapper = mapper;
             return result;
         }
         function getConditionalTypeInstantiation(type, mapper, aliasSymbol, aliasTypeArguments) {
@@ -62982,7 +63009,7 @@ var ts;
                     // distributive conditional type T extends U ? X : Y is instantiated with A | B for T, the
                     // result is (A extends U ? X : Y) | (B extends U ? X : Y).
                     result = distributionType && checkType_1 !== distributionType && distributionType.flags & (1048576 /* Union */ | 131072 /* Never */) ?
-                        mapTypeWithAlias(getReducedType(distributionType), function (t) { return getConditionalType(root, prependTypeMapping(checkType_1, t, newMapper_1)); }, aliasSymbol, aliasTypeArguments, mapper) :
+                        mapTypeWithAlias(getReducedType(distributionType), function (t) { return getConditionalType(root, prependTypeMapping(checkType_1, t, newMapper_1)); }, aliasSymbol, aliasTypeArguments) :
                         getConditionalType(root, newMapper_1, aliasSymbol, aliasTypeArguments);
                     root.instantiations.set(id, result);
                 }
@@ -63042,8 +63069,8 @@ var ts;
                 var newAliasSymbol = aliasSymbol || type.aliasSymbol;
                 var newAliasTypeArguments = aliasSymbol ? aliasTypeArguments : instantiateTypes(type.aliasTypeArguments, mapper);
                 return flags & 2097152 /* Intersection */ || origin && origin.flags & 2097152 /* Intersection */ ?
-                    getIntersectionType(newTypes, newAliasSymbol, newAliasTypeArguments, mapper) :
-                    getUnionType(newTypes, 1 /* Literal */, newAliasSymbol, newAliasTypeArguments, mapper);
+                    getIntersectionType(newTypes, newAliasSymbol, newAliasTypeArguments) :
+                    getUnionType(newTypes, 1 /* Literal */, newAliasSymbol, newAliasTypeArguments);
             }
             if (flags & 4194304 /* Index */) {
                 return getIndexType(instantiateType(type.type, mapper));
@@ -63057,7 +63084,7 @@ var ts;
             if (flags & 8388608 /* IndexedAccess */) {
                 var newAliasSymbol = aliasSymbol || type.aliasSymbol;
                 var newAliasTypeArguments = aliasSymbol ? aliasTypeArguments : instantiateTypes(type.aliasTypeArguments, mapper);
-                return getIndexedAccessType(instantiateType(type.objectType, mapper), instantiateType(type.indexType, mapper), type.accessFlags, /*accessNode*/ undefined, newAliasSymbol, newAliasTypeArguments, mapper);
+                return getIndexedAccessType(instantiateType(type.objectType, mapper), instantiateType(type.indexType, mapper), type.accessFlags, /*accessNode*/ undefined, newAliasSymbol, newAliasTypeArguments);
             }
             if (flags & 16777216 /* Conditional */) {
                 return getConditionalTypeInstantiation(type, combineTypeMappers(type.mapper, mapper), aliasSymbol, aliasTypeArguments);
@@ -65051,10 +65078,7 @@ var ts;
                     if (variances === ts.emptyArray) {
                         return 1 /* Unknown */;
                     }
-                    var outerTypeParameters = getOuterTypeParametersOfAlias(source.aliasSymbol);
-                    var sourceArgs = outerTypeParameters && source.aliasMapper ? ts.concatenate(source.aliasTypeArguments, instantiateTypes(outerTypeParameters, source.aliasMapper)) : source.aliasTypeArguments;
-                    var targetArgs = outerTypeParameters && target.aliasMapper ? ts.concatenate(target.aliasTypeArguments, instantiateTypes(outerTypeParameters, target.aliasMapper)) : target.aliasTypeArguments;
-                    var varianceResult = relateVariances(sourceArgs, targetArgs, variances, intersectionState);
+                    var varianceResult = relateVariances(source.aliasTypeArguments, target.aliasTypeArguments, variances, intersectionState);
                     if (varianceResult !== undefined) {
                         return varianceResult;
                     }
@@ -66343,11 +66367,8 @@ var ts;
         }
         function getAliasVariances(symbol) {
             var links = getSymbolLinks(symbol);
-            // outer type parameter aliases are last so they can be easily ignored by, eg, inference
-            var params = ts.concatenate(links.typeParameters, getOuterTypeParametersOfAlias(symbol));
-            return getVariancesWorker(params, links, function (_links, param, marker) {
-                var mapper = makeUnaryTypeMapper(param, marker);
-                var type = getLocalTypeAliasInstantiation(symbol, instantiateTypes(links.typeParameters, mapper), mapper);
+            return getVariancesWorker(links.typeParameters, links, function (_links, param, marker) {
+                var type = getTypeAliasInstantiation(symbol, instantiateTypes(links.typeParameters, makeUnaryTypeMapper(param, marker)));
                 type.aliasTypeArgumentsContainsMarker = true;
                 return type;
             });
@@ -67004,7 +67025,7 @@ var ts;
             }
             // If the NonNullable<T> type is available, return an instantiation. Otherwise just return the reduced type.
             return deferredGlobalNonNullableTypeAlias !== unknownSymbol ?
-                getGlobalTypeAliasInstantiation(deferredGlobalNonNullableTypeAlias, [reducedType]) :
+                getTypeAliasInstantiation(deferredGlobalNonNullableTypeAlias, [reducedType]) :
                 reducedType;
         }
         function getNonNullableType(type) {
@@ -69230,7 +69251,7 @@ var ts;
                         newOrigin = createOriginUnionOrIntersectionType(1048576 /* Union */, originFiltered);
                     }
                 }
-                return getUnionTypeFromSortedList(filtered, type.objectFlags, /*aliasSymbol*/ undefined, /*aliasTypeArguments*/ undefined, /*aliasMapper*/ undefined, newOrigin);
+                return getUnionTypeFromSortedList(filtered, type.objectFlags, /*aliasSymbol*/ undefined, /*aliasTypeArguments*/ undefined, newOrigin);
             }
             return type.flags & 131072 /* Never */ || f(type) ? type : neverType;
         }
@@ -69266,9 +69287,9 @@ var ts;
             }
             return changed ? mappedTypes && getUnionType(mappedTypes, noReductions ? 0 /* None */ : 1 /* Literal */) : type;
         }
-        function mapTypeWithAlias(type, mapper, aliasSymbol, aliasTypeArguments, aliasMapper) {
+        function mapTypeWithAlias(type, mapper, aliasSymbol, aliasTypeArguments) {
             return type.flags & 1048576 /* Union */ && aliasSymbol ?
-                getUnionType(ts.map(type.types, mapper), 1 /* Literal */, aliasSymbol, aliasTypeArguments, aliasMapper) :
+                getUnionType(ts.map(type.types, mapper), 1 /* Literal */, aliasSymbol, aliasTypeArguments) :
                 mapType(type, mapper);
         }
         function extractTypesOfKind(type, kind) {
@@ -72453,7 +72474,7 @@ var ts;
                     var params = getSymbolLinks(managedSym).typeParameters;
                     if (ts.length(params) >= 2) {
                         var args = fillMissingTypeArguments([ctorType, attributesType], params, 2, ts.isInJSFile(context));
-                        return getGlobalTypeAliasInstantiation(managedSym, args);
+                        return getTypeAliasInstantiation(managedSym, args);
                     }
                 }
                 if (ts.length(declaredManagedType.typeParameters) >= 2) {
@@ -80597,7 +80618,7 @@ var ts;
                     if (awaitedSymbol) {
                         // Unwrap unions that may contain `Awaited<T>`, otherwise its possible to manufacture an `Awaited<Awaited<T> | U>` where
                         // an `Awaited<T | U>` would suffice.
-                        return getGlobalTypeAliasInstantiation(awaitedSymbol, [unwrapAwaitedType(type)]);
+                        return getTypeAliasInstantiation(awaitedSymbol, [unwrapAwaitedType(type)]);
                     }
                 }
             }
@@ -127648,6 +127669,20 @@ var ts;
         return !!location.parent && ts.isImportOrExportSpecifier(location.parent) && location.parent.propertyName === location;
     }
     ts.isImportOrExportSpecifierName = isImportOrExportSpecifierName;
+    /**
+     * Returns true if `node` is the declaration of `n` in:
+     * - `import n from "m"`
+     * - `import * as n from "m"`
+     * - `import n = require("m")`
+     * - `const n = require("m")`
+     */
+    function isFreelyNameableImport(node) {
+        return node.kind === 266 /* ImportClause */
+            || node.kind === 267 /* NamespaceImport */
+            || ts.isImportEqualsDeclaration(node) && ts.isExternalModuleReference(node.moduleReference)
+            || ts.isVariableDeclarationInitializedToRequire(node);
+    }
+    ts.isFreelyNameableImport = isFreelyNameableImport;
     function getScriptKind(fileName, host) {
         // First check to see if the script kind was specified by the host. Chances are the host
         // may override the default script kind for the file extension.
@@ -130941,14 +130976,15 @@ var ts;
             SortText["SuggestedClassMembers"] = "14";
             SortText["GlobalsOrKeywords"] = "15";
             SortText["AutoImportSuggestions"] = "16";
-            SortText["JavascriptIdentifiers"] = "17";
-            SortText["DeprecatedLocalDeclarationPriority"] = "18";
-            SortText["DeprecatedLocationPriority"] = "19";
-            SortText["DeprecatedOptionalMember"] = "20";
-            SortText["DeprecatedMemberDeclaredBySpreadAssignment"] = "21";
-            SortText["DeprecatedSuggestedClassMembers"] = "22";
-            SortText["DeprecatedGlobalsOrKeywords"] = "23";
-            SortText["DeprecatedAutoImportSuggestions"] = "24";
+            SortText["ClassMemberSnippets"] = "17";
+            SortText["JavascriptIdentifiers"] = "18";
+            SortText["DeprecatedLocalDeclarationPriority"] = "19";
+            SortText["DeprecatedLocationPriority"] = "20";
+            SortText["DeprecatedOptionalMember"] = "21";
+            SortText["DeprecatedMemberDeclaredBySpreadAssignment"] = "22";
+            SortText["DeprecatedSuggestedClassMembers"] = "23";
+            SortText["DeprecatedGlobalsOrKeywords"] = "24";
+            SortText["DeprecatedAutoImportSuggestions"] = "25";
         })(SortText = Completions.SortText || (Completions.SortText = {}));
         var SortTextId;
         (function (SortTextId) {
@@ -130960,10 +130996,10 @@ var ts;
             SortTextId[SortTextId["GlobalsOrKeywords"] = 15] = "GlobalsOrKeywords";
             SortTextId[SortTextId["AutoImportSuggestions"] = 16] = "AutoImportSuggestions";
             // Don't use these directly.
-            SortTextId[SortTextId["_JavaScriptIdentifiers"] = 17] = "_JavaScriptIdentifiers";
-            SortTextId[SortTextId["_DeprecatedStart"] = 18] = "_DeprecatedStart";
+            SortTextId[SortTextId["_JavaScriptIdentifiers"] = 18] = "_JavaScriptIdentifiers";
+            SortTextId[SortTextId["_DeprecatedStart"] = 19] = "_DeprecatedStart";
             SortTextId[SortTextId["_First"] = 10] = "_First";
-            SortTextId[SortTextId["DeprecatedOffset"] = 8] = "DeprecatedOffset";
+            SortTextId[SortTextId["DeprecatedOffset"] = 9] = "DeprecatedOffset";
         })(SortTextId || (SortTextId = {}));
         /**
          * Special values for `CompletionInfo['source']` used to disambiguate
@@ -131444,6 +131480,7 @@ var ts;
                 isClassLikeMemberCompletion(symbol, location)) {
                 var importAdder = void 0;
                 (_b = getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, contextToken, formatContext), insertText = _b.insertText, isSnippet = _b.isSnippet, importAdder = _b.importAdder, replacementSpan = _b.replacementSpan);
+                sortText = SortText.ClassMemberSnippets; // sortText has to be lower priority than the sortText for keywords. See #47852.
                 if (importAdder === null || importAdder === void 0 ? void 0 : importAdder.hasFixes()) {
                     hasAction = true;
                     source = CompletionSource.ClassMemberSnippet;
@@ -131807,7 +131844,7 @@ var ts;
                 }
                 var name = info.name, needsConvertPropertyAccess = info.needsConvertPropertyAccess;
                 var sortTextId = (_a = symbolToSortTextIdMap === null || symbolToSortTextIdMap === void 0 ? void 0 : symbolToSortTextIdMap[ts.getSymbolId(symbol)]) !== null && _a !== void 0 ? _a : 11 /* LocationPriority */;
-                var sortText = (isDeprecated(symbol, typeChecker) ? 8 /* DeprecatedOffset */ + sortTextId : sortTextId).toString();
+                var sortText = (isDeprecated(symbol, typeChecker) ? 9 /* DeprecatedOffset */ + sortTextId : sortTextId).toString();
                 var entry = createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, sourceFile, host, program, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importCompletionNode, useSemicolons, compilerOptions, preferences, kind, formatContext, isJsxIdentifierExpected, isRightOfOpenTag);
                 if (!entry) {
                     continue;
@@ -136662,6 +136699,29 @@ 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);
+                    }
+                    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;
@@ -138294,7 +138354,9 @@ var ts;
 (function (ts) {
     var GoToDefinition;
     (function (GoToDefinition) {
-        function getDefinitionAtPosition(program, sourceFile, position) {
+        function getDefinitionAtPosition(program, sourceFile, position, aliasesOnly) {
+            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) {
@@ -138317,33 +138379,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, 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 (aliasesOnly && failedAliasResolution) {
+                // We couldn't resolve the specific import, try on the module specifier.
+                var importDeclaration = ts.findAncestor(node, 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 (aliasesOnly && 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);
                 }
@@ -138355,7 +138447,7 @@ var ts;
             // assignment. This case and others are handled by the following code.
             if (node.parent.kind === 296 /* 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, 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
@@ -138378,7 +138470,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;
         /**
@@ -138476,24 +138568,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) {
@@ -138508,8 +138600,8 @@ var ts;
             }
             return undefined;
         }
-        function getDefinitionAndBoundSpan(program, sourceFile, position) {
-            var definitions = getDefinitionAtPosition(program, sourceFile, position);
+        function getDefinitionAndBoundSpan(program, sourceFile, position, aliasesOnly) {
+            var definitions = getDefinitionAtPosition(program, sourceFile, position, aliasesOnly);
             if (!definitions || definitions.length === 0) {
                 return undefined;
             }
@@ -138535,13 +138627,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:
         //
@@ -138555,26 +138651,45 @@ var ts;
             if (node.parent === declaration) {
                 return true;
             }
-            switch (declaration.kind) {
-                case 266 /* ImportClause */:
-                case 264 /* ImportEqualsDeclaration */:
-                    return true;
-                case 269 /* ImportSpecifier */:
-                    return declaration.parent.kind === 268 /* NamedImports */;
-                case 202 /* BindingElement */:
-                case 253 /* VariableDeclaration */:
-                    return ts.isInJSFile(declaration) && ts.isVariableDeclarationInitializedToBareOrAccessedRequire(declaration);
-                default:
-                    return false;
+            if (declaration.kind === 267 /* 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, 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
@@ -138598,26 +138713,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, 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, 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, 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, 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 & 8388608 /* Ambient */), failedAliasResolution: failedAliasResolution });
         }
         function isDefinitionVisible(checker, declaration) {
             if (checker.isDeclarationVisible(declaration))
@@ -138650,8 +138766,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, failedAliasResolution);
         }
         function findReferenceInPosition(refs, pos) {
             return ts.find(refs, function (ref) { return ts.textRangeContainsPositionInclusive(ref, pos); });
@@ -151699,9 +151815,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))) {
@@ -151877,8 +151994,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 */
@@ -163687,9 +163805,9 @@ var ts;
             synchronizeHostData();
             return ts.GoToDefinition.getDefinitionAtPosition(program, getValidSourceFile(fileName), position);
         }
-        function getDefinitionAndBoundSpan(fileName, position) {
+        function getDefinitionAndBoundSpan(fileName, position, aliasesOnly) {
             synchronizeHostData();
-            return ts.GoToDefinition.getDefinitionAndBoundSpan(program, getValidSourceFile(fileName), position);
+            return ts.GoToDefinition.getDefinitionAndBoundSpan(program, getValidSourceFile(fileName), position, aliasesOnly);
         }
         function getTypeDefinitionAtPosition(fileName, position) {
             synchronizeHostData();
@@ -166441,6 +166559,9 @@ var ts;
                 CommandTypes["SignatureHelp"] = "signatureHelp";
                 /* @internal */
                 CommandTypes["SignatureHelpFull"] = "signatureHelp-full";
+                CommandTypes["SourceDefinitionAndBoundSpan"] = "sourceDefinitionAndBoundSpan";
+                /* @internal */
+                CommandTypes["SourceDefinitionAndBoundSpanFull"] = "sourceDefinitionAndBoundSpan-full";
                 CommandTypes["Status"] = "status";
                 CommandTypes["TypeDefinition"] = "typeDefinition";
                 CommandTypes["ProjectInfo"] = "projectInfo";
@@ -167310,6 +167431,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) {
@@ -168755,6 +168877,17 @@ var ts;
             Project.prototype.getIncompleteCompletionsCache = function () {
                 return this.projectService.getIncompleteCompletionsCache();
             };
+            Project.prototype.withAuxiliaryProjectForFiles = function (fileNames, cb) {
+                var options = __assign(__assign({}, this.getCompilerOptions()), { noDtsResolution: true, allowJs: true, maxNodeModuleJsDepth: 3, diagnostics: false, skipLibCheck: true, sourceMap: false, types: ts.emptyArray, lib: ts.emptyArray, noLib: true });
+                var project = new AuxiliaryProject(this.projectService, this.documentRegistry, options);
+                for (var _i = 0, fileNames_1 = fileNames; _i < fileNames_1.length; _i++) {
+                    var fileName = fileNames_1[_i];
+                    project.addRoot(this.getScriptInfo(fileName));
+                }
+                project.updateGraph();
+                cb(project);
+                project.close();
+            };
             return Project;
         }());
         server.Project = Project;
@@ -168866,6 +168999,22 @@ var ts;
             return InferredProject;
         }(Project));
         server.InferredProject = InferredProject;
+        var AuxiliaryProject = /** @class */ (function (_super) {
+            __extends(AuxiliaryProject, _super);
+            function AuxiliaryProject(projectService, documentRegistry, parentCompilerOptions) {
+                var _this = this;
+                var options = __assign(__assign({}, parentCompilerOptions), { resolveJsOnly: true, allowJs: true, maxNodeModuleJsDepth: 3, diagnostics: false, skipLibCheck: true, sourceMap: false, types: ts.emptyArray, lib: ts.emptyArray, noLib: true });
+                _this = _super.call(this, "js-analysis", ProjectKind.Auxiliary, projectService, documentRegistry, 
+                /*hasExplicitListOfFiles*/ false, 
+                /*lastFileExceededProgramSize*/ undefined, options, 
+                /*compileOnSaveEnabled*/ false, 
+                /*watchOptions*/ undefined, projectService.host, 
+                /*currentDirectory*/ undefined) || this;
+                return _this;
+            }
+            return AuxiliaryProject;
+        }(Project));
+        server.AuxiliaryProject = AuxiliaryProject;
         var AutoImportProviderProject = /** @class */ (function (_super) {
             __extends(AutoImportProviderProject, _super);
             /*@internal*/
@@ -170754,8 +170903,8 @@ var ts;
                 this.projectToSizeMap.set(name, 0);
                 this.projectToSizeMap.forEach(function (val) { return (availableSpace -= (val || 0)); });
                 var totalNonTsFileSize = 0;
-                for (var _i = 0, fileNames_1 = fileNames; _i < fileNames_1.length; _i++) {
-                    var f = fileNames_1[_i];
+                for (var _i = 0, fileNames_2 = fileNames; _i < fileNames_2.length; _i++) {
+                    var f = fileNames_2[_i];
                     var fileName = propertyReader.getFileName(f);
                     if (ts.hasTSFileExtension(fileName)) {
                         continue;
@@ -173468,6 +173617,12 @@ var ts;
                     _a[server.CommandNames.DefinitionAndBoundSpanFull] = function (request) {
                         return _this.requiredResponse(_this.getDefinitionAndBoundSpan(request.arguments, /*simplifiedResult*/ false));
                     },
+                    // [CommandNames.SourceDefinitionAndBoundSpan]: (request: protocol.SourceDefinitionAndBoundSpanRequest) => {
+                    //     return this.requiredResponse(this.getSourceDefinitionAndBoundSpan(request.arguments, /*simplifiedResult*/ true));
+                    // },
+                    // [CommandNames.SourceDefinitionAndBoundSpanFull]: (request: protocol.SourceDefinitionAndBoundSpanRequest) => {
+                    //     return this.requiredResponse(this.getSourceDefinitionAndBoundSpan(request.arguments, /*simplifiedResult*/ false));
+                    // },
                     _a[server.CommandNames.EmitOutput] = function (request) {
                         return _this.requiredResponse(_this.getEmitOutput(request.arguments));
                     },
@@ -174204,10 +174359,34 @@ 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) {
+                //     const { file, project } = this.getFileAndProject(args);
+                //     const position = this.getPositionInFile(args, file);
+                //     const scriptInfo = Debug.checkDefined(project.getScriptInfo(file));
+                //     const unmappedDefinitionAndBoundSpan = project.getLanguageService().getDefinitionAndBoundSpan(file, position);
+                //     if (!unmappedDefinitionAndBoundSpan || !unmappedDefinitionAndBoundSpan.definitions) {
+                //         return {
+                //             definitions: emptyArray,
+                //             textSpan: undefined! // TODO: GH#18217
+                //         };
+                //     }
+                //     const definitions = this.mapDefinitionInfoLocations(unmappedDefinitionAndBoundSpan.definitions, project);
+                //     const { textSpan } = unmappedDefinitionAndBoundSpan;
+                //     if (simplifiedResult) {
+                //         return {
+                //             definitions: this.mapDefinitionInfo(definitions, project),
+                //             textSpan: toProtocolTextSpan(textSpan, scriptInfo)
+                //         };
+                //     }
+                //     return {
+                //         definitions: definitions.map(Session.mapToOriginalLocation),
+                //         textSpan,
+                //     };
+                // }
+                // private getSourceDefinitionAndBoundSpan(args: protocol.FileLocationRequestArgs, simplifiedResult: boolean): protocol.DefinitionInfoAndBoundSpan | DefinitionInfoAndBoundSpan {
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
                 var position = this.getPositionInFile(args, file);
                 var scriptInfo = ts.Debug.checkDefined(project.getScriptInfo(file));
@@ -174218,7 +174397,31 @@ var ts;
                         textSpan: undefined // TODO: GH#18217
                     };
                 }
-                var definitions = this.mapDefinitionInfoLocations(unmappedDefinitionAndBoundSpan.definitions, project);
+                var definitions = this.mapDefinitionInfoLocations(unmappedDefinitionAndBoundSpan.definitions, project).slice();
+                var needsJsResolution = !ts.some(definitions, function (d) { return server.toNormalizedPath(d.fileName) !== file && !d.isAmbient; }) || ts.some(definitions, function (d) { return !!d.failedAliasResolution; });
+                if (needsJsResolution) {
+                    project.withAuxiliaryProjectForFiles([file], function (auxiliaryProject) {
+                        var ls = auxiliaryProject.getLanguageService();
+                        var jsDefinitions = ls.getDefinitionAndBoundSpan(file, position, /*aliasesOnly*/ true);
+                        if (ts.some(jsDefinitions === null || jsDefinitions === void 0 ? void 0 : jsDefinitions.definitions)) {
+                            for (var _i = 0, _a = jsDefinitions.definitions; _i < _a.length; _i++) {
+                                var jsDefinition = _a[_i];
+                                if (jsDefinition.unverified) {
+                                    var refined = tryRefineDefinition(jsDefinition, project.getLanguageService().getProgram(), ls.getProgram());
+                                    if (ts.some(refined)) {
+                                        for (var _b = 0, _c = refined || server.emptyArray; _b < _c.length; _b++) {
+                                            var def = _c[_b];
+                                            ts.pushIfUnique(definitions, def, ts.documentSpansEqual);
+                                        }
+                                        continue;
+                                    }
+                                }
+                                ts.pushIfUnique(definitions, jsDefinition, ts.documentSpansEqual);
+                            }
+                        }
+                    });
+                }
+                definitions = definitions.filter(function (d) { return !d.isAmbient && !d.failedAliasResolution; });
                 var textSpan = unmappedDefinitionAndBoundSpan.textSpan;
                 if (simplifiedResult) {
                     return {
@@ -174230,6 +174433,32 @@ var ts;
                     definitions: definitions.map(Session.mapToOriginalLocation),
                     textSpan: textSpan,
                 };
+                function tryRefineDefinition(definition, program, auxiliaryProgram) {
+                    var _a, _b;
+                    var fileToSearch = auxiliaryProgram.getSourceFile(definition.fileName);
+                    if (!fileToSearch) {
+                        return undefined;
+                    }
+                    var initialNode = ts.getTouchingPropertyName(program.getSourceFile(file), position);
+                    var symbol = program.getTypeChecker().getSymbolAtLocation(initialNode);
+                    if (!symbol || !symbol.declarations || ts.some(symbol.declarations, ts.isFreelyNameableImport)) {
+                        return undefined;
+                    }
+                    var nameToSearch = ((_b = (_a = ts.find(symbol.declarations, ts.isImportSpecifier)) === null || _a === void 0 ? void 0 : _a.propertyName) === null || _b === void 0 ? void 0 : _b.text) || symbol.name;
+                    return searchForDeclaration(nameToSearch, fileToSearch, auxiliaryProgram);
+                }
+                function searchForDeclaration(declarationName, fileToSearch, auxiliaryProgram) {
+                    var matches = ts.FindAllReferences.Core.getTopMostDeclarationNamesInFile(declarationName, fileToSearch);
+                    return ts.mapDefined(matches, function (match) {
+                        var symbol = auxiliaryProgram.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, auxiliaryProgram.getTypeChecker(), symbol, decl);
+                        }
+                    });
+                }
             };
             Session.prototype.getEmitOutput = function (args) {
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;