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

Store commonSourceDirectory

Browse Source
This commit is contained in:
Sheetal Nandi
2019-02-01 11:42:39 -08:00
parent 66dab21565
commit a41d546f6e
53 changed files with 243 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/emitter.ts
+1 -1
View File
@@ -131,7 +131,7 @@ namespace ts {
};
function emitSourceFileOrBundle({ jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, buildInfoPath }: EmitFileNames, sourceFileOrBundle: SourceFile | Bundle) {
if (buildInfoPath && !emitOnlyDtsFiles) buildInfo = { js: [], dts: [] };
if (buildInfoPath && !emitOnlyDtsFiles) buildInfo = { js: [], dts: [], commonSourceDirectory: host.getCommonSourceDirectory() };
emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, buildInfo && buildInfo.js);
emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath, buildInfo && buildInfo.dts);
// Write bundled offset information if applicable
src/compiler/factory.ts
+11 -7
View File
@@ -2673,8 +2673,8 @@ namespace ts {
sourceMapText: { get() { return mapPathOrType === "js" ? textOrInputFiles.javascriptMapText : textOrInputFiles.declarationMapText; } },
});
const sections = textOrInputFiles.buildInfo ? mapPathOrType === "js" ? textOrInputFiles.buildInfo.js : textOrInputFiles.buildInfo.dts : undefined;
if (sections) {
if (textOrInputFiles.buildInfo) {
const sections = mapPathOrType === "js" ? textOrInputFiles.buildInfo.js : textOrInputFiles.buildInfo.dts;
for (const section of sections) {
switch (section.kind) {
case BundleFileSectionKind.Prologue:
@@ -2777,6 +2777,14 @@ namespace ts {
declarationMapTextOrBuildInfoPath?: string
): InputFiles {
const node = <InputFiles>createNode(SyntaxKind.InputFiles);
let buildInfo: BuildInfo | false;
const getBuildInfo = (getText: () => string | undefined) => {
if (buildInfo === undefined) {
const result = getText();
buildInfo = result !== undefined ? JSON.parse(result) as BuildInfo : false;
}
return buildInfo || undefined;
};
if (!isString(javascriptTextOrReadFileText)) {
const cache = createMap<string | false>();
const textGetter = (path: string | undefined) => {
@@ -2792,10 +2800,6 @@ namespace ts {
const result = textGetter(path);
return result !== undefined ? result : `/* Input file ${path} was missing */\r\n`;
};
const jsonGetter = (path: string | undefined) => {
const result = textGetter(path);
return result !== undefined ? JSON.parse(result) as BuildInfo : undefined;
};
node.javascriptPath = declarationTextOrJavascriptPath;
node.javascriptMapPath = javascriptMapPath;
node.declarationPath = Debug.assertDefined(javascriptMapTextOrDeclarationPath);
@@ -2806,7 +2810,7 @@ namespace ts {
javascriptMapText: { get() { return textGetter(javascriptMapPath); } }, // TODO:: if there is inline sourceMap in jsFile, use that
declarationText: { get() { return definedTextGetter(Debug.assertDefined(javascriptMapTextOrDeclarationPath)); } },
declarationMapText: { get() { return textGetter(declarationMapPath); } }, // TODO:: if there is inline sourceMap in dtsFile, use that
buildInfo: { get() { return jsonGetter(declarationMapTextOrBuildInfoPath); } }
buildInfo: { get() { return getBuildInfo(() => textGetter(declarationMapTextOrBuildInfoPath)); } }
});
}
else {
src/compiler/types.ts
+3 -2
View File
@@ -5531,8 +5531,9 @@ namespace ts {
export type BundleFileInfo = BundleFileSection[];
/* @internal */
export interface BuildInfo {
js?: BundleFileInfo;
dts?: BundleFileInfo;
js: BundleFileInfo;
dts: BundleFileInfo;
commonSourceDirectory: string;
}
export interface PrintHandlers {