microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-10 18:04:18 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Even though .d.ts doesnt change, the map file most likely changes, so emit that

Browse Source
This commit is contained in:
Sheetal Nandi
2019-02-01 18:40:04 -08:00
parent acec3c193a
commit a64e5ad3f3
2 changed files with 23 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/compiler/emitter.ts
View File

@@ -469,7 +469,7 @@ namespace ts {
/*@internal*/
export function emitUsingBuildInfo(config: ParsedCommandLine, host: EmitUsingBuildInfoHost, getCommandLine: (ref: ProjectReference) => ParsedCommandLine | undefined): EmitUsingBuildInfoResult {
const { buildInfoPath, jsFilePath, sourceMapFilePath } = getOutputPathsForBundle(config.options, /*forceDtsPaths*/ false, config.projectReferences);
const { buildInfoPath, jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath } = getOutputPathsForBundle(config.options, /*forceDtsPaths*/ false, config.projectReferences);
const buildInfoText = host.readFile(Debug.assertDefined(buildInfoPath));
if (!buildInfoText) return buildInfoPath!;
const jsFileText = host.readFile(Debug.assertDefined(jsFilePath));
@@ -477,31 +477,34 @@ namespace ts {
const sourceMapText = sourceMapFilePath && host.readFile(sourceMapFilePath);
// error if no source map or for now if inline sourcemap
if ((sourceMapFilePath && !sourceMapText) || config.options.inlineSourceMap) return sourceMapFilePath || "inline sourcemap decoding";
const declarationMapText = declarationMapPath && host.readFile(declarationMapPath);
// error if no source map or for now if inline sourcemap
if ((declarationMapPath && !declarationMapText) || config.options.inlineSourceMap) return declarationMapPath || "inline sourcemap decoding";
// read declaration text
const declarationText = declarationMapText && host.readFile(declarationFilePath!);
if (declarationMapText && !declarationText) return declarationFilePath!;
const buildInfo = JSON.parse(buildInfoText) as BuildInfo;
const ownPrependInput = createInputFiles(
jsFileText,
/*declarationText*/ undefined!,
declarationText!,
sourceMapFilePath,
sourceMapText,
/*declarationMapPath*/ undefined!,
/*declarationMaptext*/ undefined!,
declarationMapPath,
declarationMapText,
jsFilePath,
/*declarationPath*/ undefined,
declarationFilePath,
buildInfoPath,
buildInfo,
/*onlyOwnText*/ true
);
const optionsWithoutDeclaration = clone(config.options);
optionsWithoutDeclaration.declaration = false;
optionsWithoutDeclaration.composite = false;
const outputFiles: OutputFile[] = [];
const emitHost: EmitHost = {
getPrependNodes: () => createPrependNodes(config.projectReferences, getCommandLine, f => host.readFile(f)). concat(ownPrependInput),
getProjectReferences: () => config.projectReferences,
getCanonicalFileName: host.getCanonicalFileName,
getCommonSourceDirectory: () => buildInfo.commonSourceDirectory,
getCompilerOptions: () => optionsWithoutDeclaration,
getCompilerOptions: () => config.options,
getCurrentDirectory: () => host.getCurrentDirectory(),
getNewLine: () => host.getNewLine(),
getSourceFile: notImplemented,
@@ -510,6 +513,8 @@ namespace ts {
getLibFileFromReference: notImplemented,
isSourceFileFromExternalLibrary: notImplemented,
writeFile: (name, text, writeByteOrderMark) => {
// no need to write dts file
if (fileExtensionIs(name, Extension.Dts)) return;
if (name === buildInfoPath) {
// Add dts and sources build info since we are not touching that file
const newBuildInfo = JSON.parse(text) as BuildInfo;
@@ -530,7 +535,7 @@ namespace ts {
emitHost,
/*targetSourceFile*/ undefined,
/*emitOnlyDtsFiles*/ false,
getTransformers(optionsWithoutDeclaration)
getTransformers(config.options)
);
return outputFiles;
}

34
src/testRunner/unittests/tsbuild/outFile.ts
View File

@@ -275,19 +275,10 @@ Mismatch Actual: ${JSON.stringify(mapDefined(arrayFrom(actualReadFileMap.entries
// Additional source Files
...(additionalSourceFiles && additionalSourceFiles.length === 3 ? [additionalSourceFiles[project.first]] : emptyArray),
// outputs without d.ts since we just update js
outputFiles[project.first][ext.js],
outputFiles[project.first][ext.jsmap],
outputFiles[project.first][ext.dts],
outputFiles[project.first][ext.buildinfo],
outputFiles[project.second][ext.js],
outputFiles[project.second][ext.jsmap],
outputFiles[project.second][ext.buildinfo],
// To prepend::
outputFiles[project.third][ext.buildinfo],
outputFiles[project.third][ext.js],
outputFiles[project.third][ext.jsmap]
// outputs to prepend
...outputFiles[project.first],
...outputFiles[project.second],
...outputFiles[project.third]
],
fs => appendFileContent(fs, relSources[project.first][source.ts][part.one], "console.log(s);"),
[
@@ -345,19 +336,10 @@ Mismatch Actual: ${JSON.stringify(mapDefined(arrayFrom(actualReadFileMap.entries
// Additional source Files
...(additionalSourceFiles || emptyArray),
// outputs without d.ts since we just update js
outputFiles[project.first][ext.js],
outputFiles[project.first][ext.jsmap],
outputFiles[project.first][ext.dts],
outputFiles[project.first][ext.buildinfo],
outputFiles[project.second][ext.js],
outputFiles[project.second][ext.jsmap],
outputFiles[project.second][ext.buildinfo],
// To prepend::
outputFiles[project.third][ext.buildinfo],
outputFiles[project.third][ext.js],
outputFiles[project.third][ext.jsmap]
// outputs to prepend
...outputFiles[project.first],
...outputFiles[project.second],
...outputFiles[project.third]
],
fs => modifyAgainFs(fs),
[