Skip to content

Commit d36099c

Browse files
sheetalkamatsheetalkamat
committed
Use absolute paths for buildInfoDirectory
1 parent b9fc44e commit d36099c

6 files changed

Lines changed: 39 additions & 20 deletions

File tree

‎src/compiler/builder.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ namespace ts {
243243

244244
function convertToDiagnostics(diagnostics: ReadonlyArray<ReusableDiagnostic>, newProgram: Program, getCanonicalFileName: GetCanonicalFileName): ReadonlyArray<Diagnostic> {
245245
if (!diagnostics.length) return emptyArray;
246-
const buildInfoDirectory = getDirectoryPath(getOutputPathForBuildInfo(newProgram.getCompilerOptions())!);
246+
const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(getOutputPathForBuildInfo(newProgram.getCompilerOptions())!, newProgram.getCurrentDirectory()));
247247
return diagnostics.map(diagnostic => {
248248
const result: Diagnostic = convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath);
249249
result.reportsUnnecessary = diagnostic.reportsUnnecessary;
@@ -612,7 +612,7 @@ namespace ts {
612612
*/
613613
function getProgramBuildInfo(state: Readonly<ReusableBuilderProgramState>, getCanonicalFileName: GetCanonicalFileName): ProgramBuildInfo | undefined {
614614
if (state.compilerOptions.outFile || state.compilerOptions.out) return undefined;
615-
const buildInfoDirectory = getDirectoryPath(getOutputPathForBuildInfo(state.compilerOptions)!);
615+
const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(getOutputPathForBuildInfo(state.compilerOptions)!, Debug.assertDefined(state.program).getCurrentDirectory()));
616616
const fileInfos: MapLike<BuilderState.FileInfo> = {};
617617
state.fileInfos.forEach((value, key) => {
618618
const signature = state.currentAffectedFilesSignatures && state.currentAffectedFilesSignatures.get(key);
@@ -1015,9 +1015,9 @@ namespace ts {
10151015
return map;
10161016
}
10171017

1018-
export function createBuildProgramUsingProgramBuildInfo(program: ProgramBuildInfo, buildInfoPath: string, useCaseSensitiveFileNames: boolean): EmitAndSemanticDiagnosticsBuilderProgram {
1019-
const buildInfoDirectory = getDirectoryPath(buildInfoPath);
1020-
const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames);
1018+
export function createBuildProgramUsingProgramBuildInfo(program: ProgramBuildInfo, buildInfoPath: string, host: ReadBuildProgramHost): EmitAndSemanticDiagnosticsBuilderProgram {
1019+
const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
1020+
const getCanonicalFileName = createGetCanonicalFileName(host.useCaseSensitiveFileNames());
10211021

10221022
const fileInfos = createMap<BuilderState.FileInfo>();
10231023
for (const key in program.fileInfos) {

‎src/compiler/emitter.ts‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,10 @@ namespace ts {
251251
function emitSourceFileOrBundle({ jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, buildInfoPath }: EmitFileNames, sourceFileOrBundle: SourceFile | Bundle | undefined) {
252252
let buildInfoDirectory: string | undefined;
253253
if (buildInfoPath && sourceFileOrBundle && isBundle(sourceFileOrBundle)) {
254-
buildInfoDirectory = getDirectoryPath(buildInfoPath);
254+
buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
255255
bundleBuildInfo = {
256256
commonSourceDirectory: relativeToBuildInfo(host.getCommonSourceDirectory()),
257-
sourceFiles: sourceFileOrBundle.sourceFiles.map(file => relativeToBuildInfo(file.fileName))
257+
sourceFiles: sourceFileOrBundle.sourceFiles.map(file => relativeToBuildInfo(getNormalizedAbsolutePath(file.fileName, host.getCurrentDirectory())))
258258
};
259259
}
260260
emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, relativeToBuildInfo);
@@ -629,10 +629,14 @@ namespace ts {
629629
getNewLine(): string;
630630
}
631631

632-
function createSourceFilesFromBundleBuildInfo(bundle: BundleBuildInfo, buildInfoDirectory: string): ReadonlyArray<SourceFile> {
632+
function createSourceFilesFromBundleBuildInfo(bundle: BundleBuildInfo, buildInfoDirectory: string, host: EmitUsingBuildInfoHost): ReadonlyArray<SourceFile> {
633633
const sourceFiles = bundle.sourceFiles.map(fileName => {
634634
const sourceFile = createNode(SyntaxKind.SourceFile, 0, 0) as SourceFile;
635-
sourceFile.fileName = getNormalizedAbsolutePath(fileName, buildInfoDirectory);
635+
sourceFile.fileName = getRelativePathFromDirectory(
636+
host.getCurrentDirectory(),
637+
getNormalizedAbsolutePath(fileName, buildInfoDirectory),
638+
!host.useCaseSensitiveFileNames()
639+
);
636640
sourceFile.text = "";
637641
sourceFile.statements = createNodeArray();
638642
return sourceFile;
@@ -676,7 +680,7 @@ namespace ts {
676680

677681
const buildInfo = getBuildInfo(buildInfoText);
678682
if (!buildInfo.bundle || !buildInfo.bundle.js || (declarationText && !buildInfo.bundle.dts)) return buildInfoPath!;
679-
const buildInfoDirectory = getDirectoryPath(buildInfoPath!);
683+
const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(buildInfoPath!, host.getCurrentDirectory()));
680684
const ownPrependInput = createInputFiles(
681685
jsFileText,
682686
declarationText!,
@@ -692,7 +696,7 @@ namespace ts {
692696
);
693697
const outputFiles: OutputFile[] = [];
694698
const prependNodes = createPrependNodes(config.projectReferences, getCommandLine, f => host.readFile(f));
695-
const sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle, buildInfoDirectory);
699+
const sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle, buildInfoDirectory, host);
696700
const emitHost: EmitHost = {
697701
getPrependNodes: memoize(() => [...prependNodes, ownPrependInput]),
698702
getCanonicalFileName: host.getCanonicalFileName,

‎src/compiler/tsbuild.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1298,11 +1298,11 @@ namespace ts {
12981298
}
12991299
}
13001300

1301-
function getOldProgram<T extends BuilderProgram>({ options, builderPrograms, readFileWithCache, host }: SolutionBuilderState<T>, proj: ResolvedConfigFilePath, parsed: ParsedCommandLine) {
1301+
function getOldProgram<T extends BuilderProgram>({ options, builderPrograms, compilerHost }: SolutionBuilderState<T>, proj: ResolvedConfigFilePath, parsed: ParsedCommandLine) {
13021302
if (options.force) return undefined;
13031303
const value = builderPrograms.get(proj);
13041304
if (value) return value;
1305-
return readBuilderProgram(parsed.options, readFileWithCache, host.useCaseSensitiveFileNames()) as any as T;
1305+
return readBuilderProgram(parsed.options, compilerHost) as any as T;
13061306
}
13071307

13081308
function afterProgramCreate<T extends BuilderProgram>({ host, watch, builderPrograms }: SolutionBuilderState<T>, proj: ResolvedConfigFilePath, program: T) {

‎src/compiler/watch.ts‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -437,16 +437,21 @@ namespace ts {
437437
}
438438

439439
namespace ts {
440-
export function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined, useCaseSensitiveFileNames: boolean) {
440+
export interface ReadBuildProgramHost {
441+
useCaseSensitiveFileNames(): boolean;
442+
getCurrentDirectory(): string;
443+
readFile(fileName: string): string | undefined;
444+
}
445+
export function readBuilderProgram(compilerOptions: CompilerOptions, host: ReadBuildProgramHost) {
441446
if (compilerOptions.out || compilerOptions.outFile) return undefined;
442447
const buildInfoPath = getOutputPathForBuildInfo(compilerOptions);
443448
if (!buildInfoPath) return undefined;
444-
const content = readFile(buildInfoPath);
449+
const content = host.readFile(buildInfoPath);
445450
if (!content) return undefined;
446451
const buildInfo = getBuildInfo(content);
447452
if (buildInfo.version !== version) return undefined;
448453
if (!buildInfo.program) return undefined;
449-
return createBuildProgramUsingProgramBuildInfo(buildInfo.program, buildInfoPath, useCaseSensitiveFileNames);
454+
return createBuildProgramUsingProgramBuildInfo(buildInfo.program, buildInfoPath, host);
450455
}
451456

452457
export function createIncrementalCompilerHost(options: CompilerOptions, system = sys): CompilerHost {
@@ -471,7 +476,7 @@ namespace ts {
471476
}: IncrementalProgramOptions<T>): T {
472477
host = host || createIncrementalCompilerHost(options);
473478
createProgram = createProgram || createEmitAndSemanticDiagnosticsBuilderProgram as any as CreateProgram<T>;
474-
const oldProgram = readBuilderProgram(options, path => host!.readFile(path), host.useCaseSensitiveFileNames()) as any as T;
479+
const oldProgram = readBuilderProgram(options, host) as any as T;
475480
return createProgram(rootNames, options, host, oldProgram, configFileParsingDiagnostics, projectReferences);
476481
}
477482

@@ -747,7 +752,7 @@ namespace ts {
747752
((typeDirectiveNames, containingFile, redirectedReference) => resolutionCache.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference));
748753
const userProvidedResolution = !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives;
749754

750-
builderProgram = readBuilderProgram(compilerOptions, path => compilerHost.readFile(path), compilerHost.useCaseSensitiveFileNames()) as any as T;
755+
builderProgram = readBuilderProgram(compilerOptions, compilerHost) as any as T;
751756
synchronizeProgram();
752757

753758
// Update the wild card directory watch

‎tests/baselines/reference/api/tsserverlibrary.d.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4450,7 +4450,12 @@ declare namespace ts {
44504450
function createAbstractBuilder(rootNames: ReadonlyArray<string> | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>, projectReferences?: ReadonlyArray<ProjectReference>): BuilderProgram;
44514451
}
44524452
declare namespace ts {
4453-
function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined, useCaseSensitiveFileNames: boolean): EmitAndSemanticDiagnosticsBuilderProgram | undefined;
4453+
interface ReadBuildProgramHost {
4454+
useCaseSensitiveFileNames(): boolean;
4455+
getCurrentDirectory(): string;
4456+
readFile(fileName: string): string | undefined;
4457+
}
4458+
function readBuilderProgram(compilerOptions: CompilerOptions, host: ReadBuildProgramHost): EmitAndSemanticDiagnosticsBuilderProgram | undefined;
44544459
function createIncrementalCompilerHost(options: CompilerOptions, system?: System): CompilerHost;
44554460
interface IncrementalProgramOptions<T extends BuilderProgram> {
44564461
rootNames: ReadonlyArray<string>;

‎tests/baselines/reference/api/typescript.d.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4450,7 +4450,12 @@ declare namespace ts {
44504450
function createAbstractBuilder(rootNames: ReadonlyArray<string> | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: ReadonlyArray<Diagnostic>, projectReferences?: ReadonlyArray<ProjectReference>): BuilderProgram;
44514451
}
44524452
declare namespace ts {
4453-
function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined, useCaseSensitiveFileNames: boolean): EmitAndSemanticDiagnosticsBuilderProgram | undefined;
4453+
interface ReadBuildProgramHost {
4454+
useCaseSensitiveFileNames(): boolean;
4455+
getCurrentDirectory(): string;
4456+
readFile(fileName: string): string | undefined;
4457+
}
4458+
function readBuilderProgram(compilerOptions: CompilerOptions, host: ReadBuildProgramHost): EmitAndSemanticDiagnosticsBuilderProgram | undefined;
44544459
function createIncrementalCompilerHost(options: CompilerOptions, system?: System): CompilerHost;
44554460
interface IncrementalProgramOptions<T extends BuilderProgram> {
44564461
rootNames: ReadonlyArray<string>;

0 commit comments

Comments
 (0)