Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly set sourceFileInfo for bundle when generating output without creating program

Browse Source
This commit is contained in:
Sheetal Nandi
2019-02-21 12:54:00 -08:00
parent e9fb843e56
commit ad72aef4b1
13 changed files with 204 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/emitter.ts
+8 -2
View File
@@ -537,7 +537,7 @@ namespace ts {
if ((declarationMapPath && !declarationMapText) || config.options.inlineSourceMap) return declarationMapPath || "inline sourcemap decoding";
const buildInfo = JSON.parse(buildInfoText) as BuildInfo;
if (!buildInfo.bundle || !buildInfo.bundle.js || (declarationMapText && !buildInfo.bundle.dts)) return buildInfoPath!;
if (!buildInfo.bundle || !buildInfo.bundle.js || (declarationText && !buildInfo.bundle.dts)) return buildInfoPath!;
const ownPrependInput = createInputFiles(
jsFileText,
declarationText!,
@@ -578,7 +578,13 @@ namespace ts {
case buildInfoPath:
const newBuildInfo = JSON.parse(text) as BuildInfo;
newBuildInfo.program = buildInfo.program;
outputFiles.push({ name, text: getBuildInfoText({ program: buildInfo.program, bundle: newBuildInfo.bundle }), writeByteOrderMark });
// Update sourceFileInfo
const { js, dts } = buildInfo.bundle!;
newBuildInfo.bundle!.js!.sources = js!.sources;
if (dts) {
newBuildInfo.bundle!.dts!.sources = dts.sources;
}
outputFiles.push({ name, text: getBuildInfoText(newBuildInfo), writeByteOrderMark });
return;
case declarationFilePath:
if (declarationText === text) return;
tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/emitHelpers-in-all-projects.js
+6 -1
View File
@@ -423,7 +423,12 @@ const { b, ...rest } = { a: 10, b: 30, yy: 30 };
"end": 1343,
"kind": "sourceMapUrl"
}
]
],
"sources": {
"helpers": [
"typescript:rest"
]
}
},
"dts": {
"sections": [
tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/multiple-emitHelpers-in-all-projects.js
+8 -1
View File
@@ -623,7 +623,14 @@ const { b, ...rest } = { a: 10, b: 30, yy: 30 };
"end": 2661,
"kind": "sourceMapUrl"
}
]
],
"sources": {
"helpers": [
"typescript:rest",
"typescript:read",
"typescript:spread"
]
}
},
"dts": {
"sections": [
tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/multiple-emitHelpers-in-different-projects.js
+6 -1
View File
@@ -435,7 +435,12 @@ const { b, ...rest } = { a: 10, b: 30, yy: 30 };
"end": 2118,
"kind": "sourceMapUrl"
}
]
],
"sources": {
"helpers": [
"typescript:rest"
]
}
},
"dts": {
"sections": [
tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/multiple-prologues-in-all-projects.js
+38 -1
View File
@@ -406,7 +406,44 @@ console.log(s);
"end": 635,
"kind": "sourceMapUrl"
}
]
],
"sources": {
"prologues": [
{
"file": "/src/third/third_part1.ts",
"text": "\"myPrologue3\";\n\"myPrologue\";",
"directives": [
{
"pos": -1,
"end": -1,
"expression": {
"pos": -1,
"end": -1,
"text": "use strict"
}
},
{
"pos": 0,
"end": 14,
"expression": {
"pos": 0,
"end": 13,
"text": "myPrologue3"
}
},
{
"pos": 14,
"end": 28,
"expression": {
"pos": 14,
"end": 27,
"text": "myPrologue"
}
}
]
}
]
}
},
"dts": {
"sections": [
tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/multiple-prologues-in-different-projects.js
+20 -1
View File
@@ -367,7 +367,26 @@ console.log(s);
"end": 619,
"kind": "sourceMapUrl"
}
]
],
"sources": {
"prologues": [
{
"file": "/src/third/third_part1.ts",
"text": "",
"directives": [
{
"pos": -1,
"end": -1,
"expression": {
"pos": -1,
"end": -1,
"text": "use strict"
}
}
]
}
]
}
},
"dts": {
"sections": [
tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/strict-in-all-projects.js
+20 -1
View File
@@ -355,7 +355,26 @@ console.log(s);
"end": 588,
"kind": "sourceMapUrl"
}
]
],
"sources": {
"prologues": [
{
"file": "/src/third/third_part1.ts",
"text": "",
"directives": [
{
"pos": -1,
"end": -1,
"expression": {
"pos": -1,
"end": -1,
"text": "use strict"
}
}
]
}
]
}
},
"dts": {
"sections": [
tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/buildInfo/emitHelpers-in-all-projects.js
+6 -1
View File
@@ -466,7 +466,12 @@ function forfirstfirst_PART1Rest() { }
"end": 1249,
"kind": "sourceMapUrl"
}
]
],
"sources": {
"helpers": [
"typescript:rest"
]
}
},
"dts": {
"sections": [
tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/buildInfo/multiple-emitHelpers-in-all-projects.js
+8 -1
View File
@@ -700,7 +700,14 @@ function forfirstfirst_PART1Rest() { }
"end": 2567,
"kind": "sourceMapUrl"
}
]
],
"sources": {
"helpers": [
"typescript:rest",
"typescript:read",
"typescript:spread"
]
}
},
"dts": {
"sections": [
tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/buildInfo/multiple-emitHelpers-in-different-projects.js
+6 -1
View File
@@ -478,7 +478,12 @@ function forfirstfirst_PART1Rest() { }
"end": 2024,
"kind": "sourceMapUrl"
}
]
],
"sources": {
"helpers": [
"typescript:rest"
]
}
},
"dts": {
"sections": [
tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/buildInfo/multiple-prologues-in-all-projects.js
+38 -1
View File
@@ -549,7 +549,44 @@ console.log(s);
"end": 634,
"kind": "sourceMapUrl"
}
]
],
"sources": {
"prologues": [
{
"file": "/src/third/third_part1.ts",
"text": "\"myPrologue3\";\n\"myPrologue\";",
"directives": [
{
"pos": -1,
"end": -1,
"expression": {
"pos": -1,
"end": -1,
"text": "use strict"
}
},
{
"pos": 0,
"end": 14,
"expression": {
"pos": 0,
"end": 13,
"text": "myPrologue3"
}
},
{
"pos": 14,
"end": 28,
"expression": {
"pos": 14,
"end": 27,
"text": "myPrologue"
}
}
]
}
]
}
},
"dts": {
"sections": [
tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/buildInfo/multiple-prologues-in-different-projects.js
+20 -1
View File
@@ -510,7 +510,26 @@ console.log(s);
"end": 618,
"kind": "sourceMapUrl"
}
]
],
"sources": {
"prologues": [
{
"file": "/src/third/third_part1.ts",
"text": "",
"directives": [
{
"pos": -1,
"end": -1,
"expression": {
"pos": -1,
"end": -1,
"text": "use strict"
}
}
]
}
]
}
},
"dts": {
"sections": [
tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/buildInfo/strict-in-all-projects.js
+20 -1
View File
@@ -498,7 +498,26 @@ console.log(s);
"end": 586,
"kind": "sourceMapUrl"
}
]
],
"sources": {
"prologues": [
{
"file": "/src/third/third_part1.ts",
"text": "",
"directives": [
{
"pos": -1,
"end": -1,
"expression": {
"pos": -1,
"end": -1,
"text": "use strict"
}
}
]
}
]
}
},
"dts": {
"sections": [