typescript 4.5.0-dev.20211008 → 4.5.0-dev.20211009

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.5";
-    ts.version = ts.versionMajorMinor + ".0-dev.20211008";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211009";
     var NativeCollections;
     (function (NativeCollections) {
         function tryGetNativeMap() {

package/lib/tsserver.js

@@ -100,7 +100,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.20211008";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211009";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -125581,11 +125581,12 @@ var ts;
                     : ts.getNameForExportedSymbol(namedSymbol, scriptTarget);
                 var moduleName = ts.stripQuotes(moduleSymbol.name);
                 var id = exportInfoId++;
+                var target = ts.skipAlias(symbol, checker);
                 var storedSymbol = symbol.flags & 33554432 /* Transient */ ? undefined : symbol;
                 var storedModuleSymbol = moduleSymbol.flags & 33554432 /* Transient */ ? undefined : moduleSymbol;
                 if (!storedSymbol || !storedModuleSymbol)
                     symbols.set(id, [symbol, moduleSymbol]);
-                exportInfo.add(key(importedName, symbol, moduleName, checker), {
+                exportInfo.add(key(importedName, symbol, ts.isExternalModuleNameRelative(moduleName) ? undefined : moduleName, checker), {
                     id: id,
                     symbolTableKey: symbolTableKey,
                     symbolName: importedName,
@@ -125593,16 +125594,16 @@ var ts;
                     moduleFile: moduleFile,
                     moduleFileName: moduleFile === null || moduleFile === void 0 ? void 0 : moduleFile.fileName,
                     exportKind: exportKind,
-                    targetFlags: ts.skipAlias(symbol, checker).flags,
+                    targetFlags: target.flags,
                     isFromPackageJson: isFromPackageJson,
                     symbol: storedSymbol,
                     moduleSymbol: storedModuleSymbol,
                 });
             },
-            get: function (importingFile, importedName, symbol, moduleName, checker) {
+            get: function (importingFile, key) {
                 if (importingFile !== usableByFileName)
                     return;
-                var result = exportInfo.get(key(importedName, symbol, moduleName, checker));
+                var result = exportInfo.get(key);
                 return result === null || result === void 0 ? void 0 : result.map(rehydrateCachedInfo);
             },
             forEach: function (importingFile, action) {
@@ -125610,7 +125611,7 @@ var ts;
                     return;
                 exportInfo.forEach(function (info, key) {
                     var _a = parseKey(key), symbolName = _a.symbolName, ambientModuleName = _a.ambientModuleName;
-                    action(info.map(rehydrateCachedInfo), symbolName, !!ambientModuleName);
+                    action(info.map(rehydrateCachedInfo), symbolName, !!ambientModuleName, key);
                 });
             },
             releaseSymbols: function () {
@@ -125675,26 +125676,16 @@ var ts;
                 isFromPackageJson: isFromPackageJson,
             };
         }
-        function key(importedName, symbol, moduleName, checker) {
-            var unquoted = ts.stripQuotes(moduleName);
-            var moduleKey = ts.isExternalModuleNameRelative(unquoted) ? "/" : unquoted;
-            var target = ts.skipAlias(symbol, checker);
-            return importedName + "|" + createSymbolKey(target) + "|" + moduleKey;
+        function key(importedName, symbol, ambientModuleName, checker) {
+            var moduleKey = ambientModuleName || "";
+            return importedName + "|" + ts.getSymbolId(ts.skipAlias(symbol, checker)) + "|" + moduleKey;
         }
         function parseKey(key) {
             var symbolName = key.substring(0, key.indexOf("|"));
             var moduleKey = key.substring(key.lastIndexOf("|") + 1);
-            var ambientModuleName = moduleKey === "/" ? undefined : moduleKey;
+            var ambientModuleName = moduleKey === "" ? undefined : moduleKey;
             return { symbolName: symbolName, ambientModuleName: ambientModuleName };
         }
-        function createSymbolKey(symbol) {
-            var key = symbol.name;
-            while (symbol.parent) {
-                key += "," + symbol.parent.name;
-                symbol = symbol.parent;
-            }
-            return key;
-        }
         function fileIsGlobalOnly(file) {
             return !file.commonJsModuleIndicator && !file.externalModuleIndicator && !file.moduleAugmentations && !file.ambientModuleNames;
         }
@@ -128039,20 +128030,19 @@ var ts;
             }
         }
         Completions.getCompletionsAtPosition = getCompletionsAtPosition;
+        function completionEntryDataIsResolved(data) {
+            return !!(data === null || data === void 0 ? void 0 : data.moduleSpecifier);
+        }
         function continuePreviousIncompleteResponse(cache, file, location, program, host, preferences, cancellationToken) {
-            var _a;
             var previousResponse = cache.get();
             if (!previousResponse)
                 return undefined;
             var lowerCaseTokenText = location.text.toLowerCase();
             var exportMap = ts.getExportInfoMap(file, host, program, cancellationToken);
-            var checker = program.getTypeChecker();
-            var autoImportProvider = (_a = host.getPackageJsonAutoImportProvider) === null || _a === void 0 ? void 0 : _a.call(host);
-            var autoImportProviderChecker = autoImportProvider === null || autoImportProvider === void 0 ? void 0 : autoImportProvider.getTypeChecker();
             var newEntries = resolvingModuleSpecifiers("continuePreviousIncompleteResponse", host, program, file, preferences, 
             /*isForImportStatementCompletion*/ false, function (context) {
                 var entries = ts.mapDefined(previousResponse.entries, function (entry) {
-                    if (!entry.hasAction || !entry.source || !entry.data || entry.data.moduleSpecifier) {
+                    if (!entry.hasAction || !entry.source || !entry.data || completionEntryDataIsResolved(entry.data)) {
                         // Not an auto import or already resolved; keep as is
                         return entry;
                     }
@@ -128060,8 +128050,8 @@ var ts;
                         // No longer matches typed characters; filter out
                         return undefined;
                     }
-                    var _a = ts.Debug.checkDefined(getAutoImportSymbolFromCompletionEntryData(entry.name, entry.data, program, host)), symbol = _a.symbol, origin = _a.origin;
-                    var info = exportMap.get(file.path, entry.name, symbol, origin.moduleSymbol.name, origin.isFromPackageJson ? autoImportProviderChecker : checker);
+                    var origin = ts.Debug.checkDefined(getAutoImportSymbolFromCompletionEntryData(entry.name, entry.data, program, host)).origin;
+                    var info = exportMap.get(file.path, entry.data.exportMapKey);
                     var result = info && context.tryResolve(info, !ts.isExternalModuleNameRelative(ts.stripQuotes(origin.moduleSymbol.name)));
                     if (!result)
                         return entry;
@@ -128362,13 +128352,54 @@ var ts;
             return text.replace(/\$/gm, "\\$");
         }
         function originToCompletionEntryData(origin) {
-            return {
+            var ambientModuleName = origin.fileName ? undefined : ts.stripQuotes(origin.moduleSymbol.name);
+            var isPackageJsonImport = origin.isFromPackageJson ? true : undefined;
+            if (originIsResolvedExport(origin)) {
+                var resolvedData = {
+                    exportName: origin.exportName,
+                    moduleSpecifier: origin.moduleSpecifier,
+                    ambientModuleName: ambientModuleName,
+                    fileName: origin.fileName,
+                    isPackageJsonImport: isPackageJsonImport,
+                };
+                return resolvedData;
+            }
+            var unresolvedData = {
                 exportName: origin.exportName,
+                exportMapKey: origin.exportMapKey,
                 fileName: origin.fileName,
                 ambientModuleName: origin.fileName ? undefined : ts.stripQuotes(origin.moduleSymbol.name),
                 isPackageJsonImport: origin.isFromPackageJson ? true : undefined,
-                moduleSpecifier: originIsResolvedExport(origin) ? origin.moduleSpecifier : undefined,
             };
+            return unresolvedData;
+        }
+        function completionEntryDataToSymbolOriginInfo(data, completionName, moduleSymbol) {
+            var isDefaultExport = data.exportName === "default" /* Default */;
+            var isFromPackageJson = !!data.isPackageJsonImport;
+            if (completionEntryDataIsResolved(data)) {
+                var resolvedOrigin = {
+                    kind: 32 /* ResolvedExport */,
+                    exportName: data.exportName,
+                    moduleSpecifier: data.moduleSpecifier,
+                    symbolName: completionName,
+                    fileName: data.fileName,
+                    moduleSymbol: moduleSymbol,
+                    isDefaultExport: isDefaultExport,
+                    isFromPackageJson: isFromPackageJson,
+                };
+                return resolvedOrigin;
+            }
+            var unresolvedOrigin = {
+                kind: 4 /* Export */,
+                exportName: data.exportName,
+                exportMapKey: data.exportMapKey,
+                symbolName: completionName,
+                fileName: data.fileName,
+                moduleSymbol: moduleSymbol,
+                isDefaultExport: isDefaultExport,
+                isFromPackageJson: isFromPackageJson,
+            };
+            return unresolvedOrigin;
         }
         function getInsertTextAndReplacementSpanForImportCompletion(name, importCompletionNode, contextToken, origin, useSemicolons, options, preferences) {
             var _a, _b, _c;
@@ -129144,6 +129175,7 @@ var ts;
                 }
             }
             function addPropertySymbol(symbol, insertAwait, insertQuestionDot) {
+                var _a;
                 // For a computed property with an accessible name like `Symbol.iterator`,
                 // we'll add a completion for the *name* `Symbol` instead of for the property.
                 // If this is e.g. [Symbol.iterator], add a completion for `Symbol`.
@@ -129157,19 +129189,33 @@ var ts;
                         var index = symbols.length;
                         symbols.push(firstAccessibleSymbol);
                         var moduleSymbol = firstAccessibleSymbol.parent;
-                        if (!moduleSymbol || !ts.isExternalModuleSymbol(moduleSymbol)) {
+                        if (!moduleSymbol ||
+                            !ts.isExternalModuleSymbol(moduleSymbol) ||
+                            typeChecker.tryGetMemberInModuleExportsAndProperties(firstAccessibleSymbol.name, moduleSymbol) !== firstAccessibleSymbol) {
                             symbolToOriginInfoMap[index] = { kind: getNullableSymbolOriginInfoKind(2 /* SymbolMemberNoExport */) };
                         }
                         else {
-                            var origin = {
-                                kind: getNullableSymbolOriginInfoKind(6 /* SymbolMemberExport */),
-                                moduleSymbol: moduleSymbol,
-                                isDefaultExport: false,
-                                symbolName: firstAccessibleSymbol.name,
-                                exportName: firstAccessibleSymbol.name,
-                                fileName: ts.isExternalModuleNameRelative(ts.stripQuotes(moduleSymbol.name)) ? ts.cast(moduleSymbol.valueDeclaration, ts.isSourceFile).fileName : undefined,
-                            };
-                            symbolToOriginInfoMap[index] = origin;
+                            var fileName = ts.isExternalModuleNameRelative(ts.stripQuotes(moduleSymbol.name)) ? (_a = ts.getSourceFileOfModule(moduleSymbol)) === null || _a === void 0 ? void 0 : _a.fileName : undefined;
+                            var moduleSpecifier = (ts.codefix.getModuleSpecifierForBestExportInfo([{
+                                    exportKind: 0 /* Named */,
+                                    moduleFileName: fileName,
+                                    isFromPackageJson: false,
+                                    moduleSymbol: moduleSymbol,
+                                    symbol: firstAccessibleSymbol,
+                                    targetFlags: ts.skipAlias(firstAccessibleSymbol, typeChecker).flags,
+                                }], sourceFile, program, host, preferences) || {}).moduleSpecifier;
+                            if (moduleSpecifier) {
+                                var origin = {
+                                    kind: getNullableSymbolOriginInfoKind(6 /* SymbolMemberExport */),
+                                    moduleSymbol: moduleSymbol,
+                                    isDefaultExport: false,
+                                    symbolName: firstAccessibleSymbol.name,
+                                    exportName: firstAccessibleSymbol.name,
+                                    fileName: fileName,
+                                    moduleSpecifier: moduleSpecifier,
+                                };
+                                symbolToOriginInfoMap[index] = origin;
+                            }
                         }
                     }
                     else if (preferences.includeCompletionsWithInsertText) {
@@ -129405,7 +129451,7 @@ var ts;
                 var packageJsonAutoImportProvider = (_b = host.getPackageJsonAutoImportProvider) === null || _b === void 0 ? void 0 : _b.call(host);
                 var packageJsonFilter = detailsEntryId ? undefined : ts.createPackageJsonImportFilter(sourceFile, preferences, host);
                 resolvingModuleSpecifiers("collectAutoImports", host, program, sourceFile, preferences, !!importCompletionNode, function (context) {
-                    exportInfo.forEach(sourceFile.path, function (info, symbolName, isFromAmbientModule) {
+                    exportInfo.forEach(sourceFile.path, function (info, symbolName, isFromAmbientModule, exportMapKey) {
                         if (!ts.isIdentifierText(symbolName, ts.getEmitScriptTarget(host.getCompilationSettings())))
                             return;
                         if (!detailsEntryId && ts.isStringANonContextualKeyword(symbolName))
@@ -129430,6 +129476,7 @@ var ts;
                                 kind: moduleSpecifier ? 32 /* ResolvedExport */ : 4 /* Export */,
                                 moduleSpecifier: moduleSpecifier,
                                 symbolName: symbolName,
+                                exportMapKey: exportMapKey,
                                 exportName: exportInfo_1.exportKind === 2 /* ExportEquals */ ? "export=" /* ExportEquals */ : exportInfo_1.symbol.name,
                                 fileName: exportInfo_1.moduleFileName,
                                 isDefaultExport: isDefaultExport,
@@ -130253,18 +130300,7 @@ var ts;
                 return undefined;
             var isDefaultExport = data.exportName === "default" /* Default */;
             symbol = isDefaultExport && ts.getLocalSymbolForExportDefault(symbol) || symbol;
-            return {
-                symbol: symbol,
-                origin: {
-                    kind: data.moduleSpecifier ? 32 /* ResolvedExport */ : 4 /* Export */,
-                    moduleSymbol: moduleSymbol,
-                    symbolName: name,
-                    isDefaultExport: isDefaultExport,
-                    exportName: data.exportName,
-                    fileName: data.fileName,
-                    isFromPackageJson: !!data.isPackageJsonImport,
-                }
-            };
+            return { symbol: symbol, origin: completionEntryDataToSymbolOriginInfo(data, name, moduleSymbol) };
         }
         function getCompletionEntryDisplayNameForSymbol(symbol, target, origin, kind, jsxIdentifierExpected) {
             var name = originIncludesSymbolName(origin) ? origin.symbolName : symbol.name;

package/lib/tsserverlibrary.d.ts

@@ -6367,23 +6367,28 @@ declare namespace ts {
         isIncomplete?: true;
         entries: CompletionEntry[];
     }
-    interface CompletionEntryData {
-        /** The file name declaring the export's module symbol, if it was an external module */
-        fileName?: string;
-        /** The module name (with quotes stripped) of the export's module symbol, if it was an ambient module */
-        ambientModuleName?: string;
-        /** True if the export was found in the package.json AutoImportProvider */
-        isPackageJsonImport?: true;
+    interface CompletionEntryDataAutoImport {
         /**
          * The name of the property or export in the module's symbol table. Differs from the completion name
          * in the case of InternalSymbolName.ExportEquals and InternalSymbolName.Default.
          */
         exportName: string;
-        /**
-         * Set for auto imports with eagerly resolved module specifiers.
-         */
         moduleSpecifier?: string;
+        /** The file name declaring the export's module symbol, if it was an external module */
+        fileName?: string;
+        /** The module name (with quotes stripped) of the export's module symbol, if it was an ambient module */
+        ambientModuleName?: string;
+        /** True if the export was found in the package.json AutoImportProvider */
+        isPackageJsonImport?: true;
+    }
+    interface CompletionEntryDataUnresolved extends CompletionEntryDataAutoImport {
+        /** The key in the `ExportMapCache` where the completion entry's `SymbolExportInfo[]` is found */
+        exportMapKey: string;
+    }
+    interface CompletionEntryDataResolved extends CompletionEntryDataAutoImport {
+        moduleSpecifier: string;
     }
+    type CompletionEntryData = CompletionEntryDataUnresolved | CompletionEntryDataResolved;
     interface CompletionEntry {
         name: string;
         kind: ScriptElementKind;

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.20211008";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211009";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -126163,11 +126163,12 @@ var ts;
                     : ts.getNameForExportedSymbol(namedSymbol, scriptTarget);
                 var moduleName = ts.stripQuotes(moduleSymbol.name);
                 var id = exportInfoId++;
+                var target = ts.skipAlias(symbol, checker);
                 var storedSymbol = symbol.flags & 33554432 /* Transient */ ? undefined : symbol;
                 var storedModuleSymbol = moduleSymbol.flags & 33554432 /* Transient */ ? undefined : moduleSymbol;
                 if (!storedSymbol || !storedModuleSymbol)
                     symbols.set(id, [symbol, moduleSymbol]);
-                exportInfo.add(key(importedName, symbol, moduleName, checker), {
+                exportInfo.add(key(importedName, symbol, ts.isExternalModuleNameRelative(moduleName) ? undefined : moduleName, checker), {
                     id: id,
                     symbolTableKey: symbolTableKey,
                     symbolName: importedName,
@@ -126175,16 +126176,16 @@ var ts;
                     moduleFile: moduleFile,
                     moduleFileName: moduleFile === null || moduleFile === void 0 ? void 0 : moduleFile.fileName,
                     exportKind: exportKind,
-                    targetFlags: ts.skipAlias(symbol, checker).flags,
+                    targetFlags: target.flags,
                     isFromPackageJson: isFromPackageJson,
                     symbol: storedSymbol,
                     moduleSymbol: storedModuleSymbol,
                 });
             },
-            get: function (importingFile, importedName, symbol, moduleName, checker) {
+            get: function (importingFile, key) {
                 if (importingFile !== usableByFileName)
                     return;
-                var result = exportInfo.get(key(importedName, symbol, moduleName, checker));
+                var result = exportInfo.get(key);
                 return result === null || result === void 0 ? void 0 : result.map(rehydrateCachedInfo);
             },
             forEach: function (importingFile, action) {
@@ -126192,7 +126193,7 @@ var ts;
                     return;
                 exportInfo.forEach(function (info, key) {
                     var _a = parseKey(key), symbolName = _a.symbolName, ambientModuleName = _a.ambientModuleName;
-                    action(info.map(rehydrateCachedInfo), symbolName, !!ambientModuleName);
+                    action(info.map(rehydrateCachedInfo), symbolName, !!ambientModuleName, key);
                 });
             },
             releaseSymbols: function () {
@@ -126257,26 +126258,16 @@ var ts;
                 isFromPackageJson: isFromPackageJson,
             };
         }
-        function key(importedName, symbol, moduleName, checker) {
-            var unquoted = ts.stripQuotes(moduleName);
-            var moduleKey = ts.isExternalModuleNameRelative(unquoted) ? "/" : unquoted;
-            var target = ts.skipAlias(symbol, checker);
-            return importedName + "|" + createSymbolKey(target) + "|" + moduleKey;
+        function key(importedName, symbol, ambientModuleName, checker) {
+            var moduleKey = ambientModuleName || "";
+            return importedName + "|" + ts.getSymbolId(ts.skipAlias(symbol, checker)) + "|" + moduleKey;
         }
         function parseKey(key) {
             var symbolName = key.substring(0, key.indexOf("|"));
             var moduleKey = key.substring(key.lastIndexOf("|") + 1);
-            var ambientModuleName = moduleKey === "/" ? undefined : moduleKey;
+            var ambientModuleName = moduleKey === "" ? undefined : moduleKey;
             return { symbolName: symbolName, ambientModuleName: ambientModuleName };
         }
-        function createSymbolKey(symbol) {
-            var key = symbol.name;
-            while (symbol.parent) {
-                key += "," + symbol.parent.name;
-                symbol = symbol.parent;
-            }
-            return key;
-        }
         function fileIsGlobalOnly(file) {
             return !file.commonJsModuleIndicator && !file.externalModuleIndicator && !file.moduleAugmentations && !file.ambientModuleNames;
         }
@@ -128621,20 +128612,19 @@ var ts;
             }
         }
         Completions.getCompletionsAtPosition = getCompletionsAtPosition;
+        function completionEntryDataIsResolved(data) {
+            return !!(data === null || data === void 0 ? void 0 : data.moduleSpecifier);
+        }
         function continuePreviousIncompleteResponse(cache, file, location, program, host, preferences, cancellationToken) {
-            var _a;
             var previousResponse = cache.get();
             if (!previousResponse)
                 return undefined;
             var lowerCaseTokenText = location.text.toLowerCase();
             var exportMap = ts.getExportInfoMap(file, host, program, cancellationToken);
-            var checker = program.getTypeChecker();
-            var autoImportProvider = (_a = host.getPackageJsonAutoImportProvider) === null || _a === void 0 ? void 0 : _a.call(host);
-            var autoImportProviderChecker = autoImportProvider === null || autoImportProvider === void 0 ? void 0 : autoImportProvider.getTypeChecker();
             var newEntries = resolvingModuleSpecifiers("continuePreviousIncompleteResponse", host, program, file, preferences, 
             /*isForImportStatementCompletion*/ false, function (context) {
                 var entries = ts.mapDefined(previousResponse.entries, function (entry) {
-                    if (!entry.hasAction || !entry.source || !entry.data || entry.data.moduleSpecifier) {
+                    if (!entry.hasAction || !entry.source || !entry.data || completionEntryDataIsResolved(entry.data)) {
                         // Not an auto import or already resolved; keep as is
                         return entry;
                     }
@@ -128642,8 +128632,8 @@ var ts;
                         // No longer matches typed characters; filter out
                         return undefined;
                     }
-                    var _a = ts.Debug.checkDefined(getAutoImportSymbolFromCompletionEntryData(entry.name, entry.data, program, host)), symbol = _a.symbol, origin = _a.origin;
-                    var info = exportMap.get(file.path, entry.name, symbol, origin.moduleSymbol.name, origin.isFromPackageJson ? autoImportProviderChecker : checker);
+                    var origin = ts.Debug.checkDefined(getAutoImportSymbolFromCompletionEntryData(entry.name, entry.data, program, host)).origin;
+                    var info = exportMap.get(file.path, entry.data.exportMapKey);
                     var result = info && context.tryResolve(info, !ts.isExternalModuleNameRelative(ts.stripQuotes(origin.moduleSymbol.name)));
                     if (!result)
                         return entry;
@@ -128944,13 +128934,54 @@ var ts;
             return text.replace(/\$/gm, "\\$");
         }
         function originToCompletionEntryData(origin) {
-            return {
+            var ambientModuleName = origin.fileName ? undefined : ts.stripQuotes(origin.moduleSymbol.name);
+            var isPackageJsonImport = origin.isFromPackageJson ? true : undefined;
+            if (originIsResolvedExport(origin)) {
+                var resolvedData = {
+                    exportName: origin.exportName,
+                    moduleSpecifier: origin.moduleSpecifier,
+                    ambientModuleName: ambientModuleName,
+                    fileName: origin.fileName,
+                    isPackageJsonImport: isPackageJsonImport,
+                };
+                return resolvedData;
+            }
+            var unresolvedData = {
                 exportName: origin.exportName,
+                exportMapKey: origin.exportMapKey,
                 fileName: origin.fileName,
                 ambientModuleName: origin.fileName ? undefined : ts.stripQuotes(origin.moduleSymbol.name),
                 isPackageJsonImport: origin.isFromPackageJson ? true : undefined,
-                moduleSpecifier: originIsResolvedExport(origin) ? origin.moduleSpecifier : undefined,
             };
+            return unresolvedData;
+        }
+        function completionEntryDataToSymbolOriginInfo(data, completionName, moduleSymbol) {
+            var isDefaultExport = data.exportName === "default" /* Default */;
+            var isFromPackageJson = !!data.isPackageJsonImport;
+            if (completionEntryDataIsResolved(data)) {
+                var resolvedOrigin = {
+                    kind: 32 /* ResolvedExport */,
+                    exportName: data.exportName,
+                    moduleSpecifier: data.moduleSpecifier,
+                    symbolName: completionName,
+                    fileName: data.fileName,
+                    moduleSymbol: moduleSymbol,
+                    isDefaultExport: isDefaultExport,
+                    isFromPackageJson: isFromPackageJson,
+                };
+                return resolvedOrigin;
+            }
+            var unresolvedOrigin = {
+                kind: 4 /* Export */,
+                exportName: data.exportName,
+                exportMapKey: data.exportMapKey,
+                symbolName: completionName,
+                fileName: data.fileName,
+                moduleSymbol: moduleSymbol,
+                isDefaultExport: isDefaultExport,
+                isFromPackageJson: isFromPackageJson,
+            };
+            return unresolvedOrigin;
         }
         function getInsertTextAndReplacementSpanForImportCompletion(name, importCompletionNode, contextToken, origin, useSemicolons, options, preferences) {
             var _a, _b, _c;
@@ -129726,6 +129757,7 @@ var ts;
                 }
             }
             function addPropertySymbol(symbol, insertAwait, insertQuestionDot) {
+                var _a;
                 // For a computed property with an accessible name like `Symbol.iterator`,
                 // we'll add a completion for the *name* `Symbol` instead of for the property.
                 // If this is e.g. [Symbol.iterator], add a completion for `Symbol`.
@@ -129739,19 +129771,33 @@ var ts;
                         var index = symbols.length;
                         symbols.push(firstAccessibleSymbol);
                         var moduleSymbol = firstAccessibleSymbol.parent;
-                        if (!moduleSymbol || !ts.isExternalModuleSymbol(moduleSymbol)) {
+                        if (!moduleSymbol ||
+                            !ts.isExternalModuleSymbol(moduleSymbol) ||
+                            typeChecker.tryGetMemberInModuleExportsAndProperties(firstAccessibleSymbol.name, moduleSymbol) !== firstAccessibleSymbol) {
                             symbolToOriginInfoMap[index] = { kind: getNullableSymbolOriginInfoKind(2 /* SymbolMemberNoExport */) };
                         }
                         else {
-                            var origin = {
-                                kind: getNullableSymbolOriginInfoKind(6 /* SymbolMemberExport */),
-                                moduleSymbol: moduleSymbol,
-                                isDefaultExport: false,
-                                symbolName: firstAccessibleSymbol.name,
-                                exportName: firstAccessibleSymbol.name,
-                                fileName: ts.isExternalModuleNameRelative(ts.stripQuotes(moduleSymbol.name)) ? ts.cast(moduleSymbol.valueDeclaration, ts.isSourceFile).fileName : undefined,
-                            };
-                            symbolToOriginInfoMap[index] = origin;
+                            var fileName = ts.isExternalModuleNameRelative(ts.stripQuotes(moduleSymbol.name)) ? (_a = ts.getSourceFileOfModule(moduleSymbol)) === null || _a === void 0 ? void 0 : _a.fileName : undefined;
+                            var moduleSpecifier = (ts.codefix.getModuleSpecifierForBestExportInfo([{
+                                    exportKind: 0 /* Named */,
+                                    moduleFileName: fileName,
+                                    isFromPackageJson: false,
+                                    moduleSymbol: moduleSymbol,
+                                    symbol: firstAccessibleSymbol,
+                                    targetFlags: ts.skipAlias(firstAccessibleSymbol, typeChecker).flags,
+                                }], sourceFile, program, host, preferences) || {}).moduleSpecifier;
+                            if (moduleSpecifier) {
+                                var origin = {
+                                    kind: getNullableSymbolOriginInfoKind(6 /* SymbolMemberExport */),
+                                    moduleSymbol: moduleSymbol,
+                                    isDefaultExport: false,
+                                    symbolName: firstAccessibleSymbol.name,
+                                    exportName: firstAccessibleSymbol.name,
+                                    fileName: fileName,
+                                    moduleSpecifier: moduleSpecifier,
+                                };
+                                symbolToOriginInfoMap[index] = origin;
+                            }
                         }
                     }
                     else if (preferences.includeCompletionsWithInsertText) {
@@ -129987,7 +130033,7 @@ var ts;
                 var packageJsonAutoImportProvider = (_b = host.getPackageJsonAutoImportProvider) === null || _b === void 0 ? void 0 : _b.call(host);
                 var packageJsonFilter = detailsEntryId ? undefined : ts.createPackageJsonImportFilter(sourceFile, preferences, host);
                 resolvingModuleSpecifiers("collectAutoImports", host, program, sourceFile, preferences, !!importCompletionNode, function (context) {
-                    exportInfo.forEach(sourceFile.path, function (info, symbolName, isFromAmbientModule) {
+                    exportInfo.forEach(sourceFile.path, function (info, symbolName, isFromAmbientModule, exportMapKey) {
                         if (!ts.isIdentifierText(symbolName, ts.getEmitScriptTarget(host.getCompilationSettings())))
                             return;
                         if (!detailsEntryId && ts.isStringANonContextualKeyword(symbolName))
@@ -130012,6 +130058,7 @@ var ts;
                                 kind: moduleSpecifier ? 32 /* ResolvedExport */ : 4 /* Export */,
                                 moduleSpecifier: moduleSpecifier,
                                 symbolName: symbolName,
+                                exportMapKey: exportMapKey,
                                 exportName: exportInfo_1.exportKind === 2 /* ExportEquals */ ? "export=" /* ExportEquals */ : exportInfo_1.symbol.name,
                                 fileName: exportInfo_1.moduleFileName,
                                 isDefaultExport: isDefaultExport,
@@ -130835,18 +130882,7 @@ var ts;
                 return undefined;
             var isDefaultExport = data.exportName === "default" /* Default */;
             symbol = isDefaultExport && ts.getLocalSymbolForExportDefault(symbol) || symbol;
-            return {
-                symbol: symbol,
-                origin: {
-                    kind: data.moduleSpecifier ? 32 /* ResolvedExport */ : 4 /* Export */,
-                    moduleSymbol: moduleSymbol,
-                    symbolName: name,
-                    isDefaultExport: isDefaultExport,
-                    exportName: data.exportName,
-                    fileName: data.fileName,
-                    isFromPackageJson: !!data.isPackageJsonImport,
-                }
-            };
+            return { symbol: symbol, origin: completionEntryDataToSymbolOriginInfo(data, name, moduleSymbol) };
         }
         function getCompletionEntryDisplayNameForSymbol(symbol, target, origin, kind, jsxIdentifierExpected) {
             var name = originIncludesSymbolName(origin) ? origin.symbolName : symbol.name;

package/lib/typescript.d.ts

@@ -6367,23 +6367,28 @@ declare namespace ts {
         isIncomplete?: true;
         entries: CompletionEntry[];
     }
-    interface CompletionEntryData {
-        /** The file name declaring the export's module symbol, if it was an external module */
-        fileName?: string;
-        /** The module name (with quotes stripped) of the export's module symbol, if it was an ambient module */
-        ambientModuleName?: string;
-        /** True if the export was found in the package.json AutoImportProvider */
-        isPackageJsonImport?: true;
+    interface CompletionEntryDataAutoImport {
         /**
          * The name of the property or export in the module's symbol table. Differs from the completion name
          * in the case of InternalSymbolName.ExportEquals and InternalSymbolName.Default.
          */
         exportName: string;
-        /**
-         * Set for auto imports with eagerly resolved module specifiers.
-         */
         moduleSpecifier?: string;
+        /** The file name declaring the export's module symbol, if it was an external module */
+        fileName?: string;
+        /** The module name (with quotes stripped) of the export's module symbol, if it was an ambient module */
+        ambientModuleName?: string;
+        /** True if the export was found in the package.json AutoImportProvider */
+        isPackageJsonImport?: true;
+    }
+    interface CompletionEntryDataUnresolved extends CompletionEntryDataAutoImport {
+        /** The key in the `ExportMapCache` where the completion entry's `SymbolExportInfo[]` is found */
+        exportMapKey: string;
+    }
+    interface CompletionEntryDataResolved extends CompletionEntryDataAutoImport {
+        moduleSpecifier: string;
     }
+    type CompletionEntryData = CompletionEntryDataUnresolved | CompletionEntryDataResolved;
     interface CompletionEntry {
         name: string;
         kind: ScriptElementKind;

package/lib/typescript.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.20211008";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211009";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -126163,11 +126163,12 @@ var ts;
                     : ts.getNameForExportedSymbol(namedSymbol, scriptTarget);
                 var moduleName = ts.stripQuotes(moduleSymbol.name);
                 var id = exportInfoId++;
+                var target = ts.skipAlias(symbol, checker);
                 var storedSymbol = symbol.flags & 33554432 /* Transient */ ? undefined : symbol;
                 var storedModuleSymbol = moduleSymbol.flags & 33554432 /* Transient */ ? undefined : moduleSymbol;
                 if (!storedSymbol || !storedModuleSymbol)
                     symbols.set(id, [symbol, moduleSymbol]);
-                exportInfo.add(key(importedName, symbol, moduleName, checker), {
+                exportInfo.add(key(importedName, symbol, ts.isExternalModuleNameRelative(moduleName) ? undefined : moduleName, checker), {
                     id: id,
                     symbolTableKey: symbolTableKey,
                     symbolName: importedName,
@@ -126175,16 +126176,16 @@ var ts;
                     moduleFile: moduleFile,
                     moduleFileName: moduleFile === null || moduleFile === void 0 ? void 0 : moduleFile.fileName,
                     exportKind: exportKind,
-                    targetFlags: ts.skipAlias(symbol, checker).flags,
+                    targetFlags: target.flags,
                     isFromPackageJson: isFromPackageJson,
                     symbol: storedSymbol,
                     moduleSymbol: storedModuleSymbol,
                 });
             },
-            get: function (importingFile, importedName, symbol, moduleName, checker) {
+            get: function (importingFile, key) {
                 if (importingFile !== usableByFileName)
                     return;
-                var result = exportInfo.get(key(importedName, symbol, moduleName, checker));
+                var result = exportInfo.get(key);
                 return result === null || result === void 0 ? void 0 : result.map(rehydrateCachedInfo);
             },
             forEach: function (importingFile, action) {
@@ -126192,7 +126193,7 @@ var ts;
                     return;
                 exportInfo.forEach(function (info, key) {
                     var _a = parseKey(key), symbolName = _a.symbolName, ambientModuleName = _a.ambientModuleName;
-                    action(info.map(rehydrateCachedInfo), symbolName, !!ambientModuleName);
+                    action(info.map(rehydrateCachedInfo), symbolName, !!ambientModuleName, key);
                 });
             },
             releaseSymbols: function () {
@@ -126257,26 +126258,16 @@ var ts;
                 isFromPackageJson: isFromPackageJson,
             };
         }
-        function key(importedName, symbol, moduleName, checker) {
-            var unquoted = ts.stripQuotes(moduleName);
-            var moduleKey = ts.isExternalModuleNameRelative(unquoted) ? "/" : unquoted;
-            var target = ts.skipAlias(symbol, checker);
-            return importedName + "|" + createSymbolKey(target) + "|" + moduleKey;
+        function key(importedName, symbol, ambientModuleName, checker) {
+            var moduleKey = ambientModuleName || "";
+            return importedName + "|" + ts.getSymbolId(ts.skipAlias(symbol, checker)) + "|" + moduleKey;
         }
         function parseKey(key) {
             var symbolName = key.substring(0, key.indexOf("|"));
             var moduleKey = key.substring(key.lastIndexOf("|") + 1);
-            var ambientModuleName = moduleKey === "/" ? undefined : moduleKey;
+            var ambientModuleName = moduleKey === "" ? undefined : moduleKey;
             return { symbolName: symbolName, ambientModuleName: ambientModuleName };
         }
-        function createSymbolKey(symbol) {
-            var key = symbol.name;
-            while (symbol.parent) {
-                key += "," + symbol.parent.name;
-                symbol = symbol.parent;
-            }
-            return key;
-        }
         function fileIsGlobalOnly(file) {
             return !file.commonJsModuleIndicator && !file.externalModuleIndicator && !file.moduleAugmentations && !file.ambientModuleNames;
         }
@@ -128621,20 +128612,19 @@ var ts;
             }
         }
         Completions.getCompletionsAtPosition = getCompletionsAtPosition;
+        function completionEntryDataIsResolved(data) {
+            return !!(data === null || data === void 0 ? void 0 : data.moduleSpecifier);
+        }
         function continuePreviousIncompleteResponse(cache, file, location, program, host, preferences, cancellationToken) {
-            var _a;
             var previousResponse = cache.get();
             if (!previousResponse)
                 return undefined;
             var lowerCaseTokenText = location.text.toLowerCase();
             var exportMap = ts.getExportInfoMap(file, host, program, cancellationToken);
-            var checker = program.getTypeChecker();
-            var autoImportProvider = (_a = host.getPackageJsonAutoImportProvider) === null || _a === void 0 ? void 0 : _a.call(host);
-            var autoImportProviderChecker = autoImportProvider === null || autoImportProvider === void 0 ? void 0 : autoImportProvider.getTypeChecker();
             var newEntries = resolvingModuleSpecifiers("continuePreviousIncompleteResponse", host, program, file, preferences, 
             /*isForImportStatementCompletion*/ false, function (context) {
                 var entries = ts.mapDefined(previousResponse.entries, function (entry) {
-                    if (!entry.hasAction || !entry.source || !entry.data || entry.data.moduleSpecifier) {
+                    if (!entry.hasAction || !entry.source || !entry.data || completionEntryDataIsResolved(entry.data)) {
                         // Not an auto import or already resolved; keep as is
                         return entry;
                     }
@@ -128642,8 +128632,8 @@ var ts;
                         // No longer matches typed characters; filter out
                         return undefined;
                     }
-                    var _a = ts.Debug.checkDefined(getAutoImportSymbolFromCompletionEntryData(entry.name, entry.data, program, host)), symbol = _a.symbol, origin = _a.origin;
-                    var info = exportMap.get(file.path, entry.name, symbol, origin.moduleSymbol.name, origin.isFromPackageJson ? autoImportProviderChecker : checker);
+                    var origin = ts.Debug.checkDefined(getAutoImportSymbolFromCompletionEntryData(entry.name, entry.data, program, host)).origin;
+                    var info = exportMap.get(file.path, entry.data.exportMapKey);
                     var result = info && context.tryResolve(info, !ts.isExternalModuleNameRelative(ts.stripQuotes(origin.moduleSymbol.name)));
                     if (!result)
                         return entry;
@@ -128944,13 +128934,54 @@ var ts;
             return text.replace(/\$/gm, "\\$");
         }
         function originToCompletionEntryData(origin) {
-            return {
+            var ambientModuleName = origin.fileName ? undefined : ts.stripQuotes(origin.moduleSymbol.name);
+            var isPackageJsonImport = origin.isFromPackageJson ? true : undefined;
+            if (originIsResolvedExport(origin)) {
+                var resolvedData = {
+                    exportName: origin.exportName,
+                    moduleSpecifier: origin.moduleSpecifier,
+                    ambientModuleName: ambientModuleName,
+                    fileName: origin.fileName,
+                    isPackageJsonImport: isPackageJsonImport,
+                };
+                return resolvedData;
+            }
+            var unresolvedData = {
                 exportName: origin.exportName,
+                exportMapKey: origin.exportMapKey,
                 fileName: origin.fileName,
                 ambientModuleName: origin.fileName ? undefined : ts.stripQuotes(origin.moduleSymbol.name),
                 isPackageJsonImport: origin.isFromPackageJson ? true : undefined,
-                moduleSpecifier: originIsResolvedExport(origin) ? origin.moduleSpecifier : undefined,
             };
+            return unresolvedData;
+        }
+        function completionEntryDataToSymbolOriginInfo(data, completionName, moduleSymbol) {
+            var isDefaultExport = data.exportName === "default" /* Default */;
+            var isFromPackageJson = !!data.isPackageJsonImport;
+            if (completionEntryDataIsResolved(data)) {
+                var resolvedOrigin = {
+                    kind: 32 /* ResolvedExport */,
+                    exportName: data.exportName,
+                    moduleSpecifier: data.moduleSpecifier,
+                    symbolName: completionName,
+                    fileName: data.fileName,
+                    moduleSymbol: moduleSymbol,
+                    isDefaultExport: isDefaultExport,
+                    isFromPackageJson: isFromPackageJson,
+                };
+                return resolvedOrigin;
+            }
+            var unresolvedOrigin = {
+                kind: 4 /* Export */,
+                exportName: data.exportName,
+                exportMapKey: data.exportMapKey,
+                symbolName: completionName,
+                fileName: data.fileName,
+                moduleSymbol: moduleSymbol,
+                isDefaultExport: isDefaultExport,
+                isFromPackageJson: isFromPackageJson,
+            };
+            return unresolvedOrigin;
         }
         function getInsertTextAndReplacementSpanForImportCompletion(name, importCompletionNode, contextToken, origin, useSemicolons, options, preferences) {
             var _a, _b, _c;
@@ -129726,6 +129757,7 @@ var ts;
                 }
             }
             function addPropertySymbol(symbol, insertAwait, insertQuestionDot) {
+                var _a;
                 // For a computed property with an accessible name like `Symbol.iterator`,
                 // we'll add a completion for the *name* `Symbol` instead of for the property.
                 // If this is e.g. [Symbol.iterator], add a completion for `Symbol`.
@@ -129739,19 +129771,33 @@ var ts;
                         var index = symbols.length;
                         symbols.push(firstAccessibleSymbol);
                         var moduleSymbol = firstAccessibleSymbol.parent;
-                        if (!moduleSymbol || !ts.isExternalModuleSymbol(moduleSymbol)) {
+                        if (!moduleSymbol ||
+                            !ts.isExternalModuleSymbol(moduleSymbol) ||
+                            typeChecker.tryGetMemberInModuleExportsAndProperties(firstAccessibleSymbol.name, moduleSymbol) !== firstAccessibleSymbol) {
                             symbolToOriginInfoMap[index] = { kind: getNullableSymbolOriginInfoKind(2 /* SymbolMemberNoExport */) };
                         }
                         else {
-                            var origin = {
-                                kind: getNullableSymbolOriginInfoKind(6 /* SymbolMemberExport */),
-                                moduleSymbol: moduleSymbol,
-                                isDefaultExport: false,
-                                symbolName: firstAccessibleSymbol.name,
-                                exportName: firstAccessibleSymbol.name,
-                                fileName: ts.isExternalModuleNameRelative(ts.stripQuotes(moduleSymbol.name)) ? ts.cast(moduleSymbol.valueDeclaration, ts.isSourceFile).fileName : undefined,
-                            };
-                            symbolToOriginInfoMap[index] = origin;
+                            var fileName = ts.isExternalModuleNameRelative(ts.stripQuotes(moduleSymbol.name)) ? (_a = ts.getSourceFileOfModule(moduleSymbol)) === null || _a === void 0 ? void 0 : _a.fileName : undefined;
+                            var moduleSpecifier = (ts.codefix.getModuleSpecifierForBestExportInfo([{
+                                    exportKind: 0 /* Named */,
+                                    moduleFileName: fileName,
+                                    isFromPackageJson: false,
+                                    moduleSymbol: moduleSymbol,
+                                    symbol: firstAccessibleSymbol,
+                                    targetFlags: ts.skipAlias(firstAccessibleSymbol, typeChecker).flags,
+                                }], sourceFile, program, host, preferences) || {}).moduleSpecifier;
+                            if (moduleSpecifier) {
+                                var origin = {
+                                    kind: getNullableSymbolOriginInfoKind(6 /* SymbolMemberExport */),
+                                    moduleSymbol: moduleSymbol,
+                                    isDefaultExport: false,
+                                    symbolName: firstAccessibleSymbol.name,
+                                    exportName: firstAccessibleSymbol.name,
+                                    fileName: fileName,
+                                    moduleSpecifier: moduleSpecifier,
+                                };
+                                symbolToOriginInfoMap[index] = origin;
+                            }
                         }
                     }
                     else if (preferences.includeCompletionsWithInsertText) {
@@ -129987,7 +130033,7 @@ var ts;
                 var packageJsonAutoImportProvider = (_b = host.getPackageJsonAutoImportProvider) === null || _b === void 0 ? void 0 : _b.call(host);
                 var packageJsonFilter = detailsEntryId ? undefined : ts.createPackageJsonImportFilter(sourceFile, preferences, host);
                 resolvingModuleSpecifiers("collectAutoImports", host, program, sourceFile, preferences, !!importCompletionNode, function (context) {
-                    exportInfo.forEach(sourceFile.path, function (info, symbolName, isFromAmbientModule) {
+                    exportInfo.forEach(sourceFile.path, function (info, symbolName, isFromAmbientModule, exportMapKey) {
                         if (!ts.isIdentifierText(symbolName, ts.getEmitScriptTarget(host.getCompilationSettings())))
                             return;
                         if (!detailsEntryId && ts.isStringANonContextualKeyword(symbolName))
@@ -130012,6 +130058,7 @@ var ts;
                                 kind: moduleSpecifier ? 32 /* ResolvedExport */ : 4 /* Export */,
                                 moduleSpecifier: moduleSpecifier,
                                 symbolName: symbolName,
+                                exportMapKey: exportMapKey,
                                 exportName: exportInfo_1.exportKind === 2 /* ExportEquals */ ? "export=" /* ExportEquals */ : exportInfo_1.symbol.name,
                                 fileName: exportInfo_1.moduleFileName,
                                 isDefaultExport: isDefaultExport,
@@ -130835,18 +130882,7 @@ var ts;
                 return undefined;
             var isDefaultExport = data.exportName === "default" /* Default */;
             symbol = isDefaultExport && ts.getLocalSymbolForExportDefault(symbol) || symbol;
-            return {
-                symbol: symbol,
-                origin: {
-                    kind: data.moduleSpecifier ? 32 /* ResolvedExport */ : 4 /* Export */,
-                    moduleSymbol: moduleSymbol,
-                    symbolName: name,
-                    isDefaultExport: isDefaultExport,
-                    exportName: data.exportName,
-                    fileName: data.fileName,
-                    isFromPackageJson: !!data.isPackageJsonImport,
-                }
-            };
+            return { symbol: symbol, origin: completionEntryDataToSymbolOriginInfo(data, name, moduleSymbol) };
         }
         function getCompletionEntryDisplayNameForSymbol(symbol, target, origin, kind, jsxIdentifierExpected) {
             var name = originIncludesSymbolName(origin) ? origin.symbolName : symbol.name;

package/lib/typescriptServices.d.ts

@@ -6367,23 +6367,28 @@ declare namespace ts {
         isIncomplete?: true;
         entries: CompletionEntry[];
     }
-    interface CompletionEntryData {
-        /** The file name declaring the export's module symbol, if it was an external module */
-        fileName?: string;
-        /** The module name (with quotes stripped) of the export's module symbol, if it was an ambient module */
-        ambientModuleName?: string;
-        /** True if the export was found in the package.json AutoImportProvider */
-        isPackageJsonImport?: true;
+    interface CompletionEntryDataAutoImport {
         /**
          * The name of the property or export in the module's symbol table. Differs from the completion name
          * in the case of InternalSymbolName.ExportEquals and InternalSymbolName.Default.
          */
         exportName: string;
-        /**
-         * Set for auto imports with eagerly resolved module specifiers.
-         */
         moduleSpecifier?: string;
+        /** The file name declaring the export's module symbol, if it was an external module */
+        fileName?: string;
+        /** The module name (with quotes stripped) of the export's module symbol, if it was an ambient module */
+        ambientModuleName?: string;
+        /** True if the export was found in the package.json AutoImportProvider */
+        isPackageJsonImport?: true;
+    }
+    interface CompletionEntryDataUnresolved extends CompletionEntryDataAutoImport {
+        /** The key in the `ExportMapCache` where the completion entry's `SymbolExportInfo[]` is found */
+        exportMapKey: string;
+    }
+    interface CompletionEntryDataResolved extends CompletionEntryDataAutoImport {
+        moduleSpecifier: string;
     }
+    type CompletionEntryData = CompletionEntryDataUnresolved | CompletionEntryDataResolved;
     interface CompletionEntry {
         name: string;
         kind: ScriptElementKind;

package/lib/typescriptServices.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.20211008";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211009";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -126163,11 +126163,12 @@ var ts;
                     : ts.getNameForExportedSymbol(namedSymbol, scriptTarget);
                 var moduleName = ts.stripQuotes(moduleSymbol.name);
                 var id = exportInfoId++;
+                var target = ts.skipAlias(symbol, checker);
                 var storedSymbol = symbol.flags & 33554432 /* Transient */ ? undefined : symbol;
                 var storedModuleSymbol = moduleSymbol.flags & 33554432 /* Transient */ ? undefined : moduleSymbol;
                 if (!storedSymbol || !storedModuleSymbol)
                     symbols.set(id, [symbol, moduleSymbol]);
-                exportInfo.add(key(importedName, symbol, moduleName, checker), {
+                exportInfo.add(key(importedName, symbol, ts.isExternalModuleNameRelative(moduleName) ? undefined : moduleName, checker), {
                     id: id,
                     symbolTableKey: symbolTableKey,
                     symbolName: importedName,
@@ -126175,16 +126176,16 @@ var ts;
                     moduleFile: moduleFile,
                     moduleFileName: moduleFile === null || moduleFile === void 0 ? void 0 : moduleFile.fileName,
                     exportKind: exportKind,
-                    targetFlags: ts.skipAlias(symbol, checker).flags,
+                    targetFlags: target.flags,
                     isFromPackageJson: isFromPackageJson,
                     symbol: storedSymbol,
                     moduleSymbol: storedModuleSymbol,
                 });
             },
-            get: function (importingFile, importedName, symbol, moduleName, checker) {
+            get: function (importingFile, key) {
                 if (importingFile !== usableByFileName)
                     return;
-                var result = exportInfo.get(key(importedName, symbol, moduleName, checker));
+                var result = exportInfo.get(key);
                 return result === null || result === void 0 ? void 0 : result.map(rehydrateCachedInfo);
             },
             forEach: function (importingFile, action) {
@@ -126192,7 +126193,7 @@ var ts;
                     return;
                 exportInfo.forEach(function (info, key) {
                     var _a = parseKey(key), symbolName = _a.symbolName, ambientModuleName = _a.ambientModuleName;
-                    action(info.map(rehydrateCachedInfo), symbolName, !!ambientModuleName);
+                    action(info.map(rehydrateCachedInfo), symbolName, !!ambientModuleName, key);
                 });
             },
             releaseSymbols: function () {
@@ -126257,26 +126258,16 @@ var ts;
                 isFromPackageJson: isFromPackageJson,
             };
         }
-        function key(importedName, symbol, moduleName, checker) {
-            var unquoted = ts.stripQuotes(moduleName);
-            var moduleKey = ts.isExternalModuleNameRelative(unquoted) ? "/" : unquoted;
-            var target = ts.skipAlias(symbol, checker);
-            return importedName + "|" + createSymbolKey(target) + "|" + moduleKey;
+        function key(importedName, symbol, ambientModuleName, checker) {
+            var moduleKey = ambientModuleName || "";
+            return importedName + "|" + ts.getSymbolId(ts.skipAlias(symbol, checker)) + "|" + moduleKey;
         }
         function parseKey(key) {
             var symbolName = key.substring(0, key.indexOf("|"));
             var moduleKey = key.substring(key.lastIndexOf("|") + 1);
-            var ambientModuleName = moduleKey === "/" ? undefined : moduleKey;
+            var ambientModuleName = moduleKey === "" ? undefined : moduleKey;
             return { symbolName: symbolName, ambientModuleName: ambientModuleName };
         }
-        function createSymbolKey(symbol) {
-            var key = symbol.name;
-            while (symbol.parent) {
-                key += "," + symbol.parent.name;
-                symbol = symbol.parent;
-            }
-            return key;
-        }
         function fileIsGlobalOnly(file) {
             return !file.commonJsModuleIndicator && !file.externalModuleIndicator && !file.moduleAugmentations && !file.ambientModuleNames;
         }
@@ -128621,20 +128612,19 @@ var ts;
             }
         }
         Completions.getCompletionsAtPosition = getCompletionsAtPosition;
+        function completionEntryDataIsResolved(data) {
+            return !!(data === null || data === void 0 ? void 0 : data.moduleSpecifier);
+        }
         function continuePreviousIncompleteResponse(cache, file, location, program, host, preferences, cancellationToken) {
-            var _a;
             var previousResponse = cache.get();
             if (!previousResponse)
                 return undefined;
             var lowerCaseTokenText = location.text.toLowerCase();
             var exportMap = ts.getExportInfoMap(file, host, program, cancellationToken);
-            var checker = program.getTypeChecker();
-            var autoImportProvider = (_a = host.getPackageJsonAutoImportProvider) === null || _a === void 0 ? void 0 : _a.call(host);
-            var autoImportProviderChecker = autoImportProvider === null || autoImportProvider === void 0 ? void 0 : autoImportProvider.getTypeChecker();
             var newEntries = resolvingModuleSpecifiers("continuePreviousIncompleteResponse", host, program, file, preferences, 
             /*isForImportStatementCompletion*/ false, function (context) {
                 var entries = ts.mapDefined(previousResponse.entries, function (entry) {
-                    if (!entry.hasAction || !entry.source || !entry.data || entry.data.moduleSpecifier) {
+                    if (!entry.hasAction || !entry.source || !entry.data || completionEntryDataIsResolved(entry.data)) {
                         // Not an auto import or already resolved; keep as is
                         return entry;
                     }
@@ -128642,8 +128632,8 @@ var ts;
                         // No longer matches typed characters; filter out
                         return undefined;
                     }
-                    var _a = ts.Debug.checkDefined(getAutoImportSymbolFromCompletionEntryData(entry.name, entry.data, program, host)), symbol = _a.symbol, origin = _a.origin;
-                    var info = exportMap.get(file.path, entry.name, symbol, origin.moduleSymbol.name, origin.isFromPackageJson ? autoImportProviderChecker : checker);
+                    var origin = ts.Debug.checkDefined(getAutoImportSymbolFromCompletionEntryData(entry.name, entry.data, program, host)).origin;
+                    var info = exportMap.get(file.path, entry.data.exportMapKey);
                     var result = info && context.tryResolve(info, !ts.isExternalModuleNameRelative(ts.stripQuotes(origin.moduleSymbol.name)));
                     if (!result)
                         return entry;
@@ -128944,13 +128934,54 @@ var ts;
             return text.replace(/\$/gm, "\\$");
         }
         function originToCompletionEntryData(origin) {
-            return {
+            var ambientModuleName = origin.fileName ? undefined : ts.stripQuotes(origin.moduleSymbol.name);
+            var isPackageJsonImport = origin.isFromPackageJson ? true : undefined;
+            if (originIsResolvedExport(origin)) {
+                var resolvedData = {
+                    exportName: origin.exportName,
+                    moduleSpecifier: origin.moduleSpecifier,
+                    ambientModuleName: ambientModuleName,
+                    fileName: origin.fileName,
+                    isPackageJsonImport: isPackageJsonImport,
+                };
+                return resolvedData;
+            }
+            var unresolvedData = {
                 exportName: origin.exportName,
+                exportMapKey: origin.exportMapKey,
                 fileName: origin.fileName,
                 ambientModuleName: origin.fileName ? undefined : ts.stripQuotes(origin.moduleSymbol.name),
                 isPackageJsonImport: origin.isFromPackageJson ? true : undefined,
-                moduleSpecifier: originIsResolvedExport(origin) ? origin.moduleSpecifier : undefined,
             };
+            return unresolvedData;
+        }
+        function completionEntryDataToSymbolOriginInfo(data, completionName, moduleSymbol) {
+            var isDefaultExport = data.exportName === "default" /* Default */;
+            var isFromPackageJson = !!data.isPackageJsonImport;
+            if (completionEntryDataIsResolved(data)) {
+                var resolvedOrigin = {
+                    kind: 32 /* ResolvedExport */,
+                    exportName: data.exportName,
+                    moduleSpecifier: data.moduleSpecifier,
+                    symbolName: completionName,
+                    fileName: data.fileName,
+                    moduleSymbol: moduleSymbol,
+                    isDefaultExport: isDefaultExport,
+                    isFromPackageJson: isFromPackageJson,
+                };
+                return resolvedOrigin;
+            }
+            var unresolvedOrigin = {
+                kind: 4 /* Export */,
+                exportName: data.exportName,
+                exportMapKey: data.exportMapKey,
+                symbolName: completionName,
+                fileName: data.fileName,
+                moduleSymbol: moduleSymbol,
+                isDefaultExport: isDefaultExport,
+                isFromPackageJson: isFromPackageJson,
+            };
+            return unresolvedOrigin;
         }
         function getInsertTextAndReplacementSpanForImportCompletion(name, importCompletionNode, contextToken, origin, useSemicolons, options, preferences) {
             var _a, _b, _c;
@@ -129726,6 +129757,7 @@ var ts;
                 }
             }
             function addPropertySymbol(symbol, insertAwait, insertQuestionDot) {
+                var _a;
                 // For a computed property with an accessible name like `Symbol.iterator`,
                 // we'll add a completion for the *name* `Symbol` instead of for the property.
                 // If this is e.g. [Symbol.iterator], add a completion for `Symbol`.
@@ -129739,19 +129771,33 @@ var ts;
                         var index = symbols.length;
                         symbols.push(firstAccessibleSymbol);
                         var moduleSymbol = firstAccessibleSymbol.parent;
-                        if (!moduleSymbol || !ts.isExternalModuleSymbol(moduleSymbol)) {
+                        if (!moduleSymbol ||
+                            !ts.isExternalModuleSymbol(moduleSymbol) ||
+                            typeChecker.tryGetMemberInModuleExportsAndProperties(firstAccessibleSymbol.name, moduleSymbol) !== firstAccessibleSymbol) {
                             symbolToOriginInfoMap[index] = { kind: getNullableSymbolOriginInfoKind(2 /* SymbolMemberNoExport */) };
                         }
                         else {
-                            var origin = {
-                                kind: getNullableSymbolOriginInfoKind(6 /* SymbolMemberExport */),
-                                moduleSymbol: moduleSymbol,
-                                isDefaultExport: false,
-                                symbolName: firstAccessibleSymbol.name,
-                                exportName: firstAccessibleSymbol.name,
-                                fileName: ts.isExternalModuleNameRelative(ts.stripQuotes(moduleSymbol.name)) ? ts.cast(moduleSymbol.valueDeclaration, ts.isSourceFile).fileName : undefined,
-                            };
-                            symbolToOriginInfoMap[index] = origin;
+                            var fileName = ts.isExternalModuleNameRelative(ts.stripQuotes(moduleSymbol.name)) ? (_a = ts.getSourceFileOfModule(moduleSymbol)) === null || _a === void 0 ? void 0 : _a.fileName : undefined;
+                            var moduleSpecifier = (ts.codefix.getModuleSpecifierForBestExportInfo([{
+                                    exportKind: 0 /* Named */,
+                                    moduleFileName: fileName,
+                                    isFromPackageJson: false,
+                                    moduleSymbol: moduleSymbol,
+                                    symbol: firstAccessibleSymbol,
+                                    targetFlags: ts.skipAlias(firstAccessibleSymbol, typeChecker).flags,
+                                }], sourceFile, program, host, preferences) || {}).moduleSpecifier;
+                            if (moduleSpecifier) {
+                                var origin = {
+                                    kind: getNullableSymbolOriginInfoKind(6 /* SymbolMemberExport */),
+                                    moduleSymbol: moduleSymbol,
+                                    isDefaultExport: false,
+                                    symbolName: firstAccessibleSymbol.name,
+                                    exportName: firstAccessibleSymbol.name,
+                                    fileName: fileName,
+                                    moduleSpecifier: moduleSpecifier,
+                                };
+                                symbolToOriginInfoMap[index] = origin;
+                            }
                         }
                     }
                     else if (preferences.includeCompletionsWithInsertText) {
@@ -129987,7 +130033,7 @@ var ts;
                 var packageJsonAutoImportProvider = (_b = host.getPackageJsonAutoImportProvider) === null || _b === void 0 ? void 0 : _b.call(host);
                 var packageJsonFilter = detailsEntryId ? undefined : ts.createPackageJsonImportFilter(sourceFile, preferences, host);
                 resolvingModuleSpecifiers("collectAutoImports", host, program, sourceFile, preferences, !!importCompletionNode, function (context) {
-                    exportInfo.forEach(sourceFile.path, function (info, symbolName, isFromAmbientModule) {
+                    exportInfo.forEach(sourceFile.path, function (info, symbolName, isFromAmbientModule, exportMapKey) {
                         if (!ts.isIdentifierText(symbolName, ts.getEmitScriptTarget(host.getCompilationSettings())))
                             return;
                         if (!detailsEntryId && ts.isStringANonContextualKeyword(symbolName))
@@ -130012,6 +130058,7 @@ var ts;
                                 kind: moduleSpecifier ? 32 /* ResolvedExport */ : 4 /* Export */,
                                 moduleSpecifier: moduleSpecifier,
                                 symbolName: symbolName,
+                                exportMapKey: exportMapKey,
                                 exportName: exportInfo_1.exportKind === 2 /* ExportEquals */ ? "export=" /* ExportEquals */ : exportInfo_1.symbol.name,
                                 fileName: exportInfo_1.moduleFileName,
                                 isDefaultExport: isDefaultExport,
@@ -130835,18 +130882,7 @@ var ts;
                 return undefined;
             var isDefaultExport = data.exportName === "default" /* Default */;
             symbol = isDefaultExport && ts.getLocalSymbolForExportDefault(symbol) || symbol;
-            return {
-                symbol: symbol,
-                origin: {
-                    kind: data.moduleSpecifier ? 32 /* ResolvedExport */ : 4 /* Export */,
-                    moduleSymbol: moduleSymbol,
-                    symbolName: name,
-                    isDefaultExport: isDefaultExport,
-                    exportName: data.exportName,
-                    fileName: data.fileName,
-                    isFromPackageJson: !!data.isPackageJsonImport,
-                }
-            };
+            return { symbol: symbol, origin: completionEntryDataToSymbolOriginInfo(data, name, moduleSymbol) };
         }
         function getCompletionEntryDisplayNameForSymbol(symbol, target, origin, kind, jsxIdentifierExpected) {
             var name = originIncludesSymbolName(origin) ? origin.symbolName : symbol.name;

package/lib/typingsInstaller.js

@@ -89,7 +89,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.20211008";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211009";
     /* @internal */
     var Comparison;
     (function (Comparison) {

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "4.5.0-dev.20211008",
+    "version": "4.5.0-dev.20211009",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [