typescript 4.5.0-dev.20211005 → 4.5.0-dev.20211009

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.20211005";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211009";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -8868,6 +8868,7 @@ var ts;
         Type_0_is_not_assignable_to_type_1_Did_you_mean_2: diag(2820, ts.DiagnosticCategory.Error, "Type_0_is_not_assignable_to_type_1_Did_you_mean_2_2820", "Type '{0}' is not assignable to type '{1}'. Did you mean '{2}'?"),
         Import_assertions_are_only_supported_when_the_module_option_is_set_to_esnext: diag(2821, ts.DiagnosticCategory.Error, "Import_assertions_are_only_supported_when_the_module_option_is_set_to_esnext_2821", "Import assertions are only supported when the '--module' option is set to 'esnext'."),
         Import_assertions_cannot_be_used_with_type_only_imports_or_exports: diag(2822, ts.DiagnosticCategory.Error, "Import_assertions_cannot_be_used_with_type_only_imports_or_exports_2822", "Import assertions cannot be used with type-only imports or exports."),
+        Cannot_find_namespace_0_Did_you_mean_1: diag(2833, ts.DiagnosticCategory.Error, "Cannot_find_namespace_0_Did_you_mean_1_2833", "Cannot find namespace '{0}'. Did you mean '{1}'?"),
         Import_declaration_0_is_using_private_name_1: diag(4000, ts.DiagnosticCategory.Error, "Import_declaration_0_is_using_private_name_1_4000", "Import declaration '{0}' is using private name '{1}'."),
         Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: diag(4002, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", "Type parameter '{0}' of exported class has or is using private name '{1}'."),
         Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: diag(4004, ts.DiagnosticCategory.Error, "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", "Type parameter '{0}' of exported interface has or is using private name '{1}'."),
@@ -20307,10 +20308,14 @@ var ts;
         var ext = fileName.substr(fileName.lastIndexOf("."));
         switch (ext.toLowerCase()) {
             case ".js" /* Js */:
+            case ".cjs" /* Cjs */:
+            case ".mjs" /* Mjs */:
                 return 1 /* JS */;
             case ".jsx" /* Jsx */:
                 return 2 /* JSX */;
             case ".ts" /* Ts */:
+            case ".cts" /* Cts */:
+            case ".mts" /* Mts */:
                 return 3 /* TS */;
             case ".tsx" /* Tsx */:
                 return 4 /* TSX */;
@@ -38885,6 +38890,8 @@ var ts;
             type: new ts.Map(ts.getEntries({
                 node: ts.ModuleResolutionKind.NodeJs,
                 classic: ts.ModuleResolutionKind.Classic,
+                node12: ts.ModuleResolutionKind.Node12,
+                nodenext: ts.ModuleResolutionKind.NodeNext,
             })),
             affectsModuleResolution: true,
             paramType: ts.Diagnostics.STRATEGY,
@@ -42687,11 +42694,15 @@ var ts;
         if (!scope || !scope.packageJsonContent.exports) {
             return undefined;
         }
+        if (typeof scope.packageJsonContent.name !== "string") {
+            return undefined;
+        }
         var parts = ts.getPathComponents(moduleName); // unrooted paths should have `""` as their 0th entry
-        if (scope.packageJsonContent.name !== parts[1]) {
+        var nameParts = ts.getPathComponents(scope.packageJsonContent.name);
+        if (!ts.every(nameParts, function (p, i) { return parts[i] === p; })) {
             return undefined;
         }
-        var trailingParts = parts.slice(2);
+        var trailingParts = parts.slice(nameParts.length);
         return loadModuleFromExports(scope, extensions, !ts.length(trailingParts) ? "." : "." + ts.directorySeparator + trailingParts.join(ts.directorySeparator), state, cache, redirectedReference);
     }
     function loadModuleFromExports(scope, extensions, subpath, state, cache, redirectedReference) {
@@ -48169,11 +48180,11 @@ var ts;
          *
          * @param isUse If true, this will count towards --noUnusedLocals / --noUnusedParameters.
          */
-        function resolveName(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, issueSuggestions) {
+        function resolveName(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals) {
             if (excludeGlobals === void 0) { excludeGlobals = false; }
-            return resolveNameHelper(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, getSymbol, issueSuggestions);
+            return resolveNameHelper(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, getSymbol);
         }
-        function resolveNameHelper(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, lookup, issueSuggestions) {
+        function resolveNameHelper(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, lookup) {
             var _a, _b, _c;
             var originalLocation = location; // needed for did-you-mean error reporting, which gathers candidates starting from the original location
             var result;
@@ -48500,7 +48511,7 @@ var ts;
                             !checkAndReportErrorForUsingNamespaceModuleAsValue(errorLocation, name, meaning) &&
                             !checkAndReportErrorForUsingValueAsType(errorLocation, name, meaning)) {
                         var suggestion = void 0;
-                        if (issueSuggestions && suggestionCount < maximumSuggestionCount) {
+                        if (suggestionCount < maximumSuggestionCount) {
                             suggestion = getSuggestedSymbolForNonexistentSymbol(originalLocation, name, meaning);
                             var isGlobalScopeAugmentationDeclaration = (suggestion === null || suggestion === void 0 ? void 0 : suggestion.valueDeclaration) && ts.isAmbientModule(suggestion.valueDeclaration) && ts.isGlobalScopeAugmentation(suggestion.valueDeclaration);
                             if (isGlobalScopeAugmentationDeclaration) {
@@ -48509,7 +48520,9 @@ var ts;
                             if (suggestion) {
                                 var suggestionName = symbolToString(suggestion);
                                 var isUncheckedJS = isUncheckedJSSuggestion(originalLocation, suggestion, /*excludeClasses*/ false);
-                                var message = isUncheckedJS ? ts.Diagnostics.Could_not_find_name_0_Did_you_mean_1 : ts.Diagnostics.Cannot_find_name_0_Did_you_mean_1;
+                                var message = meaning === 1920 /* Namespace */ || nameArg && typeof nameArg !== "string" && ts.nodeIsSynthesized(nameArg) ? ts.Diagnostics.Cannot_find_namespace_0_Did_you_mean_1
+                                    : isUncheckedJS ? ts.Diagnostics.Could_not_find_name_0_Did_you_mean_1
+                                        : ts.Diagnostics.Cannot_find_name_0_Did_you_mean_1;
                                 var diagnostic = createError(errorLocation, message, diagnosticName(nameArg), suggestionName);
                                 addErrorOrSuggestion(!isUncheckedJS, diagnostic);
                                 if (suggestion.valueDeclaration) {
@@ -49503,7 +49516,7 @@ var ts;
             if (name.kind === 79 /* Identifier */) {
                 var message = meaning === namespaceMeaning || ts.nodeIsSynthesized(name) ? ts.Diagnostics.Cannot_find_namespace_0 : getCannotFindNameDiagnosticForName(ts.getFirstIdentifier(name));
                 var symbolFromJSPrototype = ts.isInJSFile(name) && !ts.nodeIsSynthesized(name) ? resolveEntityNameFromAssignmentDeclaration(name, meaning) : undefined;
-                symbol = getMergedSymbol(resolveName(location || name, name.escapedText, meaning, ignoreErrors || symbolFromJSPrototype ? undefined : message, name, /*isUse*/ true));
+                symbol = getMergedSymbol(resolveName(location || name, name.escapedText, meaning, ignoreErrors || symbolFromJSPrototype ? undefined : message, name, /*isUse*/ true, false));
                 if (!symbol) {
                     return getMergedSymbol(symbolFromJSPrototype);
                 }
@@ -67281,8 +67294,7 @@ var ts;
             if (!links.resolvedSymbol) {
                 links.resolvedSymbol = !ts.nodeIsMissing(node) &&
                     resolveName(node, node.escapedText, 111551 /* Value */ | 1048576 /* ExportValue */, getCannotFindNameDiagnosticForName(node), node, !ts.isWriteOnlyAccess(node), 
-                    /*excludeGlobals*/ false, 
-                    /*issueSuggestions*/ true) || unknownSymbol;
+                    /*excludeGlobals*/ false) || unknownSymbol;
             }
             return links.resolvedSymbol;
         }
@@ -72773,7 +72785,7 @@ var ts;
             if (relatedInfo) {
                 ts.addRelatedInfo(resultDiagnostic, relatedInfo);
             }
-            addErrorOrSuggestion(!isUncheckedJS, resultDiagnostic);
+            addErrorOrSuggestion(!isUncheckedJS || errorInfo.code !== ts.Diagnostics.Property_0_may_not_exist_on_type_1_Did_you_mean_2.code, resultDiagnostic);
         }
         function containerSeemsToBeEmptyDomElement(containingType) {
             return (compilerOptions.lib && !compilerOptions.lib.includes("dom")) &&
@@ -72846,7 +72858,19 @@ var ts;
                 // Sometimes the symbol is found when location is a return type of a function: `typeof x` and `x` is declared in the body of the function
                 // So the table *contains* `x` but `x` isn't actually in scope.
                 // However, resolveNameHelper will continue and call this callback again, so we'll eventually get a correct suggestion.
-                return symbol || getSpellingSuggestionForName(ts.unescapeLeadingUnderscores(name), ts.arrayFrom(symbols.values()), meaning);
+                if (symbol)
+                    return symbol;
+                var candidates;
+                if (symbols === globals) {
+                    var primitives = ts.mapDefined(["string", "number", "boolean", "object", "bigint", "symbol"], function (s) { return symbols.has((s.charAt(0).toUpperCase() + s.slice(1)))
+                        ? createSymbol(524288 /* TypeAlias */, s)
+                        : undefined; });
+                    candidates = primitives.concat(ts.arrayFrom(symbols.values()));
+                }
+                else {
+                    candidates = ts.arrayFrom(symbols.values());
+                }
+                return getSpellingSuggestionForName(ts.unescapeLeadingUnderscores(name), candidates, meaning);
             });
             return result;
         }
@@ -121288,11 +121312,11 @@ var ts;
             (_b = state.typeReferenceDirectiveResolutionCache) === null || _b === void 0 ? void 0 : _b.update(config.options);
             // Create program
             program = host.createProgram(config.fileNames, config.options, compilerHost, getOldProgram(state, projectPath, config), ts.getConfigFileParsingDiagnostics(config), config.projectReferences);
-            state.lastCachedPackageJsonLookups.set(projectPath, state.moduleResolutionCache && ts.map(state.moduleResolutionCache.getPackageJsonInfoCache().entries(), function (_a) {
-                var path = _a[0], data = _a[1];
-                return [state.host.realpath ? toPath(state, state.host.realpath(path)) : path, data];
-            }));
             if (state.watch) {
+                state.lastCachedPackageJsonLookups.set(projectPath, state.moduleResolutionCache && ts.map(state.moduleResolutionCache.getPackageJsonInfoCache().entries(), function (_a) {
+                    var path = _a[0], data = _a[1];
+                    return [state.host.realpath && data ? toPath(state, state.host.realpath(path)) : path, data];
+                }));
                 state.builderPrograms.set(projectPath, program);
             }
             step++;
@@ -124072,28 +124096,85 @@ var ts;
     /** Get the token whose text contains the position */
     function getTokenAtPositionWorker(sourceFile, position, allowPositionInLeadingTrivia, includePrecedingTokenAtEndPosition, includeEndPosition) {
         var current = sourceFile;
-        outer: while (true) {
+        var foundToken;
+        var _loop_1 = function () {
             // find the child that contains 'position'
-            for (var _i = 0, _a = current.getChildren(sourceFile); _i < _a.length; _i++) {
-                var child = _a[_i];
-                var start = allowPositionInLeadingTrivia ? child.getFullStart() : child.getStart(sourceFile, /*includeJsDoc*/ true);
+            var children = current.getChildren(sourceFile);
+            var i = ts.binarySearchKey(children, position, function (_, i) { return i; }, function (middle, _) {
+                // This last callback is more of a selector than a comparator -
+                // `EqualTo` causes the `middle` result to be returned
+                // `GreaterThan` causes recursion on the left of the middle
+                // `LessThan` causes recursion on the right of the middle
+                // Let's say you have 3 nodes, spanning positons
+                // pos: 1, end: 3
+                // pos: 3, end: 3
+                // pos: 3, end: 5
+                // and you're looking for the token at positon 3 - all 3 of these nodes are overlapping with position 3.
+                // In fact, there's a _good argument_ that node 2 shouldn't even be allowed to exist - depending on if
+                // the start or end of the ranges are considered inclusive, it's either wholly subsumed by the first or the last node.
+                // Unfortunately, such nodes do exist. :( - See fourslash/completionsImport_tsx.tsx - empty jsx attributes create
+                // a zero-length node.
+                // What also you may not expect is that which node we return depends on the includePrecedingTokenAtEndPosition flag.
+                // Specifically, if includePrecedingTokenAtEndPosition is set, we return the 1-3 node, while if it's unset, we
+                // return the 3-5 node. (The zero length node is never correct.) This is because the includePrecedingTokenAtEndPosition
+                // flag causes us to return the first node whose end position matches the position and which produces and acceptable token
+                // kind. Meanwhile, if includePrecedingTokenAtEndPosition is unset, we look for the first node whose start is <= the
+                // position and whose end is greater than the position.
+                var start = allowPositionInLeadingTrivia ? children[middle].getFullStart() : children[middle].getStart(sourceFile, /*includeJsDoc*/ true);
                 if (start > position) {
-                    // If this child begins after position, then all subsequent children will as well.
-                    break;
-                }
-                var end = child.getEnd();
-                if (position < end || (position === end && (child.kind === 1 /* EndOfFileToken */ || includeEndPosition))) {
-                    current = child;
-                    continue outer;
+                    return 1 /* GreaterThan */;
                 }
-                else if (includePrecedingTokenAtEndPosition && end === position) {
-                    var previousToken = findPrecedingToken(position, sourceFile, child);
-                    if (previousToken && includePrecedingTokenAtEndPosition(previousToken)) {
-                        return previousToken;
+                // first element whose start position is before the input and whose end position is after or equal to the input
+                if (nodeContainsPosition(children[middle])) {
+                    if (children[middle - 1]) {
+                        // we want the _first_ element that contains the position, so left-recur if the prior node also contains the position
+                        if (nodeContainsPosition(children[middle - 1])) {
+                            return 1 /* GreaterThan */;
+                        }
                     }
+                    return 0 /* EqualTo */;
+                }
+                // this complex condition makes us left-recur around a zero-length node when includePrecedingTokenAtEndPosition is set, rather than right-recur on it
+                if (includePrecedingTokenAtEndPosition && start === position && children[middle - 1] && children[middle - 1].getEnd() === position && nodeContainsPosition(children[middle - 1])) {
+                    return 1 /* GreaterThan */;
                 }
+                return -1 /* LessThan */;
+            });
+            if (foundToken) {
+                return { value: foundToken };
+            }
+            if (i >= 0 && children[i]) {
+                current = children[i];
+                return "continue-outer";
+            }
+            return { value: current };
+        };
+        outer: while (true) {
+            var state_1 = _loop_1();
+            if (typeof state_1 === "object")
+                return state_1.value;
+            switch (state_1) {
+                case "continue-outer": continue outer;
             }
-            return current;
+        }
+        function nodeContainsPosition(node) {
+            var start = allowPositionInLeadingTrivia ? node.getFullStart() : node.getStart(sourceFile, /*includeJsDoc*/ true);
+            if (start > position) {
+                // If this child begins after position, then all subsequent children will as well.
+                return false;
+            }
+            var end = node.getEnd();
+            if (position < end || (position === end && (node.kind === 1 /* EndOfFileToken */ || includeEndPosition))) {
+                return true;
+            }
+            else if (includePrecedingTokenAtEndPosition && end === position) {
+                var previousToken = findPrecedingToken(position, sourceFile, node);
+                if (previousToken && includePrecedingTokenAtEndPosition(previousToken)) {
+                    foundToken = previousToken;
+                    return true;
+                }
+            }
+            return false;
         }
     }
     /**
@@ -126082,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,
@@ -126094,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) {
@@ -126111,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 () {
@@ -126176,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;
         }
@@ -126205,7 +126277,7 @@ var ts;
             }
             var oldFileStatementIndex = -1;
             var newFileStatementIndex = -1;
-            var _loop_1 = function (ambientModuleName) {
+            var _loop_2 = function (ambientModuleName) {
                 var isMatchingModuleDeclaration = function (node) { return ts.isNonGlobalAmbientModule(node) && node.name.text === ambientModuleName; };
                 oldFileStatementIndex = ts.findIndex(oldSourceFile.statements, isMatchingModuleDeclaration, oldFileStatementIndex + 1);
                 newFileStatementIndex = ts.findIndex(newSourceFile.statements, isMatchingModuleDeclaration, newFileStatementIndex + 1);
@@ -126215,9 +126287,9 @@ var ts;
             };
             for (var _i = 0, _a = newSourceFile.ambientModuleNames; _i < _a.length; _i++) {
                 var ambientModuleName = _a[_i];
-                var state_1 = _loop_1(ambientModuleName);
-                if (typeof state_1 === "object")
-                    return state_1.value;
+                var state_2 = _loop_2(ambientModuleName);
+                if (typeof state_2 === "object")
+                    return state_2.value;
             }
             return true;
         }
@@ -128059,7 +128131,7 @@ var ts;
                         continue;
                     var patterns = paths[path];
                     if (patterns) {
-                        var _loop_2 = function (name, kind, extension) {
+                        var _loop_3 = function (name, kind, extension) {
                             // Path mappings may provide a duplicate way to get to something we've already added, so don't add again.
                             if (!result.some(function (entry) { return entry.name === name; })) {
                                 result.push(nameAndKind(name, kind, extension));
@@ -128067,7 +128139,7 @@ var ts;
                         };
                         for (var _i = 0, _a = getCompletionsForPathMapping(path, patterns, fragment, baseDirectory, fileExtensions, host); _i < _a.length; _i++) {
                             var _b = _a[_i], name = _b.name, kind = _b.kind, extension = _b.extension;
-                            _loop_2(name, kind, extension);
+                            _loop_3(name, kind, extension);
                         }
                     }
                 }
@@ -128102,7 +128174,7 @@ var ts;
                     // (But do if we didn't find anything, e.g. 'package.json' missing.)
                     var foundGlobal = false;
                     if (fragmentDirectory === undefined) {
-                        var _loop_3 = function (moduleName) {
+                        var _loop_4 = function (moduleName) {
                             if (!result.some(function (entry) { return entry.name === moduleName; })) {
                                 foundGlobal = true;
                                 result.push(nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined));
@@ -128110,7 +128182,7 @@ var ts;
                         };
                         for (var _b = 0, _c = enumerateNodeModulesVisibleToScript(host, scriptPath); _b < _c.length; _b++) {
                             var moduleName = _c[_b];
-                            _loop_3(moduleName);
+                            _loop_4(moduleName);
                         }
                     }
                     if (!foundGlobal) {
@@ -128540,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;
                     }
@@ -128561,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;
@@ -128863,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;
@@ -129645,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`.
@@ -129658,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) {
@@ -129906,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))
@@ -129931,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,
@@ -130754,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;
@@ -133146,7 +133263,7 @@ var ts;
                         result = references;
                         continue;
                     }
-                    var _loop_4 = function (entry) {
+                    var _loop_5 = function (entry) {
                         if (!entry.definition || entry.definition.type !== 0 /* Symbol */) {
                             result.push(entry);
                             return "continue";
@@ -133178,7 +133295,7 @@ var ts;
                     };
                     for (var _b = 0, references_2 = references; _b < references_2.length; _b++) {
                         var entry = references_2[_b];
-                        _loop_4(entry);
+                        _loop_5(entry);
                     }
                 }
                 return result;
@@ -135156,7 +135273,7 @@ var ts;
     }
     function updateImports(program, changeTracker, oldToNew, newToOld, host, getCanonicalFileName) {
         var allFiles = program.getSourceFiles();
-        var _loop_5 = function (sourceFile) {
+        var _loop_6 = function (sourceFile) {
             var newFromOld = oldToNew(sourceFile.fileName);
             var newImportFromPath = newFromOld !== null && newFromOld !== void 0 ? newFromOld : sourceFile.fileName;
             var newImportFromDirectory = ts.getDirectoryPath(newImportFromPath);
@@ -135188,7 +135305,7 @@ var ts;
         };
         for (var _i = 0, allFiles_1 = allFiles; _i < allFiles_1.length; _i++) {
             var sourceFile = allFiles_1[_i];
-            _loop_5(sourceFile);
+            _loop_6(sourceFile);
         }
     }
     function combineNormal(pathA, pathB) {
@@ -136125,7 +136242,7 @@ var ts;
             if (!patternMatcher)
                 return ts.emptyArray;
             var rawItems = [];
-            var _loop_6 = function (sourceFile) {
+            var _loop_7 = function (sourceFile) {
                 cancellationToken.throwIfCancellationRequested();
                 if (excludeDtsFiles && sourceFile.isDeclarationFile) {
                     return "continue";
@@ -136137,7 +136254,7 @@ var ts;
             // Search the declarations in all files and output matched NavigateToItem into array of NavigateToItem[]
             for (var _i = 0, sourceFiles_4 = sourceFiles; _i < sourceFiles_4.length; _i++) {
                 var sourceFile = sourceFiles_4[_i];
-                _loop_6(sourceFile);
+                _loop_7(sourceFile);
             }
             rawItems.sort(compareNavigateToItems);
             return (maxResultCount === undefined ? rawItems : rawItems.slice(0, maxResultCount)).map(createNavigateToItem);
@@ -138141,15 +138258,15 @@ var ts;
     // Assumes 'value' is already lowercase.
     function indexOfIgnoringCase(str, value) {
         var n = str.length - value.length;
-        var _loop_7 = function (start) {
+        var _loop_8 = function (start) {
             if (every(value, function (valueChar, i) { return toLowerCase(str.charCodeAt(i + start)) === valueChar; })) {
                 return { value: start };
             }
         };
         for (var start = 0; start <= n; start++) {
-            var state_2 = _loop_7(start);
-            if (typeof state_2 === "object")
-                return state_2.value;
+            var state_3 = _loop_8(start);
+            if (typeof state_3 === "object")
+                return state_3.value;
         }
         return -1;
     }
@@ -139528,7 +139645,7 @@ var ts;
             return ts.createTextSpan(applicableSpanStart, applicableSpanEnd - applicableSpanStart);
         }
         function getContainingArgumentInfo(node, position, sourceFile, checker, isManuallyInvoked) {
-            var _loop_8 = function (n) {
+            var _loop_9 = function (n) {
                 // If the node is not a subspan of its parent, this is a big problem.
                 // There have been crashes that might be caused by this violation.
                 ts.Debug.assert(ts.rangeContainsRange(n.parent, n), "Not a subspan", function () { return "Child: " + ts.Debug.formatSyntaxKind(n.kind) + ", parent: " + ts.Debug.formatSyntaxKind(n.parent.kind); });
@@ -139538,9 +139655,9 @@ var ts;
                 }
             };
             for (var n = node; !ts.isSourceFile(n) && (isManuallyInvoked || !ts.isBlock(n)); n = n.parent) {
-                var state_3 = _loop_8(n);
-                if (typeof state_3 === "object")
-                    return state_3.value;
+                var state_4 = _loop_9(n);
+                if (typeof state_4 === "object")
+                    return state_4.value;
             }
             return undefined;
         }
@@ -141111,7 +141228,7 @@ var ts;
         commandLineOptionsStringToEnum = commandLineOptionsStringToEnum ||
             ts.filter(ts.optionDeclarations, function (o) { return typeof o.type === "object" && !ts.forEachEntry(o.type, function (v) { return typeof v !== "number"; }); });
         options = ts.cloneCompilerOptions(options);
-        var _loop_9 = function (opt) {
+        var _loop_10 = function (opt) {
             if (!ts.hasProperty(options, opt.name)) {
                 return "continue";
             }
@@ -141130,7 +141247,7 @@ var ts;
         };
         for (var _i = 0, commandLineOptionsStringToEnum_1 = commandLineOptionsStringToEnum; _i < commandLineOptionsStringToEnum_1.length; _i++) {
             var opt = commandLineOptionsStringToEnum_1[_i];
-            _loop_9(opt);
+            _loop_10(opt);
         }
         return options;
     }
@@ -144798,7 +144915,7 @@ var ts;
             ChangeTracker.prototype.finishDeleteDeclarations = function () {
                 var _this = this;
                 var deletedNodesInLists = new ts.Set(); // Stores nodes in lists that we already deleted. Used to avoid deleting `, ` twice in `a, b`.
-                var _loop_10 = function (sourceFile, node) {
+                var _loop_11 = function (sourceFile, node) {
                     if (!this_1.deletedNodes.some(function (d) { return d.sourceFile === sourceFile && ts.rangeContainsRangeExclusive(d.node, node); })) {
                         if (ts.isArray(node)) {
                             this_1.deleteRange(sourceFile, ts.rangeOfTypeParameters(sourceFile, node));
@@ -144811,7 +144928,7 @@ var ts;
                 var this_1 = this;
                 for (var _i = 0, _a = this.deletedNodes; _i < _a.length; _i++) {
                     var _b = _a[_i], sourceFile = _b.sourceFile, node = _b.node;
-                    _loop_10(sourceFile, node);
+                    _loop_11(sourceFile, node);
                 }
                 deletedNodesInLists.forEach(function (node) {
                     var sourceFile = node.getSourceFile();
@@ -144870,14 +144987,14 @@ var ts;
                     // order changes by start position
                     // If the start position is the same, put the shorter range first, since an empty range (x, x) may precede (x, y) but not vice-versa.
                     var normalized = ts.stableSort(changesInFile, function (a, b) { return (a.range.pos - b.range.pos) || (a.range.end - b.range.end); });
-                    var _loop_11 = function (i) {
+                    var _loop_12 = function (i) {
                         ts.Debug.assert(normalized[i].range.end <= normalized[i + 1].range.pos, "Changes overlap", function () {
                             return JSON.stringify(normalized[i].range) + " and " + JSON.stringify(normalized[i + 1].range);
                         });
                     };
                     // verify that change intervals do not overlap, except possibly at end points.
                     for (var i = 0; i < normalized.length - 1; i++) {
-                        _loop_11(i);
+                        _loop_12(i);
                     }
                     var textChanges = ts.mapDefined(normalized, function (c) {
                         var span = ts.createTextSpanFromRange(c.range);
@@ -145781,7 +145898,7 @@ var ts;
             }
             var isCompleteFix = identifiers.isCompleteFix;
             var initializers;
-            var _loop_12 = function (identifier) {
+            var _loop_13 = function (identifier) {
                 var symbol = checker.getSymbolAtLocation(identifier);
                 if (!symbol) {
                     return "continue";
@@ -145814,7 +145931,7 @@ var ts;
             };
             for (var _i = 0, _a = identifiers.identifiers; _i < _a.length; _i++) {
                 var identifier = _a[_i];
-                _loop_12(identifier);
+                _loop_13(identifier);
             }
             return initializers && {
                 initializers: initializers,
@@ -146697,7 +146814,7 @@ var ts;
                     functionToConvert.getStart(sourceFile);
             var options = functionToConvert.modifiers ? { prefix: " " } : { suffix: " " };
             changes.insertModifierAt(sourceFile, pos, 131 /* AsyncKeyword */, options);
-            var _loop_13 = function (returnStatement) {
+            var _loop_14 = function (returnStatement) {
                 ts.forEachChild(returnStatement, function visit(node) {
                     if (ts.isCallExpression(node)) {
                         var newNodes = transformExpression(node, node, transformer, /*hasContinuation*/ false);
@@ -146719,9 +146836,9 @@ var ts;
             };
             for (var _i = 0, returnStatements_1 = returnStatements; _i < returnStatements_1.length; _i++) {
                 var returnStatement = returnStatements_1[_i];
-                var state_4 = _loop_13(returnStatement);
-                if (typeof state_4 === "object")
-                    return state_4.value;
+                var state_5 = _loop_14(returnStatement);
+                if (typeof state_5 === "object")
+                    return state_5.value;
             }
         }
         function getReturnStatementsWithPromiseHandlers(body, checker) {
@@ -149345,6 +149462,7 @@ var ts;
             ts.Diagnostics.Property_0_may_not_exist_on_type_1_Did_you_mean_2.code,
             ts.Diagnostics.Cannot_find_name_0_Did_you_mean_1.code,
             ts.Diagnostics.Could_not_find_name_0_Did_you_mean_1.code,
+            ts.Diagnostics.Cannot_find_namespace_0_Did_you_mean_1.code,
             ts.Diagnostics.Cannot_find_name_0_Did_you_mean_the_instance_member_this_0.code,
             ts.Diagnostics.Cannot_find_name_0_Did_you_mean_the_static_member_1_0.code,
             ts.Diagnostics._0_has_no_exported_member_named_1_Did_you_mean_2.code,
@@ -149763,7 +149881,7 @@ var ts;
                     });
                     typeDeclToMembers.forEach(function (infos, classDeclaration) {
                         var supers = codefix.getAllSupers(classDeclaration, checker);
-                        var _loop_14 = function (info) {
+                        var _loop_15 = function (info) {
                             // If some superclass added this property, don't add it again.
                             if (supers.some(function (superClassOrInterface) {
                                 var superInfos = typeDeclToMembers.get(superClassOrInterface);
@@ -149790,7 +149908,7 @@ var ts;
                         };
                         for (var _i = 0, infos_1 = infos; _i < infos_1.length; _i++) {
                             var info = infos_1[_i];
-                            _loop_14(info);
+                            _loop_15(info);
                         }
                     });
                 }));
@@ -152397,7 +152515,7 @@ var ts;
             function getSignatureFromCalls(calls) {
                 var parameters = [];
                 var length = Math.max.apply(Math, calls.map(function (c) { return c.argumentTypes.length; }));
-                var _loop_15 = function (i) {
+                var _loop_16 = function (i) {
                     var symbol = checker.createSymbol(1 /* FunctionScopedVariable */, ts.escapeLeadingUnderscores("arg" + i));
                     symbol.type = combineTypes(calls.map(function (call) { return call.argumentTypes[i] || checker.getUndefinedType(); }));
                     if (calls.some(function (call) { return call.argumentTypes[i] === undefined; })) {
@@ -152406,7 +152524,7 @@ var ts;
                     parameters.push(symbol);
                 };
                 for (var i = 0; i < length; i++) {
-                    _loop_15(i);
+                    _loop_16(i);
                 }
                 var returnType = combineFromUsage(combineUsages(calls.map(function (call) { return call.return_; })));
                 return checker.createSignature(/*declaration*/ undefined, /*typeParameters*/ undefined, /*thisParameter*/ undefined, parameters, returnType, /*typePredicate*/ undefined, length, 0 /* None */);
@@ -154323,7 +154441,7 @@ var ts;
             // Imports that need to be kept as named imports in the refactored code, to avoid changing the semantics.
             // More specifically, those are named imports that appear in named exports in the original code, e.g. `a` in `import { a } from "m"; export { a }`.
             var neededNamedImports = new ts.Set();
-            var _loop_16 = function (element) {
+            var _loop_17 = function (element) {
                 var propertyName = (element.propertyName || element.name).text;
                 ts.FindAllReferences.Core.eachSymbolReferenceInFile(element.name, checker, sourceFile, function (id) {
                     var access = ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier(namespaceImportName), propertyName);
@@ -154340,7 +154458,7 @@ var ts;
             };
             for (var _i = 0, _a = toConvert.elements; _i < _a.length; _i++) {
                 var element = _a[_i];
-                _loop_16(element);
+                _loop_17(element);
             }
             changes.replaceNode(sourceFile, toConvert, ts.factory.createNamespaceImport(ts.factory.createIdentifier(namespaceImportName)));
             if (neededNamedImports.size) {
@@ -156195,7 +156313,7 @@ var ts;
                         : ts.getEnclosingBlockScopeContainer(scopes[0]);
                     ts.forEachChild(containingLexicalScopeOfExtraction, checkForUsedDeclarations);
                 }
-                var _loop_17 = function (i) {
+                var _loop_18 = function (i) {
                     var scopeUsages = usagesPerScope[i];
                     // Special case: in the innermost scope, all usages are available.
                     // (The computed value reflects the value at the top-level of the scope, but the
@@ -156235,7 +156353,7 @@ var ts;
                     }
                 };
                 for (var i = 0; i < scopes.length; i++) {
-                    _loop_17(i);
+                    _loop_18(i);
                 }
                 return { target: target, usagesPerScope: usagesPerScope, functionErrorsPerScope: functionErrorsPerScope, constantErrorsPerScope: constantErrorsPerScope, exposedVariableDeclarations: exposedVariableDeclarations };
                 function isInGenericContext(node) {
@@ -156924,10 +157042,10 @@ var ts;
         }
         function updateImportsInOtherFiles(changes, program, oldFile, movedSymbols, newModuleName) {
             var checker = program.getTypeChecker();
-            var _loop_18 = function (sourceFile) {
+            var _loop_19 = function (sourceFile) {
                 if (sourceFile === oldFile)
                     return "continue";
-                var _loop_19 = function (statement) {
+                var _loop_20 = function (statement) {
                     forEachImportInStatement(statement, function (importNode) {
                         if (checker.getSymbolAtLocation(moduleSpecifierFromImport(importNode)) !== oldFile.symbol)
                             return;
@@ -156949,12 +157067,12 @@ var ts;
                 };
                 for (var _b = 0, _c = sourceFile.statements; _b < _c.length; _b++) {
                     var statement = _c[_b];
-                    _loop_19(statement);
+                    _loop_20(statement);
                 }
             };
             for (var _i = 0, _a = program.getSourceFiles(); _i < _a.length; _i++) {
                 var sourceFile = _a[_i];
-                _loop_18(sourceFile);
+                _loop_19(sourceFile);
             }
         }
         function getNamespaceLikeImport(node) {
@@ -158318,7 +158436,7 @@ var ts;
                 var templateSpans = [];
                 var templateHead = ts.factory.createTemplateHead(headText, rawHeadText);
                 copyCommentFromStringLiterals(headIndexes, templateHead);
-                var _loop_20 = function (i) {
+                var _loop_21 = function (i) {
                     var currentNode = getExpressionFromParenthesesOrExpression(nodes[i]);
                     copyOperatorComments(i, currentNode);
                     var _c = concatConsecutiveString(i + 1, nodes), newIndex = _c[0], subsequentText = _c[1], rawSubsequentText = _c[2], stringIndexes = _c[3];
@@ -158347,7 +158465,7 @@ var ts;
                 };
                 var out_i_1;
                 for (var i = begin; i < nodes.length; i++) {
-                    _loop_20(i);
+                    _loop_21(i);
                     i = out_i_1;
                 }
                 return ts.factory.createTemplateExpression(templateHead, templateSpans);