typescript 4.7.0-dev.20220420 → 4.7.0-dev.20220423

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.20220420";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220423";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -14896,7 +14896,7 @@ var ts;
         var _a;
         // If we don't need to downlevel and we can reach the original source text using
         // the node's parent reference, then simply get the text as it was originally written.
-        if (canUseOriginalText(node, flags)) {
+        if (sourceFile && canUseOriginalText(node, flags)) {
             return getSourceTextOfNodeFromSourceFile(sourceFile, node);
         }
         // If we can't reach the original source text, use the canonical form if it's a number,
@@ -18487,10 +18487,10 @@ var ts;
         return ts.combinePaths(newDirPath, sourceFilePath);
     }
     ts.getSourceFilePathInNewDirWorker = getSourceFilePathInNewDirWorker;
-    function writeFile(host, diagnostics, fileName, data, writeByteOrderMark, sourceFiles) {
-        host.writeFile(fileName, data, writeByteOrderMark, function (hostErrorMessage) {
+    function writeFile(host, diagnostics, fileName, text, writeByteOrderMark, sourceFiles, data) {
+        host.writeFile(fileName, text, writeByteOrderMark, function (hostErrorMessage) {
             diagnostics.add(createCompilerDiagnostic(ts.Diagnostics.Could_not_write_file_0_Colon_1, fileName, hostErrorMessage));
-        }, sourceFiles);
+        }, sourceFiles, data);
     }
     ts.writeFile = writeFile;
     function ensureDirectoriesExist(directoryPath, createDirectory, directoryExists) {
@@ -73626,6 +73626,7 @@ var ts;
                         }
                     }
                     else {
+                        error(attributeDecl.expression, ts.Diagnostics.Spread_types_may_only_be_created_from_object_types);
                         typeToIntersect = typeToIntersect ? getIntersectionType([typeToIntersect, exprType]) : exprType;
                     }
                 }
@@ -75863,6 +75864,7 @@ var ts;
             // decorators are applied to a declaration by the emitter, and not to an expression.
             var isSingleNonGenericCandidate = candidates.length === 1 && !candidates[0].typeParameters;
             var argCheckMode = !isDecorator && !isSingleNonGenericCandidate && ts.some(args, isContextSensitive) ? 4 /* SkipContextSensitive */ : 0 /* Normal */;
+            argCheckMode |= checkMode & 32 /* IsForStringLiteralArgumentCompletions */;
             // The following variables are captured and modified by calls to chooseOverload.
             // If overload resolution or type argument inference fails, we want to report the
             // best error possible. The best error is one which says that an argument was not
@@ -76078,7 +76080,7 @@ var ts;
                         // If one or more context sensitive arguments were excluded, we start including
                         // them now (and keeping do so for any subsequent candidates) and perform a second
                         // round of type inference and applicability checking for this particular candidate.
-                        argCheckMode = 0 /* Normal */;
+                        argCheckMode = checkMode & 32 /* IsForStringLiteralArgumentCompletions */;
                         if (inferenceContext) {
                             var typeArgumentTypes = inferTypeArguments(node, candidate, args, argCheckMode, inferenceContext);
                             checkCandidate = getSignatureInstantiation(candidate, typeArgumentTypes, ts.isInJSFile(candidate.declaration), inferenceContext && inferenceContext.inferredTypeParameters);
@@ -94890,7 +94892,7 @@ var ts;
             }
             resumeLexicalEnvironment();
             var needsSyntheticConstructor = !constructor && isDerivedClass;
-            var indexOfFirstStatementAfterSuper = 0;
+            var indexOfFirstStatementAfterSuperAndPrologue = 0;
             var prologueStatementCount = 0;
             var superStatementIndex = -1;
             var statements = [];
@@ -94899,8 +94901,11 @@ var ts;
                 superStatementIndex = ts.findSuperStatementIndex(constructor.body.statements, prologueStatementCount);
                 // If there was a super call, visit existing statements up to and including it
                 if (superStatementIndex >= 0) {
-                    indexOfFirstStatementAfterSuper = superStatementIndex + 1;
-                    statements = __spreadArray(__spreadArray(__spreadArray([], statements.slice(0, prologueStatementCount), true), ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, prologueStatementCount, indexOfFirstStatementAfterSuper - prologueStatementCount), true), statements.slice(prologueStatementCount), true);
+                    indexOfFirstStatementAfterSuperAndPrologue = superStatementIndex + 1;
+                    statements = __spreadArray(__spreadArray(__spreadArray([], statements.slice(0, prologueStatementCount), true), ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, prologueStatementCount, indexOfFirstStatementAfterSuperAndPrologue - prologueStatementCount), true), statements.slice(prologueStatementCount), true);
+                }
+                else if (prologueStatementCount >= 0) {
+                    indexOfFirstStatementAfterSuperAndPrologue = prologueStatementCount;
                 }
             }
             if (needsSyntheticConstructor) {
@@ -94936,22 +94941,20 @@ var ts;
                         }
                     }
                     if (parameterPropertyDeclarationCount > 0) {
-                        var parameterProperties = ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatementAfterSuper, parameterPropertyDeclarationCount);
+                        var parameterProperties = ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatementAfterSuperAndPrologue, parameterPropertyDeclarationCount);
                         // If there was a super() call found, add parameter properties immediately after it
                         if (superStatementIndex >= 0) {
                             ts.addRange(statements, parameterProperties);
                         }
-                        // If a synthetic super() call was added, add them just after it
-                        else if (needsSyntheticConstructor) {
-                            statements = __spreadArray(__spreadArray([
-                                statements[0]
-                            ], parameterProperties, true), statements.slice(1), true);
-                        }
-                        // Since there wasn't a super() call, add them to the top of the constructor
                         else {
-                            statements = __spreadArray(__spreadArray([], parameterProperties, true), statements, true);
+                            // Add add parameter properties to the top of the constructor after the prologue
+                            var superAndPrologueStatementCount = prologueStatementCount;
+                            // If a synthetic super() call was added, need to account for that
+                            if (needsSyntheticConstructor)
+                                superAndPrologueStatementCount++;
+                            statements = __spreadArray(__spreadArray(__spreadArray([], statements.slice(0, superAndPrologueStatementCount), true), parameterProperties, true), statements.slice(superAndPrologueStatementCount), true);
                         }
-                        indexOfFirstStatementAfterSuper += parameterPropertyDeclarationCount;
+                        indexOfFirstStatementAfterSuperAndPrologue += parameterPropertyDeclarationCount;
                     }
                 }
             }
@@ -94961,7 +94964,7 @@ var ts;
             addPropertyOrClassStaticBlockStatements(statements, properties, receiver);
             // Add existing statements after the initial prologues and super call
             if (constructor) {
-                ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitBodyStatement, ts.isStatement, indexOfFirstStatementAfterSuper + prologueStatementCount));
+                ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitBodyStatement, ts.isStatement, indexOfFirstStatementAfterSuperAndPrologue));
             }
             statements = factory.mergeLexicalEnvironment(statements, endLexicalEnvironment());
             return ts.setTextRange(factory.createBlock(ts.setTextRange(factory.createNodeArray(statements), 
@@ -110159,6 +110162,7 @@ var ts;
             else {
                 printer.writeFile(sourceFile, writer, sourceMapGenerator);
             }
+            var sourceMapUrlPos;
             if (sourceMapGenerator) {
                 if (sourceMapDataList) {
                     sourceMapDataList.push({
@@ -110170,6 +110174,7 @@ var ts;
                 if (sourceMappingURL) {
                     if (!writer.isAtStartOfLine())
                         writer.rawWrite(newLine);
+                    sourceMapUrlPos = writer.getTextPos();
                     writer.writeComment("//# " + "sourceMappingURL" + "=" + sourceMappingURL); // Tools can sometimes see this line as a source mapping url comment
                 }
                 // Write the source map
@@ -110182,7 +110187,7 @@ var ts;
                 writer.writeLine();
             }
             // Write the output file
-            ts.writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), !!compilerOptions.emitBOM, sourceFiles);
+            ts.writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), !!compilerOptions.emitBOM, sourceFiles, { sourceMapUrlPos: sourceMapUrlPos });
             // Reset state
             writer.clear();
         }
@@ -110704,7 +110709,7 @@ var ts;
             setWriter(/*output*/ undefined, /*_sourceMapGenerator*/ undefined);
         }
         function getCurrentLineMap() {
-            return currentLineMap || (currentLineMap = ts.getLineStarts(currentSourceFile));
+            return currentLineMap || (currentLineMap = ts.getLineStarts(ts.Debug.checkDefined(currentSourceFile)));
         }
         function emit(node, parenthesizerRule) {
             if (node === undefined)
@@ -111879,7 +111884,7 @@ var ts;
                 increaseIndent();
             }
             var preferNewLine = node.multiLine ? 65536 /* PreferNewLine */ : 0 /* None */;
-            var allowTrailingComma = currentSourceFile.languageVersion >= 1 /* ES5 */ && !ts.isJsonSourceFile(currentSourceFile) ? 64 /* AllowTrailingComma */ : 0 /* None */;
+            var allowTrailingComma = currentSourceFile && currentSourceFile.languageVersion >= 1 /* ES5 */ && !ts.isJsonSourceFile(currentSourceFile) ? 64 /* AllowTrailingComma */ : 0 /* None */;
             emitList(node, node.properties, 526226 /* ObjectLiteralExpressionProperties */ | allowTrailingComma | preferNewLine);
             if (indentedFlag) {
                 decreaseIndent();
@@ -112235,7 +112240,7 @@ var ts;
             emitExpression(node.expression, parenthesizer.parenthesizeExpressionOfExpressionStatement);
             // Emit semicolon in non json files
             // or if json file that created synthesized expression(eg.define expression statement when --out and amd code generation)
-            if (!ts.isJsonSourceFile(currentSourceFile) || ts.nodeIsSynthesized(node.expression)) {
+            if (!currentSourceFile || !ts.isJsonSourceFile(currentSourceFile) || ts.nodeIsSynthesized(node.expression)) {
                 writeTrailingSemicolon();
             }
         }
@@ -112528,7 +112533,7 @@ var ts;
             if (body.multiLine) {
                 return false;
             }
-            if (!ts.nodeIsSynthesized(body) && !ts.rangeIsOnSingleLine(body, currentSourceFile)) {
+            if (!ts.nodeIsSynthesized(body) && currentSourceFile && !ts.rangeIsOnSingleLine(body, currentSourceFile)) {
                 return false;
             }
             if (getLeadingLineTerminatorCount(body, body.statements, 2 /* PreserveLines */)
@@ -112553,12 +112558,7 @@ var ts;
             var emitBlockFunctionBody = shouldEmitBlockFunctionBodyOnSingleLine(body)
                 ? emitBlockFunctionBodyOnSingleLine
                 : emitBlockFunctionBodyWorker;
-            if (emitBodyWithDetachedComments) {
-                emitBodyWithDetachedComments(body, body.statements, emitBlockFunctionBody);
-            }
-            else {
-                emitBlockFunctionBody(body);
-            }
+            emitBodyWithDetachedComments(body, body.statements, emitBlockFunctionBody);
             decreaseIndent();
             writeToken(19 /* CloseBraceToken */, body.statements.end, writePunctuation, body);
             onAfterEmitNode === null || onAfterEmitNode === void 0 ? void 0 : onAfterEmitNode(body);
@@ -112955,7 +112955,8 @@ var ts;
             var emitAsSingleStatement = statements.length === 1 &&
                 (
                 // treat synthesized nodes as located on the same line for emit purposes
-                ts.nodeIsSynthesized(parentNode) ||
+                !currentSourceFile ||
+                    ts.nodeIsSynthesized(parentNode) ||
                     ts.nodeIsSynthesized(statements[0]) ||
                     ts.rangeStartPositionsAreOnSameLine(parentNode, statements[0], currentSourceFile));
             var format = 163969 /* CaseOrDefaultClauseStatements */;
@@ -113186,16 +113187,14 @@ var ts;
         function emitSourceFile(node) {
             writeLine();
             var statements = node.statements;
-            if (emitBodyWithDetachedComments) {
-                // Emit detached comment if there are no prologue directives or if the first node is synthesized.
-                // The synthesized node will have no leading comment so some comments may be missed.
-                var shouldEmitDetachedComment = statements.length === 0 ||
-                    !ts.isPrologueDirective(statements[0]) ||
-                    ts.nodeIsSynthesized(statements[0]);
-                if (shouldEmitDetachedComment) {
-                    emitBodyWithDetachedComments(node, statements, emitSourceFileWorker);
-                    return;
-                }
+            // Emit detached comment if there are no prologue directives or if the first node is synthesized.
+            // The synthesized node will have no leading comment so some comments may be missed.
+            var shouldEmitDetachedComment = statements.length === 0 ||
+                !ts.isPrologueDirective(statements[0]) ||
+                ts.nodeIsSynthesized(statements[0]);
+            if (shouldEmitDetachedComment) {
+                emitBodyWithDetachedComments(node, statements, emitSourceFileWorker);
+                return;
             }
             emitSourceFileWorker(node);
         }
@@ -113584,7 +113583,7 @@ var ts;
             }
             if (isEmpty) {
                 // Write a line terminator if the parent node was multi-line
-                if (format & 1 /* MultiLine */ && !(preserveSourceNewlines && (!parentNode || ts.rangeIsOnSingleLine(parentNode, currentSourceFile)))) {
+                if (format & 1 /* MultiLine */ && !(preserveSourceNewlines && (!parentNode || currentSourceFile && ts.rangeIsOnSingleLine(parentNode, currentSourceFile)))) {
                     writeLine();
                 }
                 else if (format & 256 /* SpaceBetweenBraces */ && !(format & 524288 /* NoSpaceIfEmpty */)) {
@@ -113845,7 +113844,7 @@ var ts;
                 }
                 var firstChild_1 = children[0];
                 if (firstChild_1 === undefined) {
-                    return !parentNode || ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
+                    return !parentNode || currentSourceFile && ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
                 }
                 if (firstChild_1.pos === nextListElementPos) {
                     // If this child starts at the beginning of a list item in a parent list, its leading
@@ -113869,7 +113868,7 @@ var ts;
                     // JsxText will be written with its leading whitespace, so don't add more manually.
                     return 0;
                 }
-                if (parentNode &&
+                if (currentSourceFile && parentNode &&
                     !ts.positionIsSynthesized(parentNode.pos) &&
                     !ts.nodeIsSynthesized(firstChild_1) &&
                     (!firstChild_1.parent || ts.getOriginalNode(firstChild_1.parent) === ts.getOriginalNode(parentNode))) {
@@ -113893,7 +113892,7 @@ var ts;
                     // JsxText will be written with its leading whitespace, so don't add more manually.
                     return 0;
                 }
-                else if (!ts.nodeIsSynthesized(previousNode) && !ts.nodeIsSynthesized(nextNode)) {
+                else if (currentSourceFile && !ts.nodeIsSynthesized(previousNode) && !ts.nodeIsSynthesized(nextNode)) {
                     if (preserveSourceNewlines && siblingNodePositionsAreComparable(previousNode, nextNode)) {
                         return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenRangeEndAndRangeStart(previousNode, nextNode, currentSourceFile, includeComments); });
                     }
@@ -113925,9 +113924,9 @@ var ts;
                 }
                 var lastChild = ts.lastOrUndefined(children);
                 if (lastChild === undefined) {
-                    return !parentNode || ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
+                    return !parentNode || currentSourceFile && ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
                 }
-                if (parentNode && !ts.positionIsSynthesized(parentNode.pos) && !ts.nodeIsSynthesized(lastChild) && (!lastChild.parent || lastChild.parent === parentNode)) {
+                if (currentSourceFile && parentNode && !ts.positionIsSynthesized(parentNode.pos) && !ts.nodeIsSynthesized(lastChild) && (!lastChild.parent || lastChild.parent === parentNode)) {
                     if (preserveSourceNewlines) {
                         var end_1 = ts.isNodeArray(children) && !ts.positionIsSynthesized(children.end) ? children.end : lastChild.end;
                         return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenPositionAndNextNonWhitespaceCharacter(end_1, parentNode.end, currentSourceFile, includeComments); });
@@ -114000,7 +113999,7 @@ var ts;
             if (ts.getStartsOnNewLine(node2)) {
                 return 1;
             }
-            if (!ts.nodeIsSynthesized(parent) && !ts.nodeIsSynthesized(node1) && !ts.nodeIsSynthesized(node2)) {
+            if (currentSourceFile && !ts.nodeIsSynthesized(parent) && !ts.nodeIsSynthesized(node1) && !ts.nodeIsSynthesized(node2)) {
                 if (preserveSourceNewlines) {
                     return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenRangeEndAndRangeStart(node1, node2, currentSourceFile, includeComments); });
                 }
@@ -114010,7 +114009,7 @@ var ts;
         }
         function isEmptyBlock(block) {
             return block.statements.length === 0
-                && ts.rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile);
+                && (!currentSourceFile || ts.rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile));
         }
         function skipSynthesizedParentheses(node) {
             while (node.kind === 212 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
@@ -114022,16 +114021,23 @@ var ts;
             if (ts.isGeneratedIdentifier(node)) {
                 return generateName(node);
             }
-            else if ((ts.isIdentifier(node) || ts.isPrivateIdentifier(node)) && (ts.nodeIsSynthesized(node) || !node.parent || !currentSourceFile || (node.parent && currentSourceFile && ts.getSourceFileOfNode(node) !== ts.getOriginalNode(currentSourceFile)))) {
-                return ts.idText(node);
-            }
-            else if (node.kind === 10 /* StringLiteral */ && node.textSourceNode) {
+            if (ts.isStringLiteral(node) && node.textSourceNode) {
                 return getTextOfNode(node.textSourceNode, includeTrivia);
             }
-            else if (ts.isLiteralExpression(node) && (ts.nodeIsSynthesized(node) || !node.parent)) {
-                return node.text;
+            var sourceFile = currentSourceFile; // const needed for control flow
+            var canUseSourceFile = !!sourceFile && !!node.parent && !ts.nodeIsSynthesized(node);
+            if (ts.isMemberName(node)) {
+                if (!canUseSourceFile || ts.getSourceFileOfNode(node) !== ts.getOriginalNode(sourceFile)) {
+                    return ts.idText(node);
+                }
+            }
+            else {
+                ts.Debug.assertNode(node, ts.isLiteralExpression); // not strictly necessary
+                if (!canUseSourceFile) {
+                    return node.text;
+                }
             }
-            return ts.getSourceTextOfNodeFromSourceFile(currentSourceFile, node, includeTrivia);
+            return ts.getSourceTextOfNodeFromSourceFile(sourceFile, node, includeTrivia);
         }
         function getLiteralTextOfNode(node, neverAsciiEscape, jsxAttributeEscape) {
             if (node.kind === 10 /* StringLiteral */ && node.textSourceNode) {
@@ -114610,7 +114616,7 @@ var ts;
             return true;
         }
         function emitLeadingComment(commentPos, commentEnd, kind, hasTrailingNewLine, rangePos) {
-            if (!shouldWriteComment(currentSourceFile.text, commentPos))
+            if (!currentSourceFile || !shouldWriteComment(currentSourceFile.text, commentPos))
                 return;
             if (!hasWrittenComment) {
                 ts.emitNewLineBeforeLeadingCommentOfPosition(getCurrentLineMap(), writer, rangePos, commentPos);
@@ -114637,7 +114643,7 @@ var ts;
             forEachTrailingCommentToEmit(pos, emitTrailingComment);
         }
         function emitTrailingComment(commentPos, commentEnd, _kind, hasTrailingNewLine) {
-            if (!shouldWriteComment(currentSourceFile.text, commentPos))
+            if (!currentSourceFile || !shouldWriteComment(currentSourceFile.text, commentPos))
                 return;
             // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment2*/
             if (!writer.isAtStartOfLine()) {
@@ -114659,6 +114665,8 @@ var ts;
             exitComment();
         }
         function emitTrailingCommentOfPositionNoNewline(commentPos, commentEnd, kind) {
+            if (!currentSourceFile)
+                return;
             // trailing comments of a position are emitted at /*trailing comment1 */space/*trailing comment*/space
             emitPos(commentPos);
             ts.writeCommentRange(currentSourceFile.text, getCurrentLineMap(), writer, commentPos, commentEnd, newLine);
@@ -114668,6 +114676,8 @@ var ts;
             }
         }
         function emitTrailingCommentOfPosition(commentPos, commentEnd, _kind, hasTrailingNewLine) {
+            if (!currentSourceFile)
+                return;
             // trailing comments of a position are emitted at /*trailing comment1 */space/*trailing comment*/space
             emitPos(commentPos);
             ts.writeCommentRange(currentSourceFile.text, getCurrentLineMap(), writer, commentPos, commentEnd, newLine);
@@ -114700,6 +114710,8 @@ var ts;
             return detachedCommentsInfo !== undefined && ts.last(detachedCommentsInfo).nodePos === pos;
         }
         function forEachLeadingCommentWithoutDetachedComments(cb) {
+            if (!currentSourceFile)
+                return;
             // get the leading comments from detachedPos
             var pos = ts.last(detachedCommentsInfo).detachedCommentEndPos;
             if (detachedCommentsInfo.length - 1) {
@@ -114711,7 +114723,7 @@ var ts;
             ts.forEachLeadingCommentRange(currentSourceFile.text, pos, cb, /*state*/ pos);
         }
         function emitDetachedCommentsAndUpdateCommentsInfo(range) {
-            var currentDetachedCommentInfo = ts.emitDetachedComments(currentSourceFile.text, getCurrentLineMap(), writer, emitComment, range, newLine, commentsDisabled);
+            var currentDetachedCommentInfo = currentSourceFile && ts.emitDetachedComments(currentSourceFile.text, getCurrentLineMap(), writer, emitComment, range, newLine, commentsDisabled);
             if (currentDetachedCommentInfo) {
                 if (detachedCommentsInfo) {
                     detachedCommentsInfo.push(currentDetachedCommentInfo);
@@ -114722,7 +114734,7 @@ var ts;
             }
         }
         function emitComment(text, lineMap, writer, commentPos, commentEnd, newLine) {
-            if (!shouldWriteComment(currentSourceFile.text, commentPos))
+            if (!currentSourceFile || !shouldWriteComment(currentSourceFile.text, commentPos))
                 return;
             emitPos(commentPos);
             ts.writeCommentRange(text, lineMap, writer, commentPos, commentEnd, newLine);
@@ -114734,7 +114746,7 @@ var ts;
          * @return true if the comment is a triple-slash comment else false
          */
         function isTripleSlashComment(commentPos, commentEnd) {
-            return ts.isRecognizedTripleSlashComment(currentSourceFile.text, commentPos, commentEnd);
+            return !!currentSourceFile && ts.isRecognizedTripleSlashComment(currentSourceFile.text, commentPos, commentEnd);
         }
         // Source Maps
         function getParsedSourceMap(node) {
@@ -115649,7 +115661,11 @@ var ts;
             return newValue;
         };
         if (originalWriteFile) {
-            host.writeFile = function (fileName, data, writeByteOrderMark, onError, sourceFiles) {
+            host.writeFile = function (fileName, data) {
+                var rest = [];
+                for (var _i = 2; _i < arguments.length; _i++) {
+                    rest[_i - 2] = arguments[_i];
+                }
                 var key = toPath(fileName);
                 fileExistsCache.delete(key);
                 var value = readFileCache.get(key);
@@ -115663,7 +115679,7 @@ var ts;
                         sourceFileCache.delete(key);
                     }
                 }
-                originalWriteFile.call(host, fileName, data, writeByteOrderMark, onError, sourceFiles);
+                originalWriteFile.call.apply(originalWriteFile, __spreadArray([host, fileName, data], rest, false));
             };
         }
         // directoryExists
@@ -116596,6 +116612,7 @@ var ts;
             useCaseSensitiveFileNames: function () { return host.useCaseSensitiveFileNames(); },
             getFileIncludeReasons: function () { return fileReasons; },
             structureIsReused: structureIsReused,
+            writeFile: writeFile,
         };
         onProgramCreateComplete();
         // Add file processingDiagnostics
@@ -117093,7 +117110,7 @@ var ts;
                 getProjectReferenceRedirect: getProjectReferenceRedirect,
                 isSourceOfProjectReferenceRedirect: isSourceOfProjectReferenceRedirect,
                 getSymlinkCache: getSymlinkCache,
-                writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }),
+                writeFile: writeFileCallback || writeFile,
                 isEmitBlocked: isEmitBlocked,
                 readFile: function (f) { return host.readFile(f); },
                 fileExists: function (f) {
@@ -117113,6 +117130,9 @@ var ts;
                 getFileIncludeReasons: program.getFileIncludeReasons,
             };
         }
+        function writeFile(fileName, text, writeByteOrderMark, onError, sourceFiles, data) {
+            host.writeFile(fileName, text, writeByteOrderMark, onError, sourceFiles, data);
+        }
         function emitBuildInfo(writeFileCallback) {
             ts.Debug.assert(!ts.outFile(options));
             ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("emit" /* Emit */, "emitBuildInfo", {}, /*separateBeginAndEnd*/ true);
@@ -119555,6 +119575,7 @@ var ts;
                 }
             }
         }
+        BuilderState.updateExportedModules = updateExportedModules;
         /**
          * Updates the exported modules from cache into state's exported modules map
          * This should be called whenever it is safe to commit the state of the builder
@@ -119978,6 +119999,18 @@ var ts;
         }
         return undefined;
     }
+    function removeDiagnosticsOfLibraryFiles(state) {
+        if (!state.cleanedDiagnosticsOfLibFiles) {
+            state.cleanedDiagnosticsOfLibFiles = true;
+            var program_1 = ts.Debug.checkDefined(state.program);
+            var options_2 = program_1.getCompilerOptions();
+            ts.forEach(program_1.getSourceFiles(), function (f) {
+                return program_1.isSourceFileDefaultLibrary(f) &&
+                    !ts.skipTypeChecking(f, options_2, program_1) &&
+                    removeSemanticDiagnosticsOf(state, f.resolvedPath);
+            });
+        }
+    }
     /**
      *  Handles semantic diagnostics and dts emit for affectedFile and files, that are referencing modules that export entities from affected file
      *  This is because even though js emit doesnt change, dts emit / type used can change resulting in need for dts emit and js change
@@ -119987,28 +120020,17 @@ var ts;
         removeSemanticDiagnosticsOf(state, affectedFile.resolvedPath);
         // If affected files is everything except default library, then nothing more to do
         if (state.allFilesExcludingDefaultLibraryFile === state.affectedFiles) {
-            if (!state.cleanedDiagnosticsOfLibFiles) {
-                state.cleanedDiagnosticsOfLibFiles = true;
-                var program_1 = ts.Debug.checkDefined(state.program);
-                var options_2 = program_1.getCompilerOptions();
-                ts.forEach(program_1.getSourceFiles(), function (f) {
-                    return program_1.isSourceFileDefaultLibrary(f) &&
-                        !ts.skipTypeChecking(f, options_2, program_1) &&
-                        removeSemanticDiagnosticsOf(state, f.resolvedPath);
-                });
-            }
+            removeDiagnosticsOfLibraryFiles(state);
             // When a change affects the global scope, all files are considered to be affected without updating their signature
             // That means when affected file is handled, its signature can be out of date
             // To avoid this, ensure that we update the signature for any affected file in this scenario.
             ts.BuilderState.updateShapeSignature(state, ts.Debug.checkDefined(state.program), affectedFile, ts.Debug.checkDefined(state.currentAffectedFilesSignatures), cancellationToken, computeHash, state.currentAffectedFilesExportedModulesMap);
             return;
         }
-        else {
-            ts.Debug.assert(state.hasCalledUpdateShapeSignature.has(affectedFile.resolvedPath) || ((_a = state.currentAffectedFilesSignatures) === null || _a === void 0 ? void 0 : _a.has(affectedFile.resolvedPath)), "Signature not updated for affected file: " + affectedFile.fileName);
-        }
-        if (!state.compilerOptions.assumeChangesOnlyAffectDirectDependencies) {
-            forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, function (state, path) { return handleDtsMayChangeOf(state, path, cancellationToken, computeHash, host); });
-        }
+        ts.Debug.assert(state.hasCalledUpdateShapeSignature.has(affectedFile.resolvedPath) || ((_a = state.currentAffectedFilesSignatures) === null || _a === void 0 ? void 0 : _a.has(affectedFile.resolvedPath)), "Signature not updated for affected file: " + affectedFile.fileName);
+        if (state.compilerOptions.assumeChangesOnlyAffectDirectDependencies)
+            return;
+        handleDtsMayChangeOfReferencingExportOfAffectedFile(state, affectedFile, cancellationToken, computeHash, host);
     }
     /**
      * Handle the dts may change, so they need to be added to pending emit if dts emit is enabled,
@@ -120050,16 +120072,41 @@ var ts;
         var oldSignature = ts.Debug.checkDefined(state.fileInfos.get(path)).signature;
         return newSignature !== oldSignature;
     }
+    function forEachKeyOfExportedModulesMap(state, filePath, fn) {
+        // Go through exported modules from cache first
+        var keys = state.currentAffectedFilesExportedModulesMap.getKeys(filePath);
+        var result = keys && ts.forEachKey(keys, fn);
+        if (result)
+            return result;
+        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
+        keys = state.exportedModulesMap.getKeys(filePath);
+        return keys && ts.forEachKey(keys, function (exportedFromPath) {
+            var _a;
+            // If the cache had an updated value, skip
+            return !state.currentAffectedFilesExportedModulesMap.hasKey(exportedFromPath) &&
+                !((_a = state.currentAffectedFilesExportedModulesMap.deletedKeys()) === null || _a === void 0 ? void 0 : _a.has(exportedFromPath)) ?
+                fn(exportedFromPath) :
+                undefined;
+        });
+    }
+    function handleDtsMayChangeOfGlobalScope(state, filePath, cancellationToken, computeHash, host) {
+        var _a;
+        if (!((_a = state.fileInfos.get(filePath)) === null || _a === void 0 ? void 0 : _a.affectsGlobalScope))
+            return false;
+        // Every file needs to be handled
+        ts.BuilderState.getAllFilesExcludingDefaultLibraryFile(state, state.program, /*firstSourceFile*/ undefined)
+            .forEach(function (file) { return handleDtsMayChangeOf(state, file.resolvedPath, cancellationToken, computeHash, host); });
+        removeDiagnosticsOfLibraryFiles(state);
+        return true;
+    }
     /**
-     * Iterate on referencing modules that export entities from affected file
+     * Iterate on referencing modules that export entities from affected file and delete diagnostics and add pending emit
      */
-    function forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, fn) {
-        var _a, _b;
+    function handleDtsMayChangeOfReferencingExportOfAffectedFile(state, affectedFile, cancellationToken, computeHash, host) {
         // If there was change in signature (dts output) for the changed file,
         // then only we need to handle pending file emit
-        if (!state.exportedModulesMap || !state.changedFilesSet.has(affectedFile.resolvedPath)) {
+        if (!state.exportedModulesMap || !state.changedFilesSet.has(affectedFile.resolvedPath))
             return;
-        }
         if (!isChangedSignature(state, affectedFile.resolvedPath))
             return;
         // Since isolated modules dont change js files, files affected by change in signature is itself
@@ -120072,7 +120119,9 @@ var ts;
                 var currentPath = queue.pop();
                 if (!seenFileNamesMap.has(currentPath)) {
                     seenFileNamesMap.set(currentPath, true);
-                    fn(state, currentPath);
+                    if (handleDtsMayChangeOfGlobalScope(state, currentPath, cancellationToken, computeHash, host))
+                        return;
+                    handleDtsMayChangeOf(state, currentPath, cancellationToken, computeHash, host);
                     if (isChangedSignature(state, currentPath)) {
                         var currentSourceFile = ts.Debug.checkDefined(state.program).getSourceFileByPath(currentPath);
                         queue.push.apply(queue, ts.BuilderState.getReferencedByPaths(state, currentSourceFile.resolvedPath));
@@ -120084,56 +120133,38 @@ var ts;
         var seenFileAndExportsOfFile = new ts.Set();
         // Go through exported modules from cache first
         // If exported modules has path, all files referencing file exported from are affected
-        (_a = state.currentAffectedFilesExportedModulesMap.getKeys(affectedFile.resolvedPath)) === null || _a === void 0 ? void 0 : _a.forEach(function (exportedFromPath) {
-            return forEachFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile, fn);
-        });
-        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
-        (_b = state.exportedModulesMap.getKeys(affectedFile.resolvedPath)) === null || _b === void 0 ? void 0 : _b.forEach(function (exportedFromPath) {
-            var _a;
-            // If the cache had an updated value, skip
-            return !state.currentAffectedFilesExportedModulesMap.hasKey(exportedFromPath) &&
-                !((_a = state.currentAffectedFilesExportedModulesMap.deletedKeys()) === null || _a === void 0 ? void 0 : _a.has(exportedFromPath)) &&
-                forEachFilesReferencingPath(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        forEachKeyOfExportedModulesMap(state, affectedFile.resolvedPath, function (exportedFromPath) {
+            if (handleDtsMayChangeOfGlobalScope(state, exportedFromPath, cancellationToken, computeHash, host))
+                return true;
+            var references = state.referencedMap.getKeys(exportedFromPath);
+            return references && ts.forEachKey(references, function (filePath) {
+                return handleDtsMayChangeOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, cancellationToken, computeHash, host);
+            });
         });
     }
     /**
-     * Iterate on files referencing referencedPath
+     * handle dts and semantic diagnostics on file and iterate on anything that exports this file
+     * return true when all work is done and we can exit handling dts emit and semantic diagnostics
      */
-    function forEachFilesReferencingPath(state, referencedPath, seenFileAndExportsOfFile, fn) {
+    function handleDtsMayChangeOfFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, cancellationToken, computeHash, host) {
         var _a;
-        (_a = state.referencedMap.getKeys(referencedPath)) === null || _a === void 0 ? void 0 : _a.forEach(function (filePath) {
-            return forEachFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, fn);
-        });
-    }
-    /**
-     * fn on file and iterate on anything that exports this file
-     */
-    function forEachFileAndExportsOfFile(state, filePath, seenFileAndExportsOfFile, fn) {
-        var _a, _b, _c;
-        if (!ts.tryAddToSet(seenFileAndExportsOfFile, filePath)) {
-            return;
-        }
-        fn(state, filePath);
+        if (!ts.tryAddToSet(seenFileAndExportsOfFile, filePath))
+            return undefined;
+        if (handleDtsMayChangeOfGlobalScope(state, filePath, cancellationToken, computeHash, host))
+            return true;
+        handleDtsMayChangeOf(state, filePath, cancellationToken, computeHash, host);
         ts.Debug.assert(!!state.currentAffectedFilesExportedModulesMap);
-        // Go through exported modules from cache first
         // If exported modules has path, all files referencing file exported from are affected
-        (_a = state.currentAffectedFilesExportedModulesMap.getKeys(filePath)) === null || _a === void 0 ? void 0 : _a.forEach(function (exportedFromPath) {
-            return forEachFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile, fn);
-        });
-        // If exported from path is not from cache and exported modules has path, all files referencing file exported from are affected
-        (_b = state.exportedModulesMap.getKeys(filePath)) === null || _b === void 0 ? void 0 : _b.forEach(function (exportedFromPath) {
-            var _a;
-            // If the cache had an updated value, skip
-            return !state.currentAffectedFilesExportedModulesMap.hasKey(exportedFromPath) &&
-                !((_a = state.currentAffectedFilesExportedModulesMap.deletedKeys()) === null || _a === void 0 ? void 0 : _a.has(exportedFromPath)) &&
-                forEachFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile, fn);
+        forEachKeyOfExportedModulesMap(state, filePath, function (exportedFromPath) {
+            return handleDtsMayChangeOfFileAndExportsOfFile(state, exportedFromPath, seenFileAndExportsOfFile, cancellationToken, computeHash, host);
         });
         // Remove diagnostics of files that import this file (without going to exports of referencing files)
-        (_c = state.referencedMap.getKeys(filePath)) === null || _c === void 0 ? void 0 : _c.forEach(function (referencingFilePath) {
+        (_a = state.referencedMap.getKeys(filePath)) === null || _a === void 0 ? void 0 : _a.forEach(function (referencingFilePath) {
             return !seenFileAndExportsOfFile.has(referencingFilePath) && // Not already removed diagnostic file
-                fn(state, referencingFilePath);
-        } // Dont add to seen since this is not yet done with the export removal
-        );
+                handleDtsMayChangeOf(// Dont add to seen since this is not yet done with the export removal
+                state, referencingFilePath, cancellationToken, computeHash, host);
+        });
+        return undefined;
     }
     /**
      * This is called after completing operation on the next affected file.
@@ -120509,7 +120540,43 @@ var ts;
             return toAffectedFileEmitResult(state, 
             // When whole program is affected, do emit only once (eg when --out or --outFile is specified)
             // Otherwise just affected file
-            ts.Debug.checkDefined(state.program).emit(affected === state.program ? undefined : affected, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles || emitKind === 0 /* DtsOnly */, customTransformers), affected, emitKind, isPendingEmitFile);
+            ts.Debug.checkDefined(state.program).emit(affected === state.program ? undefined : affected, affected !== state.program && ts.getEmitDeclarations(state.compilerOptions) && !customTransformers ?
+                getWriteFileUpdatingSignatureCallback(writeFile) :
+                writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles || emitKind === 0 /* DtsOnly */, customTransformers), affected, emitKind, isPendingEmitFile);
+        }
+        function getWriteFileUpdatingSignatureCallback(writeFile) {
+            return function (fileName, text, writeByteOrderMark, onError, sourceFiles, data) {
+                var _a;
+                if (ts.isDeclarationFileName(fileName)) {
+                    ts.Debug.assert((sourceFiles === null || sourceFiles === void 0 ? void 0 : sourceFiles.length) === 1);
+                    var file = sourceFiles[0];
+                    var info = state.fileInfos.get(file.resolvedPath);
+                    var signature = ((_a = state.currentAffectedFilesSignatures) === null || _a === void 0 ? void 0 : _a.get(file.resolvedPath)) || info.signature;
+                    if (signature === file.version) {
+                        var newSignature = (computeHash || ts.generateDjb2Hash)((data === null || data === void 0 ? void 0 : data.sourceMapUrlPos) !== undefined ? text.substring(0, data.sourceMapUrlPos) : text);
+                        if (newSignature !== file.version) { // Update it
+                            if (host.storeFilesChangingSignatureDuringEmit)
+                                (state.filesChangingSignature || (state.filesChangingSignature = new ts.Set())).add(file.resolvedPath);
+                            if (state.exportedModulesMap)
+                                ts.BuilderState.updateExportedModules(file, file.exportedModulesFromDeclarationEmit, state.currentAffectedFilesExportedModulesMap || (state.currentAffectedFilesExportedModulesMap = ts.BuilderState.createManyToManyPathMap()));
+                            if (state.affectedFiles && state.affectedFilesIndex < state.affectedFiles.length) {
+                                state.currentAffectedFilesSignatures.set(file.resolvedPath, newSignature);
+                            }
+                            else {
+                                info.signature = newSignature;
+                                if (state.exportedModulesMap)
+                                    ts.BuilderState.updateExportedFilesMapFromCache(state, state.currentAffectedFilesExportedModulesMap);
+                            }
+                        }
+                    }
+                }
+                if (writeFile)
+                    writeFile(fileName, text, writeByteOrderMark, onError, sourceFiles, data);
+                else if (host.writeFile)
+                    host.writeFile(fileName, text, writeByteOrderMark, onError, sourceFiles, data);
+                else
+                    state.program.writeFile(fileName, text, writeByteOrderMark, onError, sourceFiles, data);
+            };
         }
         /**
          * Emits the JavaScript and declaration files.
@@ -120566,7 +120633,9 @@ var ts;
                     }
                 }
             }
-            return ts.Debug.checkDefined(state.program).emit(targetSourceFile, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
+            return ts.Debug.checkDefined(state.program).emit(targetSourceFile, !ts.outFile(state.compilerOptions) && ts.getEmitDeclarations(state.compilerOptions) && !customTransformers ?
+                getWriteFileUpdatingSignatureCallback(writeFile) :
+                writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
         }
         /**
          * Return the semantic diagnostics for the next affected file or undefined if iteration is complete
@@ -122758,6 +122827,7 @@ var ts;
             createHash: ts.maybeBind(host, host.createHash),
             readDirectory: ts.maybeBind(host, host.readDirectory),
             disableUseFileVersionAsSignature: host.disableUseFileVersionAsSignature,
+            storeFilesChangingSignatureDuringEmit: host.storeFilesChangingSignatureDuringEmit,
         };
         function writeFile(fileName, text, writeByteOrderMark, onError) {
             try {
@@ -122817,6 +122887,7 @@ var ts;
             createHash: ts.maybeBind(system, system.createHash),
             createProgram: createProgram || ts.createEmitAndSemanticDiagnosticsBuilderProgram,
             disableUseFileVersionAsSignature: system.disableUseFileVersionAsSignature,
+            storeFilesChangingSignatureDuringEmit: system.storeFilesChangingSignatureDuringEmit,
         };
     }
     ts.createProgramHost = createProgramHost;
@@ -122905,6 +122976,7 @@ var ts;
         var host = ts.createCompilerHostWorker(options, /*setParentNodes*/ undefined, system);
         host.createHash = ts.maybeBind(system, system.createHash);
         host.disableUseFileVersionAsSignature = system.disableUseFileVersionAsSignature;
+        host.storeFilesChangingSignatureDuringEmit = system.storeFilesChangingSignatureDuringEmit;
         ts.setGetSourceFileAsHashVersioned(host, system);
         ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return ts.toPath(fileName, host.getCurrentDirectory(), host.getCanonicalFileName); });
         return host;
@@ -131654,7 +131726,7 @@ var ts;
             GlobalsSearch[GlobalsSearch["Success"] = 1] = "Success";
             GlobalsSearch[GlobalsSearch["Fail"] = 2] = "Fail";
         })(GlobalsSearch || (GlobalsSearch = {}));
-        function resolvingModuleSpecifiers(logPrefix, host, program, sourceFile, preferences, isForImportStatementCompletion, cb) {
+        function resolvingModuleSpecifiers(logPrefix, host, program, sourceFile, position, preferences, isForImportStatementCompletion, isValidTypeOnlyUseSite, cb) {
             var _a, _b, _c;
             var start = ts.timestamp();
             var packageJsonImportFilter = ts.createPackageJsonImportFilter(sourceFile, preferences, host);
@@ -131669,9 +131741,9 @@ var ts;
             (_b = host.log) === null || _b === void 0 ? void 0 : _b.call(host, logPrefix + ": response is " + (resolutionLimitExceeded ? "incomplete" : "complete"));
             (_c = host.log) === null || _c === void 0 ? void 0 : _c.call(host, logPrefix + ": " + (ts.timestamp() - start));
             return result;
-            function tryResolve(exportInfo, isFromAmbientModule) {
+            function tryResolve(exportInfo, symbolName, isFromAmbientModule) {
                 if (isFromAmbientModule) {
-                    var result_1 = ts.codefix.getModuleSpecifierForBestExportInfo(exportInfo, sourceFile, program, host, preferences);
+                    var result_1 = ts.codefix.getModuleSpecifierForBestExportInfo(exportInfo, symbolName, position, isValidTypeOnlyUseSite, sourceFile, program, host, preferences);
                     if (result_1) {
                         ambientCount++;
                     }
@@ -131680,7 +131752,7 @@ var ts;
                 var shouldResolveModuleSpecifier = isForImportStatementCompletion || preferences.allowIncompleteCompletions && resolvedCount < Completions.moduleSpecifierResolutionLimit;
                 var shouldGetModuleSpecifierFromCache = !shouldResolveModuleSpecifier && preferences.allowIncompleteCompletions && cacheAttemptCount < Completions.moduleSpecifierResolutionCacheAttemptLimit;
                 var result = (shouldResolveModuleSpecifier || shouldGetModuleSpecifierFromCache)
-                    ? ts.codefix.getModuleSpecifierForBestExportInfo(exportInfo, sourceFile, program, host, preferences, packageJsonImportFilter, shouldGetModuleSpecifierFromCache)
+                    ? ts.codefix.getModuleSpecifierForBestExportInfo(exportInfo, symbolName, position, isValidTypeOnlyUseSite, sourceFile, program, host, preferences, packageJsonImportFilter, shouldGetModuleSpecifierFromCache)
                     : undefined;
                 if (!shouldResolveModuleSpecifier && !shouldGetModuleSpecifierFromCache || shouldGetModuleSpecifierFromCache && !result) {
                     resolutionLimitExceeded = true;
@@ -131785,8 +131857,8 @@ var ts;
                 return undefined;
             var lowerCaseTokenText = location.text.toLowerCase();
             var exportMap = ts.getExportInfoMap(file, host, program, cancellationToken);
-            var newEntries = resolvingModuleSpecifiers("continuePreviousIncompleteResponse", host, program, file, preferences, 
-            /*isForImportStatementCompletion*/ false, function (context) {
+            var newEntries = resolvingModuleSpecifiers("continuePreviousIncompleteResponse", host, program, file, location.getStart(), preferences, 
+            /*isForImportStatementCompletion*/ false, ts.isValidTypeOnlyAliasUseSite(location), function (context) {
                 var entries = ts.mapDefined(previousResponse.entries, function (entry) {
                     if (!entry.hasAction || !entry.source || !entry.data || completionEntryDataIsResolved(entry.data)) {
                         // Not an auto import or already resolved; keep as is
@@ -131798,7 +131870,7 @@ var ts;
                     }
                     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)));
+                    var result = info && context.tryResolve(info, entry.name, !ts.isExternalModuleNameRelative(ts.stripQuotes(origin.moduleSymbol.name)));
                     if (!result)
                         return entry;
                     var newOrigin = __assign(__assign({}, origin), { kind: 32 /* ResolvedExport */, moduleSpecifier: result.moduleSpecifier });
@@ -132390,22 +132462,44 @@ var ts;
             }
         }
         function createSnippetPrinter(printerOptions) {
+            var escapes;
             var baseWriter = ts.textChanges.createWriter(ts.getNewLineCharacter(printerOptions));
             var printer = ts.createPrinter(printerOptions, baseWriter);
-            var writer = __assign(__assign({}, baseWriter), { write: function (s) { return baseWriter.write(ts.escapeSnippetText(s)); }, nonEscapingWrite: baseWriter.write, writeLiteral: function (s) { return baseWriter.writeLiteral(ts.escapeSnippetText(s)); }, writeStringLiteral: function (s) { return baseWriter.writeStringLiteral(ts.escapeSnippetText(s)); }, writeSymbol: function (s, symbol) { return baseWriter.writeSymbol(ts.escapeSnippetText(s), symbol); }, writeParameter: function (s) { return baseWriter.writeParameter(ts.escapeSnippetText(s)); }, writeComment: function (s) { return baseWriter.writeComment(ts.escapeSnippetText(s)); }, writeProperty: function (s) { return baseWriter.writeProperty(ts.escapeSnippetText(s)); } });
+            var writer = __assign(__assign({}, baseWriter), { write: function (s) { return escapingWrite(s, function () { return baseWriter.write(s); }); }, nonEscapingWrite: baseWriter.write, writeLiteral: function (s) { return escapingWrite(s, function () { return baseWriter.writeLiteral(s); }); }, writeStringLiteral: function (s) { return escapingWrite(s, function () { return baseWriter.writeStringLiteral(s); }); }, writeSymbol: function (s, symbol) { return escapingWrite(s, function () { return baseWriter.writeSymbol(s, symbol); }); }, writeParameter: function (s) { return escapingWrite(s, function () { return baseWriter.writeParameter(s); }); }, writeComment: function (s) { return escapingWrite(s, function () { return baseWriter.writeComment(s); }); }, writeProperty: function (s) { return escapingWrite(s, function () { return baseWriter.writeProperty(s); }); } });
             return {
                 printSnippetList: printSnippetList,
                 printAndFormatSnippetList: printAndFormatSnippetList,
             };
+            // The formatter/scanner will have issues with snippet-escaped text,
+            // so instead of writing the escaped text directly to the writer,
+            // generate a set of changes that can be applied to the unescaped text
+            // to escape it post-formatting.
+            function escapingWrite(s, write) {
+                var escaped = ts.escapeSnippetText(s);
+                if (escaped !== s) {
+                    var start = baseWriter.getTextPos();
+                    write();
+                    var end = baseWriter.getTextPos();
+                    escapes = ts.append(escapes || (escapes = []), { newText: escaped, span: { start: start, length: end - start } });
+                }
+                else {
+                    write();
+                }
+            }
             /* Snippet-escaping version of `printer.printList`. */
             function printSnippetList(format, list, sourceFile) {
+                var unescaped = printUnescapedSnippetList(format, list, sourceFile);
+                return escapes ? ts.textChanges.applyChanges(unescaped, escapes) : unescaped;
+            }
+            function printUnescapedSnippetList(format, list, sourceFile) {
+                escapes = undefined;
                 writer.clear();
                 printer.writeList(format, list, sourceFile, writer);
                 return writer.getText();
             }
             function printAndFormatSnippetList(format, list, sourceFile, formatContext) {
                 var syntheticFile = {
-                    text: printSnippetList(format, list, sourceFile),
+                    text: printUnescapedSnippetList(format, list, sourceFile),
                     getLineAndCharacterOfPosition: function (pos) {
                         return ts.getLineAndCharacterOfPosition(this, pos);
                     },
@@ -132417,7 +132511,10 @@ var ts;
                     /* indentation */ 0, 
                     /* delta */ 0, __assign(__assign({}, formatContext), { options: formatOptions }));
                 });
-                return ts.textChanges.applyChanges(syntheticFile.text, changes);
+                var allChanges = escapes
+                    ? ts.stableSort(ts.concatenate(changes, escapes), function (a, b) { return ts.compareTextSpans(a.span, b.span); })
+                    : changes;
+                return ts.textChanges.applyChanges(syntheticFile.text, allChanges);
             }
         }
         function originToCompletionEntryData(origin) {
@@ -133309,7 +133406,7 @@ var ts;
                                     moduleSymbol: moduleSymbol,
                                     symbol: firstAccessibleSymbol,
                                     targetFlags: ts.skipAlias(firstAccessibleSymbol, typeChecker).flags,
-                                }], sourceFile, program, host, preferences) || {}).moduleSpecifier;
+                                }], firstAccessibleSymbol.name, position, ts.isValidTypeOnlyAliasUseSite(location), sourceFile, program, host, preferences) || {}).moduleSpecifier;
                             if (moduleSpecifier) {
                                 var origin = {
                                     kind: getNullableSymbolOriginInfoKind(6 /* SymbolMemberExport */),
@@ -133564,7 +133661,7 @@ var ts;
                 var exportInfo = ts.getExportInfoMap(sourceFile, host, program, cancellationToken);
                 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) {
+                resolvingModuleSpecifiers("collectAutoImports", host, program, sourceFile, position, preferences, !!importCompletionNode, ts.isValidTypeOnlyAliasUseSite(location), function (context) {
                     exportInfo.search(sourceFile.path, 
                     /*preferCapitalized*/ isRightOfOpenTag, function (symbolName, targetFlags) {
                         if (!ts.isIdentifierText(symbolName, ts.getEmitScriptTarget(host.getCompilationSettings())))
@@ -133592,7 +133689,7 @@ var ts;
                         }
                         // If we don't need to resolve module specifiers, we can use any re-export that is importable at all
                         // (We need to ensure that at least one is importable to show a completion.)
-                        var _a = context.tryResolve(info, isFromAmbientModule) || {}, _b = _a.exportInfo, exportInfo = _b === void 0 ? defaultExportInfo : _b, moduleSpecifier = _a.moduleSpecifier;
+                        var _a = context.tryResolve(info, symbolName, isFromAmbientModule) || {}, _b = _a.exportInfo, exportInfo = _b === void 0 ? defaultExportInfo : _b, moduleSpecifier = _a.moduleSpecifier;
                         var isDefaultExport = exportInfo.exportKind === 1 /* Default */;
                         var symbol = isDefaultExport && ts.getLocalSymbolForExportDefault(exportInfo.symbol) || exportInfo.symbol;
                         pushAutoImportSymbol(symbol, {
@@ -152416,7 +152513,7 @@ var ts;
                 var symbol = checker.getMergedSymbol(ts.skipAlias(exportedSymbol, checker));
                 var exportInfo = getAllReExportingModules(sourceFile, symbol, moduleSymbol, symbolName, /*isJsxTagName*/ false, host, program, preferences, useAutoImportProvider);
                 var useRequire = shouldUseRequire(sourceFile, program);
-                var fix = getImportFixForSymbol(sourceFile, exportInfo, moduleSymbol, symbolName, program, /*position*/ undefined, !!isValidTypeOnlyUseSite, useRequire, host, preferences);
+                var fix = getImportFixForSymbol(sourceFile, exportInfo, moduleSymbol, program, /*useNamespaceInfo*/ undefined, !!isValidTypeOnlyUseSite, useRequire, host, preferences);
                 if (fix) {
                     addImport({ fixes: [fix], symbolName: symbolName, errorIdentifierText: undefined });
                 }
@@ -152586,7 +152683,7 @@ var ts;
                 : getAllReExportingModules(sourceFile, targetSymbol, moduleSymbol, symbolName, isJsxTagName, host, program, preferences, /*useAutoImportProvider*/ true);
             var useRequire = shouldUseRequire(sourceFile, program);
             var isValidTypeOnlyUseSite = ts.isValidTypeOnlyAliasUseSite(ts.getTokenAtPosition(sourceFile, position));
-            var fix = ts.Debug.checkDefined(getImportFixForSymbol(sourceFile, exportInfos, moduleSymbol, symbolName, program, position, isValidTypeOnlyUseSite, useRequire, host, preferences));
+            var fix = ts.Debug.checkDefined(getImportFixForSymbol(sourceFile, exportInfos, moduleSymbol, program, { symbolName: symbolName, position: position }, isValidTypeOnlyUseSite, useRequire, host, preferences));
             return {
                 moduleSpecifier: fix.moduleSpecifier,
                 codeAction: codeFixActionToCodeAction(codeActionForFix({ host: host, formatContext: formatContext, preferences: preferences }, sourceFile, symbolName, fix, 
@@ -152602,10 +152699,10 @@ var ts;
             return fix && codeFixActionToCodeAction(codeActionForFix({ host: host, formatContext: formatContext, preferences: preferences }, sourceFile, symbolName, fix, includeSymbolNameInDescription, 1 /* Double */, compilerOptions));
         }
         codefix.getPromoteTypeOnlyCompletionAction = getPromoteTypeOnlyCompletionAction;
-        function getImportFixForSymbol(sourceFile, exportInfos, moduleSymbol, symbolName, program, position, isValidTypeOnlyUseSite, useRequire, host, preferences) {
+        function getImportFixForSymbol(sourceFile, exportInfos, moduleSymbol, program, useNamespaceInfo, isValidTypeOnlyUseSite, useRequire, host, preferences) {
             ts.Debug.assert(exportInfos.some(function (info) { return info.moduleSymbol === moduleSymbol || info.symbol.parent === moduleSymbol; }), "Some exportInfo should match the specified moduleSymbol");
             var packageJsonImportFilter = ts.createPackageJsonImportFilter(sourceFile, preferences, host);
-            return getBestFix(getImportFixes(exportInfos, symbolName, position, isValidTypeOnlyUseSite, useRequire, program, sourceFile, host, preferences), sourceFile, program, packageJsonImportFilter, host);
+            return getBestFix(getImportFixes(exportInfos, useNamespaceInfo, isValidTypeOnlyUseSite, useRequire, program, sourceFile, host, preferences).fixes, sourceFile, program, packageJsonImportFilter, host);
         }
         function codeFixActionToCodeAction(_a) {
             var description = _a.description, changes = _a.changes, commands = _a.commands;
@@ -152660,25 +152757,32 @@ var ts;
                 return !moduleFile || ts.isImportableFile(program, importingFile, moduleFile, preferences, /*packageJsonFilter*/ undefined, getModuleSpecifierResolutionHost(isFromPackageJson), (_a = host.getModuleSpecifierCache) === null || _a === void 0 ? void 0 : _a.call(host));
             }
         }
-        function getModuleSpecifierForBestExportInfo(exportInfo, importingFile, program, host, preferences, packageJsonImportFilter, fromCacheOnly) {
-            var _a = getNewImportFixes(program, importingFile, 
-            /*position*/ undefined, 
-            /*isValidTypeOnlyUseSite*/ false, 
-            /*useRequire*/ false, exportInfo, host, preferences, fromCacheOnly), fixes = _a.fixes, computedWithoutCacheCount = _a.computedWithoutCacheCount;
+        function getModuleSpecifierForBestExportInfo(exportInfo, symbolName, position, isValidTypeOnlyUseSite, importingFile, program, host, preferences, packageJsonImportFilter, fromCacheOnly) {
+            var _a = getImportFixes(exportInfo, { symbolName: symbolName, position: position }, isValidTypeOnlyUseSite, 
+            /*useRequire*/ false, program, importingFile, host, preferences, fromCacheOnly), fixes = _a.fixes, computedWithoutCacheCount = _a.computedWithoutCacheCount;
             var result = getBestFix(fixes, importingFile, program, packageJsonImportFilter || ts.createPackageJsonImportFilter(importingFile, preferences, host), host);
             return result && __assign(__assign({}, result), { computedWithoutCacheCount: computedWithoutCacheCount });
         }
         codefix.getModuleSpecifierForBestExportInfo = getModuleSpecifierForBestExportInfo;
-        function getImportFixes(exportInfos, symbolName, 
+        function getImportFixes(exportInfos, useNamespaceInfo, 
         /** undefined only for missing JSX namespace */
-        position, isValidTypeOnlyUseSite, useRequire, program, sourceFile, host, preferences) {
+        isValidTypeOnlyUseSite, useRequire, program, sourceFile, host, preferences, fromCacheOnly) {
             var checker = program.getTypeChecker();
             var existingImports = ts.flatMap(exportInfos, function (info) { return getExistingImportDeclarations(info, checker, sourceFile, program.getCompilerOptions()); });
-            var useNamespace = position === undefined ? undefined : tryUseExistingNamespaceImport(existingImports, symbolName, position, checker);
+            var useNamespace = useNamespaceInfo && tryUseExistingNamespaceImport(existingImports, useNamespaceInfo.symbolName, useNamespaceInfo.position, checker);
             var addToExisting = tryAddToExistingImport(existingImports, isValidTypeOnlyUseSite, checker, program.getCompilerOptions());
-            // Don't bother providing an action to add a new import if we can add to an existing one.
-            var addImport = addToExisting ? [addToExisting] : getFixesForAddImport(exportInfos, existingImports, program, sourceFile, position, isValidTypeOnlyUseSite, useRequire, host, preferences);
-            return __spreadArray(__spreadArray([], (useNamespace ? [useNamespace] : ts.emptyArray), true), addImport, true);
+            if (addToExisting) {
+                // Don't bother providing an action to add a new import if we can add to an existing one.
+                return {
+                    computedWithoutCacheCount: 0,
+                    fixes: __spreadArray(__spreadArray([], (useNamespace ? [useNamespace] : ts.emptyArray), true), [addToExisting], false),
+                };
+            }
+            var _a = getFixesForAddImport(exportInfos, existingImports, program, sourceFile, useNamespaceInfo === null || useNamespaceInfo === void 0 ? void 0 : useNamespaceInfo.position, isValidTypeOnlyUseSite, useRequire, host, preferences, fromCacheOnly), fixes = _a.fixes, _b = _a.computedWithoutCacheCount, computedWithoutCacheCount = _b === void 0 ? 0 : _b;
+            return {
+                computedWithoutCacheCount: computedWithoutCacheCount,
+                fixes: __spreadArray(__spreadArray([], (useNamespace ? [useNamespace] : ts.emptyArray), true), fixes, true),
+            };
         }
         function tryUseExistingNamespaceImport(existingImports, symbolName, position, checker) {
             // It is possible that multiple import statements with the same specifier exist in the file.
@@ -152868,9 +152972,9 @@ var ts;
             });
             return { computedWithoutCacheCount: computedWithoutCacheCount, fixes: fixes };
         }
-        function getFixesForAddImport(exportInfos, existingImports, program, sourceFile, position, isValidTypeOnlyUseSite, useRequire, host, preferences) {
+        function getFixesForAddImport(exportInfos, existingImports, program, sourceFile, position, isValidTypeOnlyUseSite, useRequire, host, preferences, fromCacheOnly) {
             var existingDeclaration = ts.firstDefined(existingImports, function (info) { return newImportInfoFromExistingSpecifier(info, isValidTypeOnlyUseSite, useRequire, program.getTypeChecker(), program.getCompilerOptions()); });
-            return existingDeclaration ? [existingDeclaration] : getNewImportFixes(program, sourceFile, position, isValidTypeOnlyUseSite, useRequire, exportInfos, host, preferences).fixes;
+            return existingDeclaration ? { fixes: [existingDeclaration] } : getNewImportFixes(program, sourceFile, position, isValidTypeOnlyUseSite, useRequire, exportInfos, host, preferences, fromCacheOnly);
         }
         function newImportInfoFromExistingSpecifier(_a, isValidTypeOnlyUseSite, useRequire, checker, compilerOptions) {
             var _b;
@@ -152966,7 +153070,8 @@ var ts;
             var symbolName = umdSymbol.name;
             var exportInfo = [{ symbol: umdSymbol, moduleSymbol: symbol, moduleFileName: undefined, exportKind: 3 /* UMD */, targetFlags: symbol.flags, isFromPackageJson: false }];
             var useRequire = shouldUseRequire(sourceFile, program);
-            var fixes = getImportFixes(exportInfo, symbolName, ts.isIdentifier(token) ? token.getStart(sourceFile) : undefined, /*isValidTypeOnlyUseSite*/ false, useRequire, program, sourceFile, host, preferences);
+            var position = ts.isIdentifier(token) ? token.getStart(sourceFile) : undefined;
+            var fixes = getImportFixes(exportInfo, position ? { position: position, symbolName: symbolName } : undefined, /*isValidTypeOnlyUseSite*/ false, useRequire, program, sourceFile, host, preferences).fixes;
             return { fixes: fixes, symbolName: symbolName, errorIdentifierText: (_b = ts.tryCast(token, ts.isIdentifier)) === null || _b === void 0 ? void 0 : _b.text };
         }
         function getUmdSymbol(token, checker) {
@@ -153038,7 +153143,7 @@ var ts;
             var exportInfo = getExportInfos(symbolName, ts.isJSXTagName(symbolToken), ts.getMeaningFromLocation(symbolToken), cancellationToken, sourceFile, program, useAutoImportProvider, host, preferences);
             var fixes = ts.arrayFrom(ts.flatMapIterator(exportInfo.entries(), function (_a) {
                 var _ = _a[0], exportInfos = _a[1];
-                return getImportFixes(exportInfos, symbolName, symbolToken.getStart(sourceFile), isValidTypeOnlyUseSite, useRequire, program, sourceFile, host, preferences);
+                return getImportFixes(exportInfos, { symbolName: symbolName, position: symbolToken.getStart(sourceFile) }, isValidTypeOnlyUseSite, useRequire, program, sourceFile, host, preferences).fixes;
             }));
             return { fixes: fixes, symbolName: symbolName, errorIdentifierText: symbolToken.text };
         }