@typescript-deploys/pr-build 4.8.0-pr-49156-5 → 4.8.0-pr-49157-6

package/lib/tsc.js

@@ -69223,7 +69223,7 @@ var ts;
                 if (ts.isIdentifier(childNode)) {
                     var childSymbol = getSymbolAtLocation(childNode);
                     if (childSymbol && childSymbol === testedSymbol) {
-                        if (ts.isIdentifier(expr)) {
+                        if (ts.isIdentifier(expr) || ts.isIdentifier(testedNode) && ts.isBinaryExpression(testedNode.parent)) {
                             return true;
                         }
                         var testedExpression = testedNode.parent;
@@ -88406,6 +88406,12 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
+    function getDeclarationDiagnostics(host, resolver, file) {
+        var compilerOptions = host.getCompilerOptions();
+        var result = ts.transformNodes(resolver, host, ts.factory, compilerOptions, file ? [file] : ts.filter(host.getSourceFiles(), ts.isSourceFileNotJson), [transformDeclarations], false);
+        return result.diagnostics;
+    }
+    ts.getDeclarationDiagnostics = getDeclarationDiagnostics;
     function hasInternalAnnotation(range, currentSourceFile) {
         var comment = currentSourceFile.text.substring(range.pos, range.end);
         return ts.stringContains(comment, "@internal");
@@ -90319,13 +90325,6 @@ var ts;
         return ts.Debug.fail("project " + configFile.options.configFilePath + " expected to have at least one output");
     }
     ts.getFirstProjectOutput = getFirstProjectOutput;
-    function getCacheDtsEmitResultKey(sourceFileOrBundle, options) {
-        return ts.isSourceFile(sourceFileOrBundle) ? sourceFileOrBundle.resolvedPath : ts.outFile(options);
-    }
-    ts.getCacheDtsEmitResultKey = getCacheDtsEmitResultKey;
-    function isForceDtsEmitResult(result) {
-        return !!result && !result.transformed;
-    }
     function emitFiles(resolver, host, targetSourceFile, _a, emitOnlyDtsFiles, onlyBuildInfo, forceDtsEmit) {
         var scriptTransformers = _a.scriptTransformers, declarationTransformers = _a.declarationTransformers;
         var compilerOptions = host.getCompilerOptions();
@@ -90337,6 +90336,7 @@ var ts;
         var _b = ts.performance.createTimer("printTime", "beforePrint", "afterPrint"), enter = _b.enter, exit = _b.exit;
         var bundleBuildInfo;
         var emitSkipped = false;
+        var exportedModulesFromDeclarationEmit;
         enter();
         forEachEmittedFile(host, emitSourceFileOrBundle, ts.getSourceFilesToEmit(host, targetSourceFile, forceDtsEmit), forceDtsEmit, onlyBuildInfo, !targetSourceFile);
         exit();
@@ -90345,6 +90345,7 @@ var ts;
             diagnostics: emitterDiagnostics.getDiagnostics(),
             emittedFiles: emittedFilesList,
             sourceMaps: sourceMapDataList,
+            exportedModulesFromDeclarationEmit: exportedModulesFromDeclarationEmit
         };
         function emitSourceFileOrBundle(_a, sourceFileOrBundle) {
             var jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
@@ -90427,13 +90428,13 @@ var ts;
                 isEmitNotificationEnabled: transform.isEmitNotificationEnabled,
                 substituteNode: transform.substituteNode,
             });
-            printSourceFileOrBundle(jsFilePath, sourceMapFilePath, transform, printer, compilerOptions);
+            ts.Debug.assert(transform.transformed.length === 1, "Should only see one output from the transform");
+            printSourceFileOrBundle(jsFilePath, sourceMapFilePath, transform.transformed[0], printer, compilerOptions);
             transform.dispose();
             if (bundleBuildInfo)
                 bundleBuildInfo.js = printer.bundleFileInfo;
         }
         function emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath, relativeToBuildInfo) {
-            var _a, _b;
             if (!sourceFileOrBundle)
                 return;
             if (!declarationFilePath) {
@@ -90444,39 +90445,13 @@ var ts;
             var sourceFiles = ts.isSourceFile(sourceFileOrBundle) ? [sourceFileOrBundle] : sourceFileOrBundle.sourceFiles;
             var filesForEmit = forceDtsEmit ? sourceFiles : ts.filter(sourceFiles, ts.isSourceFileNotJson);
             var inputListOrBundle = ts.outFile(compilerOptions) ? [ts.factory.createBundle(filesForEmit, !ts.isSourceFile(sourceFileOrBundle) ? sourceFileOrBundle.prepends : undefined)] : filesForEmit;
-            var key = getCacheDtsEmitResultKey(sourceFileOrBundle, compilerOptions);
-            var cache = host.getDtsEmitResultCache();
-            var existing = declarationTransformers.length === 1 ? cache.get(key) : undefined;
-            if (isForceDtsEmitResult(existing)) {
-                if ((_a = existing.diagnostics) === null || _a === void 0 ? void 0 : _a.length) {
-                    for (var _c = 0, _d = existing.diagnostics; _c < _d.length; _c++) {
-                        var diagnostic = _d[_c];
-                        emitterDiagnostics.add(diagnostic);
-                    }
-                }
-                var declBlocked_1 = !!((_b = existing.diagnostics) === null || _b === void 0 ? void 0 : _b.length) || !!host.isEmitBlocked(declarationFilePath) || !!compilerOptions.noEmit;
-                emitSkipped = emitSkipped || declBlocked_1;
-                if (!declBlocked_1 || forceDtsEmit) {
-                    if (declarationMapPath && !forceDtsEmit) {
-                        if (sourceMapDataList && existing.sourceMapData) {
-                            sourceMapDataList.push(existing.sourceMapData);
-                        }
-                        ts.writeFile(host, emitterDiagnostics, declarationMapPath, existing.sourceMap, false, sourceFiles);
-                    }
-                    ts.writeFile(host, emitterDiagnostics, declarationFilePath, existing.text, !!compilerOptions.emitBOM, filesForEmit, {
-                        sourceMapUrlPos: existing.sourceMapUrlPos,
-                        exportedModulesFromDeclarationEmit: existing.exportedModulesFromDeclarationEmit,
-                    });
-                }
-                return;
-            }
-            if (!existing && emitOnlyDtsFiles && !ts.getEmitDeclarations(compilerOptions)) {
+            if (emitOnlyDtsFiles && !ts.getEmitDeclarations(compilerOptions)) {
                 filesForEmit.forEach(collectLinkedAliases);
             }
-            var declarationTransform = existing || ts.transformNodes(resolver, host, ts.factory, compilerOptions, inputListOrBundle, declarationTransformers, false);
+            var declarationTransform = ts.transformNodes(resolver, host, ts.factory, compilerOptions, inputListOrBundle, declarationTransformers, false);
             if (ts.length(declarationTransform.diagnostics)) {
-                for (var _e = 0, _f = declarationTransform.diagnostics; _e < _f.length; _e++) {
-                    var diagnostic = _f[_e];
+                for (var _a = 0, _b = declarationTransform.diagnostics; _a < _b.length; _a++) {
+                    var diagnostic = _b[_a];
                     emitterDiagnostics.add(diagnostic);
                 }
             }
@@ -90486,7 +90461,8 @@ var ts;
                 noEmitHelpers: true,
                 module: compilerOptions.module,
                 target: compilerOptions.target,
-                sourceMap: (!forceDtsEmit || !compilerOptions.noEmit) && compilerOptions.declarationMap,
+                sourceMap: compilerOptions.sourceMap,
+                inlineSourceMap: compilerOptions.inlineSourceMap,
                 extendedDiagnostics: compilerOptions.extendedDiagnostics,
                 onlyPrintJsDocStyle: true,
                 writeBundleFileInfo: !!bundleBuildInfo,
@@ -90502,12 +90478,17 @@ var ts;
             var declBlocked = (!!declarationTransform.diagnostics && !!declarationTransform.diagnostics.length) || !!host.isEmitBlocked(declarationFilePath) || !!compilerOptions.noEmit;
             emitSkipped = emitSkipped || declBlocked;
             if (!declBlocked || forceDtsEmit) {
-                printSourceFileOrBundle(declarationFilePath, declarationMapPath, declarationTransform, declarationPrinter, {
-                    sourceMap: printerOptions.sourceMap,
+                ts.Debug.assert(declarationTransform.transformed.length === 1, "Should only see one output from the decl transform");
+                printSourceFileOrBundle(declarationFilePath, declarationMapPath, declarationTransform.transformed[0], declarationPrinter, {
+                    sourceMap: !forceDtsEmit && compilerOptions.declarationMap,
                     sourceRoot: compilerOptions.sourceRoot,
                     mapRoot: compilerOptions.mapRoot,
                     extendedDiagnostics: compilerOptions.extendedDiagnostics,
                 });
+                if (forceDtsEmit && declarationTransform.transformed[0].kind === 305) {
+                    var sourceFile = declarationTransform.transformed[0];
+                    exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit;
+                }
             }
             declarationTransform.dispose();
             if (bundleBuildInfo)
@@ -90526,9 +90507,7 @@ var ts;
             }
             ts.forEachChild(node, collectLinkedAliases);
         }
-        function printSourceFileOrBundle(jsFilePath, sourceMapFilePath, transform, printer, mapOptions) {
-            ts.Debug.assert(transform.transformed.length === 1, "Should only see one output from the transform");
-            var sourceFileOrBundle = transform.transformed[0];
+        function printSourceFileOrBundle(jsFilePath, sourceMapFilePath, sourceFileOrBundle, printer, mapOptions) {
             var bundle = sourceFileOrBundle.kind === 306 ? sourceFileOrBundle : undefined;
             var sourceFile = sourceFileOrBundle.kind === 305 ? sourceFileOrBundle : undefined;
             var sourceFiles = bundle ? bundle.sourceFiles : [sourceFile];
@@ -90543,11 +90522,9 @@ var ts;
                 printer.writeFile(sourceFile, writer, sourceMapGenerator);
             }
             var sourceMapUrlPos;
-            var sourceMap;
-            var sourceMapData;
             if (sourceMapGenerator) {
                 if (sourceMapDataList) {
-                    sourceMapDataList.push(sourceMapData = {
+                    sourceMapDataList.push({
                         inputSourceFileNames: sourceMapGenerator.getSources(),
                         sourceMap: sourceMapGenerator.toJSON()
                     });
@@ -90560,29 +90537,14 @@ var ts;
                     writer.writeComment("//# " + "sourceMappingURL" + "=" + sourceMappingURL);
                 }
                 if (sourceMapFilePath) {
-                    sourceMap = sourceMapGenerator.toString();
-                    if (!forceDtsEmit)
-                        ts.writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap, false, sourceFiles);
+                    var sourceMap = sourceMapGenerator.toString();
+                    ts.writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap, false, sourceFiles);
                 }
             }
             else {
                 writer.writeLine();
             }
-            ts.writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), !!compilerOptions.emitBOM, sourceFiles, {
-                sourceMapUrlPos: sourceMapUrlPos,
-                exportedModulesFromDeclarationEmit: sourceFile === null || sourceFile === void 0 ? void 0 : sourceFile.exportedModulesFromDeclarationEmit,
-            });
-            if (forceDtsEmit) {
-                var key = getCacheDtsEmitResultKey(sourceFileOrBundle, compilerOptions);
-                host.getDtsEmitResultCache().set(key, {
-                    diagnostics: transform.diagnostics,
-                    text: writer.getText(),
-                    sourceMap: sourceMap,
-                    sourceMapData: sourceMapData,
-                    sourceMapUrlPos: sourceMapUrlPos,
-                    exportedModulesFromDeclarationEmit: sourceFile === null || sourceFile === void 0 ? void 0 : sourceFile.exportedModulesFromDeclarationEmit,
-                });
-            }
+            ts.writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), !!compilerOptions.emitBOM, sourceFiles, { sourceMapUrlPos: sourceMapUrlPos });
             writer.clear();
         }
         function shouldEmitSourceMaps(mapOptions, sourceFileOrBundle) {
@@ -90788,7 +90750,6 @@ var ts;
             getSourceFileFromReference: ts.returnUndefined,
             redirectTargetsMap: ts.createMultiMap(),
             getFileIncludeReasons: ts.notImplemented,
-            getDtsEmitResultCache: function () { return new ts.Map(); },
         };
         emitFiles(ts.notImplementedResolver, emitHost, undefined, ts.getTransformers(config.options, customTransformers));
         return outputFiles;
@@ -96220,7 +96181,6 @@ var ts;
         var sourceFileToPackageName = new ts.Map();
         var redirectTargetsMap = ts.createMultiMap();
         var usesUriStyleNodeCoreModules = false;
-        var cacheDtsEmitResult;
         var filesByName = new ts.Map();
         var missingFilePaths;
         var filesByNameIgnoreCase = host.useCaseSensitiveFileNames() ? new ts.Map() : undefined;
@@ -96853,7 +96813,6 @@ var ts;
                 getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); },
                 redirectTargetsMap: redirectTargetsMap,
                 getFileIncludeReasons: program.getFileIncludeReasons,
-                getDtsEmitResultCache: function () { return cacheDtsEmitResult || (cacheDtsEmitResult = new ts.Map()); },
             };
         }
         function writeFile(fileName, text, writeByteOrderMark, onError, sourceFiles, data) {
@@ -97259,30 +97218,7 @@ var ts;
         function getDeclarationDiagnosticsForFileNoCache(sourceFile, cancellationToken) {
             return runWithCancellationToken(function () {
                 var resolver = getTypeChecker().getEmitResolver(sourceFile, cancellationToken);
-                var emitHost = getEmitHost(ts.noop);
-                if (sourceFile) {
-                    if (!ts.outFile(options)) {
-                        var existing = cacheDtsEmitResult === null || cacheDtsEmitResult === void 0 ? void 0 : cacheDtsEmitResult.get(sourceFile.resolvedPath);
-                        if (existing)
-                            return existing.diagnostics || ts.emptyArray;
-                    }
-                    var result = ts.transformNodes(resolver, emitHost, ts.factory, options, [sourceFile], [ts.transformDeclarations], false);
-                    if (!ts.outFile(options)) {
-                        (cacheDtsEmitResult || (cacheDtsEmitResult = new ts.Map())).set(sourceFile.resolvedPath, result);
-                    }
-                    return result.diagnostics || ts.emptyArray;
-                }
-                var diagnostics;
-                ts.forEachEmittedFile(emitHost, function (_emitFileNames, sourceFileOrBundle) {
-                    var key = ts.getCacheDtsEmitResultKey(sourceFileOrBundle, options);
-                    var existing = cacheDtsEmitResult === null || cacheDtsEmitResult === void 0 ? void 0 : cacheDtsEmitResult.get(key);
-                    if (existing)
-                        return existing.diagnostics || ts.emptyArray;
-                    var result = ts.transformNodes(resolver, emitHost, ts.factory, options, [sourceFileOrBundle], [ts.transformDeclarations], false);
-                    diagnostics = ts.addRange(diagnostics, result.diagnostics);
-                    (cacheDtsEmitResult || (cacheDtsEmitResult = new ts.Map())).set(key, result);
-                });
-                return diagnostics || ts.emptyArray;
+                return ts.getDeclarationDiagnostics(getEmitHost(ts.noop), resolver, sourceFile) || ts.emptyArray;
             });
         }
         function getAndCacheDiagnostics(sourceFile, cancellationToken, cache, getDiagnostics) {
@@ -98771,8 +98707,8 @@ var ts;
 (function (ts) {
     function getFileEmitOutput(program, sourceFile, emitOnlyDtsFiles, cancellationToken, customTransformers, forceDtsEmit) {
         var outputFiles = [];
-        var _a = program.emit(sourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers, forceDtsEmit), emitSkipped = _a.emitSkipped, diagnostics = _a.diagnostics;
-        return { outputFiles: outputFiles, emitSkipped: emitSkipped, diagnostics: diagnostics };
+        var _a = program.emit(sourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers, forceDtsEmit), emitSkipped = _a.emitSkipped, diagnostics = _a.diagnostics, exportedModulesFromDeclarationEmit = _a.exportedModulesFromDeclarationEmit;
+        return { outputFiles: outputFiles, emitSkipped: emitSkipped, diagnostics: diagnostics, exportedModulesFromDeclarationEmit: exportedModulesFromDeclarationEmit };
         function writeFile(fileName, text, writeByteOrderMark) {
             outputFiles.push({ name: fileName, writeByteOrderMark: writeByteOrderMark, text: text });
         }
@@ -98998,10 +98934,6 @@ var ts;
             state.hasCalledUpdateShapeSignature.add(path);
         }
         BuilderState.updateSignatureOfFile = updateSignatureOfFile;
-        function getSignatureFromWriteFileText(text, data, computeHash) {
-            return (computeHash || ts.generateDjb2Hash)((data === null || data === void 0 ? void 0 : data.sourceMapUrlPos) !== undefined ? text.substring(0, data.sourceMapUrlPos) : text);
-        }
-        BuilderState.getSignatureFromWriteFileText = getSignatureFromWriteFileText;
         function updateShapeSignature(state, programOfThisState, sourceFile, cacheToUpdateSignature, cancellationToken, computeHash, exportedModulesMapCache, useFileVersionAsSignature) {
             if (useFileVersionAsSignature === void 0) { useFileVersionAsSignature = state.useFileVersionAsSignature; }
             ts.Debug.assert(!!sourceFile);
@@ -99015,14 +98947,15 @@ var ts;
             var prevSignature = info.signature;
             var latestSignature;
             if (!sourceFile.isDeclarationFile && !useFileVersionAsSignature) {
-                programOfThisState.emit(sourceFile, function (fileName, text, _writeByteOrderMark, _onError, _sourceFiles, data) {
-                    ts.Debug.assert(ts.isDeclarationFileName(fileName), "File extension for signature expected to be dts");
-                    ts.Debug.assert(latestSignature === undefined, "Only one file should be set");
-                    latestSignature = getSignatureFromWriteFileText(text, data, computeHash);
+                var emitOutput_1 = getFileEmitOutput(programOfThisState, sourceFile, true, cancellationToken, undefined, true);
+                var firstDts_1 = ts.firstOrUndefined(emitOutput_1.outputFiles);
+                if (firstDts_1) {
+                    ts.Debug.assert(ts.isDeclarationFileName(firstDts_1.name), "File extension for signature expected to be dts", function () { return "Found: " + ts.getAnyExtensionFromPath(firstDts_1.name) + " for " + firstDts_1.name + ":: All output files: " + JSON.stringify(emitOutput_1.outputFiles.map(function (f) { return f.name; })); });
+                    latestSignature = (computeHash || ts.generateDjb2Hash)(firstDts_1.text);
                     if (exportedModulesMapCache && latestSignature !== prevSignature) {
-                        updateExportedModules(sourceFile, data === null || data === void 0 ? void 0 : data.exportedModulesFromDeclarationEmit, exportedModulesMapCache);
+                        updateExportedModules(sourceFile, emitOutput_1.exportedModulesFromDeclarationEmit, exportedModulesMapCache);
                     }
-                }, cancellationToken, true, undefined, true);
+                }
             }
             if (latestSignature === undefined) {
                 latestSignature = sourceFile.version;
@@ -99847,7 +99780,7 @@ var ts;
                     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 = ts.BuilderState.getSignatureFromWriteFileText(text, data, computeHash);
+                        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) {
                             if (host.storeFilesChangingSignatureDuringEmit)
                                 (state.filesChangingSignature || (state.filesChangingSignature = new ts.Set())).add(file.resolvedPath);

package/lib/tsserver.js

@@ -82616,7 +82616,7 @@ var ts;
                     var childSymbol = getSymbolAtLocation(childNode);
                     if (childSymbol && childSymbol === testedSymbol) {
                         // If the test was a simple identifier, the above check is sufficient
-                        if (ts.isIdentifier(expr)) {
+                        if (ts.isIdentifier(expr) || ts.isIdentifier(testedNode) && ts.isBinaryExpression(testedNode.parent)) {
                             return true;
                         }
                         // Otherwise we need to ensure the symbol is called on the same target
@@ -107909,6 +107909,12 @@ var ts;
 /*@internal*/
 var ts;
 (function (ts) {
+    function getDeclarationDiagnostics(host, resolver, file) {
+        var compilerOptions = host.getCompilerOptions();
+        var result = ts.transformNodes(resolver, host, ts.factory, compilerOptions, file ? [file] : ts.filter(host.getSourceFiles(), ts.isSourceFileNotJson), [transformDeclarations], /*allowDtsFiles*/ false);
+        return result.diagnostics;
+    }
+    ts.getDeclarationDiagnostics = getDeclarationDiagnostics;
     function hasInternalAnnotation(range, currentSourceFile) {
         var comment = currentSourceFile.text.substring(range.pos, range.end);
         return ts.stringContains(comment, "@internal");
@@ -110092,14 +110098,6 @@ var ts;
     }
     ts.getFirstProjectOutput = getFirstProjectOutput;
     /*@internal*/
-    function getCacheDtsEmitResultKey(sourceFileOrBundle, options) {
-        return ts.isSourceFile(sourceFileOrBundle) ? sourceFileOrBundle.resolvedPath : ts.outFile(options);
-    }
-    ts.getCacheDtsEmitResultKey = getCacheDtsEmitResultKey;
-    function isForceDtsEmitResult(result) {
-        return !!result && !result.transformed;
-    }
-    /*@internal*/
     // targetSourceFile is when users only want one file in entire project to be emitted. This is used in compileOnSave feature
     function emitFiles(resolver, host, targetSourceFile, _a, emitOnlyDtsFiles, onlyBuildInfo, forceDtsEmit) {
         var scriptTransformers = _a.scriptTransformers, declarationTransformers = _a.declarationTransformers;
@@ -110112,6 +110110,7 @@ var ts;
         var _b = ts.performance.createTimer("printTime", "beforePrint", "afterPrint"), enter = _b.enter, exit = _b.exit;
         var bundleBuildInfo;
         var emitSkipped = false;
+        var exportedModulesFromDeclarationEmit;
         // Emit each output file
         enter();
         forEachEmittedFile(host, emitSourceFileOrBundle, ts.getSourceFilesToEmit(host, targetSourceFile, forceDtsEmit), forceDtsEmit, onlyBuildInfo, !targetSourceFile);
@@ -110121,6 +110120,7 @@ var ts;
             diagnostics: emitterDiagnostics.getDiagnostics(),
             emittedFiles: emittedFilesList,
             sourceMaps: sourceMapDataList,
+            exportedModulesFromDeclarationEmit: exportedModulesFromDeclarationEmit
         };
         function emitSourceFileOrBundle(_a, sourceFileOrBundle) {
             var jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath, declarationMapPath = _a.declarationMapPath, buildInfoPath = _a.buildInfoPath;
@@ -110209,14 +110209,14 @@ var ts;
                 isEmitNotificationEnabled: transform.isEmitNotificationEnabled,
                 substituteNode: transform.substituteNode,
             });
-            printSourceFileOrBundle(jsFilePath, sourceMapFilePath, transform, printer, compilerOptions);
+            ts.Debug.assert(transform.transformed.length === 1, "Should only see one output from the transform");
+            printSourceFileOrBundle(jsFilePath, sourceMapFilePath, transform.transformed[0], printer, compilerOptions);
             // Clean up emit nodes on parse tree
             transform.dispose();
             if (bundleBuildInfo)
                 bundleBuildInfo.js = printer.bundleFileInfo;
         }
         function emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath, relativeToBuildInfo) {
-            var _a, _b;
             if (!sourceFileOrBundle)
                 return;
             if (!declarationFilePath) {
@@ -110228,43 +110228,15 @@ var ts;
             var filesForEmit = forceDtsEmit ? sourceFiles : ts.filter(sourceFiles, ts.isSourceFileNotJson);
             // Setup and perform the transformation to retrieve declarations from the input files
             var inputListOrBundle = ts.outFile(compilerOptions) ? [ts.factory.createBundle(filesForEmit, !ts.isSourceFile(sourceFileOrBundle) ? sourceFileOrBundle.prepends : undefined)] : filesForEmit;
-            // Use existing result:
-            var key = getCacheDtsEmitResultKey(sourceFileOrBundle, compilerOptions);
-            var cache = host.getDtsEmitResultCache();
-            var existing = declarationTransformers.length === 1 ? cache.get(key) : undefined;
-            if (isForceDtsEmitResult(existing)) {
-                if ((_a = existing.diagnostics) === null || _a === void 0 ? void 0 : _a.length) {
-                    for (var _c = 0, _d = existing.diagnostics; _c < _d.length; _c++) {
-                        var diagnostic = _d[_c];
-                        emitterDiagnostics.add(diagnostic);
-                    }
-                }
-                var declBlocked_1 = !!((_b = existing.diagnostics) === null || _b === void 0 ? void 0 : _b.length) || !!host.isEmitBlocked(declarationFilePath) || !!compilerOptions.noEmit;
-                emitSkipped = emitSkipped || declBlocked_1;
-                if (!declBlocked_1 || forceDtsEmit) {
-                    // Write the output file
-                    if (declarationMapPath && !forceDtsEmit) {
-                        if (sourceMapDataList && existing.sourceMapData) {
-                            sourceMapDataList.push(existing.sourceMapData);
-                        }
-                        ts.writeFile(host, emitterDiagnostics, declarationMapPath, existing.sourceMap, /*writeByteOrderMark*/ false, sourceFiles);
-                    }
-                    ts.writeFile(host, emitterDiagnostics, declarationFilePath, existing.text, !!compilerOptions.emitBOM, filesForEmit, {
-                        sourceMapUrlPos: existing.sourceMapUrlPos,
-                        exportedModulesFromDeclarationEmit: existing.exportedModulesFromDeclarationEmit,
-                    });
-                }
-                return;
-            }
-            if (!existing && emitOnlyDtsFiles && !ts.getEmitDeclarations(compilerOptions)) {
+            if (emitOnlyDtsFiles && !ts.getEmitDeclarations(compilerOptions)) {
                 // Checker wont collect the linked aliases since thats only done when declaration is enabled.
                 // Do that here when emitting only dts files
                 filesForEmit.forEach(collectLinkedAliases);
             }
-            var declarationTransform = existing || ts.transformNodes(resolver, host, ts.factory, compilerOptions, inputListOrBundle, declarationTransformers, /*allowDtsFiles*/ false);
+            var declarationTransform = ts.transformNodes(resolver, host, ts.factory, compilerOptions, inputListOrBundle, declarationTransformers, /*allowDtsFiles*/ false);
             if (ts.length(declarationTransform.diagnostics)) {
-                for (var _e = 0, _f = declarationTransform.diagnostics; _e < _f.length; _e++) {
-                    var diagnostic = _f[_e];
+                for (var _a = 0, _b = declarationTransform.diagnostics; _a < _b.length; _a++) {
+                    var diagnostic = _b[_a];
                     emitterDiagnostics.add(diagnostic);
                 }
             }
@@ -110274,8 +110246,8 @@ var ts;
                 noEmitHelpers: true,
                 module: compilerOptions.module,
                 target: compilerOptions.target,
-                // Emit maps when there is noEmit not set with forceDtsEmit
-                sourceMap: (!forceDtsEmit || !compilerOptions.noEmit) && compilerOptions.declarationMap,
+                sourceMap: compilerOptions.sourceMap,
+                inlineSourceMap: compilerOptions.inlineSourceMap,
                 extendedDiagnostics: compilerOptions.extendedDiagnostics,
                 onlyPrintJsDocStyle: true,
                 writeBundleFileInfo: !!bundleBuildInfo,
@@ -110293,13 +110265,18 @@ var ts;
             var declBlocked = (!!declarationTransform.diagnostics && !!declarationTransform.diagnostics.length) || !!host.isEmitBlocked(declarationFilePath) || !!compilerOptions.noEmit;
             emitSkipped = emitSkipped || declBlocked;
             if (!declBlocked || forceDtsEmit) {
-                printSourceFileOrBundle(declarationFilePath, declarationMapPath, declarationTransform, declarationPrinter, {
-                    sourceMap: printerOptions.sourceMap,
+                ts.Debug.assert(declarationTransform.transformed.length === 1, "Should only see one output from the decl transform");
+                printSourceFileOrBundle(declarationFilePath, declarationMapPath, declarationTransform.transformed[0], declarationPrinter, {
+                    sourceMap: !forceDtsEmit && compilerOptions.declarationMap,
                     sourceRoot: compilerOptions.sourceRoot,
                     mapRoot: compilerOptions.mapRoot,
                     extendedDiagnostics: compilerOptions.extendedDiagnostics,
                     // Explicitly do not passthru either `inline` option
                 });
+                if (forceDtsEmit && declarationTransform.transformed[0].kind === 305 /* SourceFile */) {
+                    var sourceFile = declarationTransform.transformed[0];
+                    exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit;
+                }
             }
             declarationTransform.dispose();
             if (bundleBuildInfo)
@@ -110318,9 +110295,7 @@ var ts;
             }
             ts.forEachChild(node, collectLinkedAliases);
         }
-        function printSourceFileOrBundle(jsFilePath, sourceMapFilePath, transform, printer, mapOptions) {
-            ts.Debug.assert(transform.transformed.length === 1, "Should only see one output from the transform");
-            var sourceFileOrBundle = transform.transformed[0];
+        function printSourceFileOrBundle(jsFilePath, sourceMapFilePath, sourceFileOrBundle, printer, mapOptions) {
             var bundle = sourceFileOrBundle.kind === 306 /* Bundle */ ? sourceFileOrBundle : undefined;
             var sourceFile = sourceFileOrBundle.kind === 305 /* SourceFile */ ? sourceFileOrBundle : undefined;
             var sourceFiles = bundle ? bundle.sourceFiles : [sourceFile];
@@ -110335,11 +110310,9 @@ var ts;
                 printer.writeFile(sourceFile, writer, sourceMapGenerator);
             }
             var sourceMapUrlPos;
-            var sourceMap;
-            var sourceMapData;
             if (sourceMapGenerator) {
                 if (sourceMapDataList) {
-                    sourceMapDataList.push(sourceMapData = {
+                    sourceMapDataList.push({
                         inputSourceFileNames: sourceMapGenerator.getSources(),
                         sourceMap: sourceMapGenerator.toJSON()
                     });
@@ -110353,31 +110326,15 @@ var ts;
                 }
                 // Write the source map
                 if (sourceMapFilePath) {
-                    sourceMap = sourceMapGenerator.toString();
-                    if (!forceDtsEmit)
-                        ts.writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap, /*writeByteOrderMark*/ false, sourceFiles);
+                    var sourceMap = sourceMapGenerator.toString();
+                    ts.writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap, /*writeByteOrderMark*/ false, sourceFiles);
                 }
             }
             else {
                 writer.writeLine();
             }
             // Write the output file
-            ts.writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), !!compilerOptions.emitBOM, sourceFiles, {
-                sourceMapUrlPos: sourceMapUrlPos,
-                exportedModulesFromDeclarationEmit: sourceFile === null || sourceFile === void 0 ? void 0 : sourceFile.exportedModulesFromDeclarationEmit,
-            });
-            if (forceDtsEmit) {
-                // Store the result
-                var key = getCacheDtsEmitResultKey(sourceFileOrBundle, compilerOptions);
-                host.getDtsEmitResultCache().set(key, {
-                    diagnostics: transform.diagnostics,
-                    text: writer.getText(),
-                    sourceMap: sourceMap,
-                    sourceMapData: sourceMapData,
-                    sourceMapUrlPos: sourceMapUrlPos,
-                    exportedModulesFromDeclarationEmit: sourceFile === null || sourceFile === void 0 ? void 0 : sourceFile.exportedModulesFromDeclarationEmit,
-                });
-            }
+            ts.writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), !!compilerOptions.emitBOM, sourceFiles, { sourceMapUrlPos: sourceMapUrlPos });
             // Reset state
             writer.clear();
         }
@@ -110606,7 +110563,6 @@ var ts;
             getSourceFileFromReference: ts.returnUndefined,
             redirectTargetsMap: ts.createMultiMap(),
             getFileIncludeReasons: ts.notImplemented,
-            getDtsEmitResultCache: function () { return new ts.Map(); },
         };
         emitFiles(ts.notImplementedResolver, emitHost, 
         /*targetSourceFile*/ undefined, ts.getTransformers(config.options, customTransformers));
@@ -116596,7 +116552,6 @@ var ts;
         // Key is a file name. Value is the (non-empty, or undefined) list of files that redirect to it.
         var redirectTargetsMap = ts.createMultiMap();
         var usesUriStyleNodeCoreModules = false;
-        var cacheDtsEmitResult;
         /**
          * map with
          * - SourceFile if present
@@ -117356,7 +117311,6 @@ var ts;
                 getSourceFileFromReference: function (file, ref) { return program.getSourceFileFromReference(file, ref); },
                 redirectTargetsMap: redirectTargetsMap,
                 getFileIncludeReasons: program.getFileIncludeReasons,
-                getDtsEmitResultCache: function () { return cacheDtsEmitResult || (cacheDtsEmitResult = new ts.Map()); },
             };
         }
         function writeFile(fileName, text, writeByteOrderMark, onError, sourceFiles, data) {
@@ -117815,31 +117769,7 @@ var ts;
             return runWithCancellationToken(function () {
                 var resolver = getTypeChecker().getEmitResolver(sourceFile, cancellationToken);
                 // Don't actually write any files since we're just getting diagnostics.
-                var emitHost = getEmitHost(ts.noop);
-                if (sourceFile) {
-                    if (!ts.outFile(options)) {
-                        // Check from cache
-                        var existing = cacheDtsEmitResult === null || cacheDtsEmitResult === void 0 ? void 0 : cacheDtsEmitResult.get(sourceFile.resolvedPath);
-                        if (existing)
-                            return existing.diagnostics || ts.emptyArray;
-                    }
-                    var result = ts.transformNodes(resolver, emitHost, ts.factory, options, [sourceFile], [ts.transformDeclarations], /*allowDtsFiles*/ false);
-                    if (!ts.outFile(options)) {
-                        (cacheDtsEmitResult || (cacheDtsEmitResult = new ts.Map())).set(sourceFile.resolvedPath, result);
-                    }
-                    return result.diagnostics || ts.emptyArray;
-                }
-                var diagnostics;
-                ts.forEachEmittedFile(emitHost, function (_emitFileNames, sourceFileOrBundle) {
-                    var key = ts.getCacheDtsEmitResultKey(sourceFileOrBundle, options);
-                    var existing = cacheDtsEmitResult === null || cacheDtsEmitResult === void 0 ? void 0 : cacheDtsEmitResult.get(key);
-                    if (existing)
-                        return existing.diagnostics || ts.emptyArray;
-                    var result = ts.transformNodes(resolver, emitHost, ts.factory, options, [sourceFileOrBundle], [ts.transformDeclarations], /*allowDtsFiles*/ false);
-                    diagnostics = ts.addRange(diagnostics, result.diagnostics);
-                    (cacheDtsEmitResult || (cacheDtsEmitResult = new ts.Map())).set(key, result);
-                });
-                return diagnostics || ts.emptyArray;
+                return ts.getDeclarationDiagnostics(getEmitHost(ts.noop), resolver, sourceFile) || ts.emptyArray;
             });
         }
         function getAndCacheDiagnostics(sourceFile, cancellationToken, cache, getDiagnostics) {
@@ -119482,8 +119412,8 @@ var ts;
 (function (ts) {
     function getFileEmitOutput(program, sourceFile, emitOnlyDtsFiles, cancellationToken, customTransformers, forceDtsEmit) {
         var outputFiles = [];
-        var _a = program.emit(sourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers, forceDtsEmit), emitSkipped = _a.emitSkipped, diagnostics = _a.diagnostics;
-        return { outputFiles: outputFiles, emitSkipped: emitSkipped, diagnostics: diagnostics };
+        var _a = program.emit(sourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers, forceDtsEmit), emitSkipped = _a.emitSkipped, diagnostics = _a.diagnostics, exportedModulesFromDeclarationEmit = _a.exportedModulesFromDeclarationEmit;
+        return { outputFiles: outputFiles, emitSkipped: emitSkipped, diagnostics: diagnostics, exportedModulesFromDeclarationEmit: exportedModulesFromDeclarationEmit };
         function writeFile(fileName, text, writeByteOrderMark) {
             outputFiles.push({ name: fileName, writeByteOrderMark: writeByteOrderMark, text: text });
         }
@@ -119755,10 +119685,6 @@ var ts;
             state.hasCalledUpdateShapeSignature.add(path);
         }
         BuilderState.updateSignatureOfFile = updateSignatureOfFile;
-        function getSignatureFromWriteFileText(text, data, computeHash) {
-            return (computeHash || ts.generateDjb2Hash)((data === null || data === void 0 ? void 0 : data.sourceMapUrlPos) !== undefined ? text.substring(0, data.sourceMapUrlPos) : text);
-        }
-        BuilderState.getSignatureFromWriteFileText = getSignatureFromWriteFileText;
         /**
          * Returns if the shape of the signature has changed since last emit
          */
@@ -119776,17 +119702,18 @@ var ts;
             var prevSignature = info.signature;
             var latestSignature;
             if (!sourceFile.isDeclarationFile && !useFileVersionAsSignature) {
-                programOfThisState.emit(sourceFile, function (fileName, text, _writeByteOrderMark, _onError, _sourceFiles, data) {
-                    ts.Debug.assert(ts.isDeclarationFileName(fileName), "File extension for signature expected to be dts");
-                    ts.Debug.assert(latestSignature === undefined, "Only one file should be set");
-                    latestSignature = getSignatureFromWriteFileText(text, data, computeHash);
-                    if (exportedModulesMapCache && latestSignature !== prevSignature) {
-                        updateExportedModules(sourceFile, data === null || data === void 0 ? void 0 : data.exportedModulesFromDeclarationEmit, exportedModulesMapCache);
-                    }
-                }, cancellationToken, 
-                /*emitOnlyDtsFiles*/ true, 
+                var emitOutput_1 = getFileEmitOutput(programOfThisState, sourceFile, 
+                /*emitOnlyDtsFiles*/ true, cancellationToken, 
                 /*customTransformers*/ undefined, 
                 /*forceDtsEmit*/ true);
+                var firstDts_1 = ts.firstOrUndefined(emitOutput_1.outputFiles);
+                if (firstDts_1) {
+                    ts.Debug.assert(ts.isDeclarationFileName(firstDts_1.name), "File extension for signature expected to be dts", function () { return "Found: " + ts.getAnyExtensionFromPath(firstDts_1.name) + " for " + firstDts_1.name + ":: All output files: " + JSON.stringify(emitOutput_1.outputFiles.map(function (f) { return f.name; })); });
+                    latestSignature = (computeHash || ts.generateDjb2Hash)(firstDts_1.text);
+                    if (exportedModulesMapCache && latestSignature !== prevSignature) {
+                        updateExportedModules(sourceFile, emitOutput_1.exportedModulesFromDeclarationEmit, exportedModulesMapCache);
+                    }
+                }
             }
             // Default is to use file version as signature
             if (latestSignature === undefined) {
@@ -120809,7 +120736,7 @@ var ts;
                     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 = ts.BuilderState.getSignatureFromWriteFileText(text, data, computeHash);
+                        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);