From d760cbb74bb63b7f8d2712ae333086857dcf952f Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 17 Jun 2019 14:27:55 -0700 Subject: [PATCH] Make any paths in buildInfoFile to be relative to it. --- src/compiler/builder.ts | 108 +++++++++--------- src/compiler/tsbuild.ts | 4 +- src/compiler/watch.ts | 8 +- .../unittests/tscWatch/incremental.ts | 93 ++++++++------- .../reference/api/tsserverlibrary.d.ts | 2 +- tests/baselines/reference/api/typescript.d.ts | 2 +- .../inferred-type-from-transitive-module.js | 44 +++---- .../inferred-type-from-transitive-module.js | 44 +++---- ...s-merged-and-contains-late-bound-member.js | 24 ++-- ...s-merged-and-contains-late-bound-member.js | 24 ++-- .../incremental-declaration-changes/sample.js | 82 ++++++------- .../when-declaration-option-changes.js | 16 +-- ...en-logic-config-changes-declaration-dir.js | 66 +++++------ .../when-target-option-changes.js | 20 ++-- .../sample.js | 16 +-- .../tsbuild/sample1/initial-Build/sample.js | 82 ++++++------- .../when-declaration-option-changes.js | 16 +-- ...en-logic-config-changes-declaration-dir.js | 82 ++++++------- .../when-logic-specifies-tsBuildInfoFile.js | 82 ++++++------- .../when-target-option-changes.js | 20 ++-- 20 files changed, 420 insertions(+), 415 deletions(-) diff --git a/src/compiler/builder.ts b/src/compiler/builder.ts index d4c2132d36b..541cc24413f 100644 --- a/src/compiler/builder.ts +++ b/src/compiler/builder.ts @@ -10,18 +10,13 @@ namespace ts { export interface ReusableDiagnosticRelatedInformation { category: DiagnosticCategory; code: number; - file: Path | undefined; + file: string | undefined; start: number | undefined; length: number | undefined; messageText: string | ReusableDiagnosticMessageChain; } - export interface ReusableDiagnosticMessageChain { - messageText: string; - category: DiagnosticCategory; - code: number; - next?: ReusableDiagnosticMessageChain; - } + export type ReusableDiagnosticMessageChain = DiagnosticMessageChain; export interface ReusableBuilderProgramState extends ReusableBuilderState { /** @@ -227,7 +222,7 @@ namespace ts { // Unchanged file copy diagnostics const diagnostics = oldState!.semanticDiagnosticsPerFile!.get(sourceFilePath); if (diagnostics) { - state.semanticDiagnosticsPerFile!.set(sourceFilePath, oldState!.hasReusableDiagnostic ? convertToDiagnostics(diagnostics as ReadonlyArray, newProgram) : diagnostics as ReadonlyArray); + state.semanticDiagnosticsPerFile!.set(sourceFilePath, oldState!.hasReusableDiagnostic ? convertToDiagnostics(diagnostics as ReadonlyArray, newProgram, getCanonicalFileName) : diagnostics as ReadonlyArray); if (!state.semanticDiagnosticsFromOldState) { state.semanticDiagnosticsFromOldState = createMap(); } @@ -246,37 +241,32 @@ namespace ts { return state; } - function convertToDiagnostics(diagnostics: ReadonlyArray, newProgram: Program): ReadonlyArray { + function convertToDiagnostics(diagnostics: ReadonlyArray, newProgram: Program, getCanonicalFileName: GetCanonicalFileName): ReadonlyArray { if (!diagnostics.length) return emptyArray; + const buildInfoDirectory = getDirectoryPath(getOutputPathForBuildInfo(newProgram.getCompilerOptions())!); return diagnostics.map(diagnostic => { - const result: Diagnostic = convertToDiagnosticRelatedInformation(diagnostic, newProgram); + const result: Diagnostic = convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath); result.reportsUnnecessary = diagnostic.reportsUnnecessary; result.source = diagnostic.source; const { relatedInformation } = diagnostic; result.relatedInformation = relatedInformation ? relatedInformation.length ? - relatedInformation.map(r => convertToDiagnosticRelatedInformation(r, newProgram)) : + relatedInformation.map(r => convertToDiagnosticRelatedInformation(r, newProgram, toPath)) : emptyArray : undefined; return result; }); + + function toPath(path: string) { + return ts.toPath(path, buildInfoDirectory, getCanonicalFileName); + } } - function convertToDiagnosticRelatedInformation(diagnostic: ReusableDiagnosticRelatedInformation, newProgram: Program): DiagnosticRelatedInformation { - const { file, messageText } = diagnostic; + function convertToDiagnosticRelatedInformation(diagnostic: ReusableDiagnosticRelatedInformation, newProgram: Program, toPath: (path: string) => Path): DiagnosticRelatedInformation { + const { file } = diagnostic; return { ...diagnostic, - file: file && newProgram.getSourceFileByPath(file), - messageText: messageText === undefined || isString(messageText) ? - messageText : - convertToDiagnosticMessageChain(messageText, newProgram) - }; - } - - function convertToDiagnosticMessageChain(diagnostic: ReusableDiagnosticMessageChain, newProgram: Program): DiagnosticMessageChain { - return { - ...diagnostic, - next: diagnostic.next && convertToDiagnosticMessageChain(diagnostic.next, newProgram) + file: file ? newProgram.getSourceFileByPath(toPath(file)) : undefined }; } @@ -620,19 +610,20 @@ namespace ts { /** * Gets the program information to be emitted in buildInfo so that we can use it to create new program */ - function getProgramBuildInfo(state: Readonly): ProgramBuildInfo | undefined { + function getProgramBuildInfo(state: Readonly, getCanonicalFileName: GetCanonicalFileName): ProgramBuildInfo | undefined { if (state.compilerOptions.outFile || state.compilerOptions.out) return undefined; + const buildInfoDirectory = getDirectoryPath(getOutputPathForBuildInfo(state.compilerOptions)!); const fileInfos: MapLike = {}; state.fileInfos.forEach((value, key) => { const signature = state.currentAffectedFilesSignatures && state.currentAffectedFilesSignatures.get(key); - fileInfos[key] = signature === undefined ? value : { version: value.version, signature }; + fileInfos[relativeToBuildInfo(key)] = signature === undefined ? value : { version: value.version, signature }; }); const result: ProgramBuildInfo = { fileInfos, options: state.compilerOptions }; if (state.referencedMap) { const referencedMap: MapLike = {}; state.referencedMap.forEach((value, key) => { - referencedMap[key] = arrayFrom(value.keys()); + referencedMap[relativeToBuildInfo(key)] = arrayFrom(value.keys(), relativeToBuildInfo); }); result.referencedMap = referencedMap; } @@ -642,9 +633,9 @@ namespace ts { state.exportedModulesMap.forEach((value, key) => { const newValue = state.currentAffectedFilesExportedModulesMap && state.currentAffectedFilesExportedModulesMap.get(key); // Not in temporary cache, use existing value - if (newValue === undefined) exportedModulesMap[key] = arrayFrom(value.keys()); + if (newValue === undefined) exportedModulesMap[relativeToBuildInfo(key)] = arrayFrom(value.keys(), relativeToBuildInfo); // Value in cache and has updated value map, use that - else if (newValue) exportedModulesMap[key] = arrayFrom(newValue.keys()); + else if (newValue) exportedModulesMap[relativeToBuildInfo(key)] = arrayFrom(newValue.keys(), relativeToBuildInfo); }); result.exportedModulesMap = exportedModulesMap; } @@ -655,50 +646,44 @@ namespace ts { state.semanticDiagnosticsPerFile.forEach((value, key) => semanticDiagnosticsPerFile.push( value.length ? [ - key, + relativeToBuildInfo(key), state.hasReusableDiagnostic ? value as ReadonlyArray : - convertToReusableDiagnostics(value as ReadonlyArray) + convertToReusableDiagnostics(value as ReadonlyArray, relativeToBuildInfo) ] : - key + relativeToBuildInfo(key) )); result.semanticDiagnosticsPerFile = semanticDiagnosticsPerFile; } return result; + + function relativeToBuildInfo(path: string) { + return ensurePathIsNonModuleName(getRelativePathFromDirectory(buildInfoDirectory, path, getCanonicalFileName)); + } } - function convertToReusableDiagnostics(diagnostics: ReadonlyArray): ReadonlyArray { + function convertToReusableDiagnostics(diagnostics: ReadonlyArray, relativeToBuildInfo: (path: string) => string): ReadonlyArray { Debug.assert(!!diagnostics.length); return diagnostics.map(diagnostic => { - const result: ReusableDiagnostic = convertToReusableDiagnosticRelatedInformation(diagnostic); + const result: ReusableDiagnostic = convertToReusableDiagnosticRelatedInformation(diagnostic, relativeToBuildInfo); result.reportsUnnecessary = diagnostic.reportsUnnecessary; result.source = diagnostic.source; const { relatedInformation } = diagnostic; result.relatedInformation = relatedInformation ? relatedInformation.length ? - relatedInformation.map(r => convertToReusableDiagnosticRelatedInformation(r)) : + relatedInformation.map(r => convertToReusableDiagnosticRelatedInformation(r, relativeToBuildInfo)) : emptyArray : undefined; return result; }); } - function convertToReusableDiagnosticRelatedInformation(diagnostic: DiagnosticRelatedInformation): ReusableDiagnosticRelatedInformation { - const { file, messageText } = diagnostic; + function convertToReusableDiagnosticRelatedInformation(diagnostic: DiagnosticRelatedInformation, relativeToBuildInfo: (path: string) => string): ReusableDiagnosticRelatedInformation { + const { file } = diagnostic; return { ...diagnostic, - file: file && file.path, - messageText: messageText === undefined || isString(messageText) ? - messageText : - convertToReusableDiagnosticMessageChain(messageText) - }; - } - - function convertToReusableDiagnosticMessageChain(diagnostic: DiagnosticMessageChain): ReusableDiagnosticMessageChain { - return { - ...diagnostic, - next: diagnostic.next && convertToReusableDiagnosticMessageChain(diagnostic.next) + file: file ? relativeToBuildInfo(file.path) : undefined }; } @@ -767,7 +752,7 @@ namespace ts { const computeHash = host.createHash || generateDjb2Hash; let state = createBuilderProgramState(newProgram, getCanonicalFileName, oldState); let backupState: BuilderProgramState | undefined; - newProgram.getProgramBuildInfo = () => getProgramBuildInfo(state); + newProgram.getProgramBuildInfo = () => getProgramBuildInfo(state, getCanonicalFileName); // To ensure that we arent storing any references to old program or new program without state newProgram = undefined!; // TODO: GH#18217 @@ -980,26 +965,35 @@ namespace ts { } } - function getMapOfReferencedSet(mapLike: MapLike> | undefined): ReadonlyMap | undefined { + function getMapOfReferencedSet(mapLike: MapLike> | undefined, toPath: (path: string) => Path): ReadonlyMap | undefined { if (!mapLike) return undefined; const map = createMap(); // Copies keys/values from template. Note that for..in will not throw if // template is undefined, and instead will just exit the loop. for (const key in mapLike) { if (hasProperty(mapLike, key)) { - map.set(key, arrayToSet(mapLike[key])); + map.set(toPath(key), arrayToSet(mapLike[key], toPath)); } } return map; } - export function createBuildProgramUsingProgramBuildInfo(program: ProgramBuildInfo): EmitAndSemanticDiagnosticsBuilderProgram { - const fileInfos = createMapFromTemplate(program.fileInfos); + export function createBuildProgramUsingProgramBuildInfo(program: ProgramBuildInfo, buildInfoPath: string, useCaseSensitiveFileNames: boolean): EmitAndSemanticDiagnosticsBuilderProgram { + const buildInfoDirectory = getDirectoryPath(buildInfoPath); + const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames); + + const fileInfos = createMap(); + for (const key in program.fileInfos) { + if (hasProperty(program.fileInfos, key)) { + fileInfos.set(toPath(key), program.fileInfos[key]); + } + } + const state: ReusableBuilderProgramState = { fileInfos, compilerOptions: program.options, - referencedMap: getMapOfReferencedSet(program.referencedMap), - exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap), + referencedMap: getMapOfReferencedSet(program.referencedMap, toPath), + exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap, toPath), semanticDiagnosticsPerFile: program.semanticDiagnosticsPerFile && arrayToMap(program.semanticDiagnosticsPerFile, value => isString(value) ? value : value[0], value => isString(value) ? emptyArray : value[1]), hasReusableDiagnostic: true }; @@ -1025,6 +1019,10 @@ namespace ts { emitNextAffectedFile: notImplemented, getSemanticDiagnosticsOfNextAffectedFile: notImplemented, }; + + function toPath(path: string) { + return ts.toPath(path, buildInfoDirectory, getCanonicalFileName); + } } export function createRedirectedBuilderProgram(state: { program: Program | undefined; compilerOptions: CompilerOptions; }, configFileParsingDiagnostics: ReadonlyArray): BuilderProgram { diff --git a/src/compiler/tsbuild.ts b/src/compiler/tsbuild.ts index 94718a1b368..7e92e727c50 100644 --- a/src/compiler/tsbuild.ts +++ b/src/compiler/tsbuild.ts @@ -1298,11 +1298,11 @@ namespace ts { } } - function getOldProgram({ options, builderPrograms, readFileWithCache }: SolutionBuilderState, proj: ResolvedConfigFilePath, parsed: ParsedCommandLine) { + function getOldProgram({ options, builderPrograms, readFileWithCache, host }: SolutionBuilderState, proj: ResolvedConfigFilePath, parsed: ParsedCommandLine) { if (options.force) return undefined; const value = builderPrograms.get(proj); if (value) return value; - return readBuilderProgram(parsed.options, readFileWithCache) as any as T; + return readBuilderProgram(parsed.options, readFileWithCache, host.useCaseSensitiveFileNames()) as any as T; } function afterProgramCreate({ host, watch, builderPrograms }: SolutionBuilderState, proj: ResolvedConfigFilePath, program: T) { diff --git a/src/compiler/watch.ts b/src/compiler/watch.ts index 3ba2a5f5959..a961c308af1 100644 --- a/src/compiler/watch.ts +++ b/src/compiler/watch.ts @@ -437,7 +437,7 @@ namespace ts { } namespace ts { - export function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined) { + export function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined, useCaseSensitiveFileNames: boolean) { if (compilerOptions.out || compilerOptions.outFile) return undefined; const buildInfoPath = getOutputPathForBuildInfo(compilerOptions); if (!buildInfoPath) return undefined; @@ -446,7 +446,7 @@ namespace ts { const buildInfo = getBuildInfo(content); if (buildInfo.version !== version) return undefined; if (!buildInfo.program) return undefined; - return createBuildProgramUsingProgramBuildInfo(buildInfo.program); + return createBuildProgramUsingProgramBuildInfo(buildInfo.program, buildInfoPath, useCaseSensitiveFileNames); } export function createIncrementalCompilerHost(options: CompilerOptions, system = sys): CompilerHost { @@ -471,7 +471,7 @@ namespace ts { }: IncrementalProgramOptions): T { host = host || createIncrementalCompilerHost(options); createProgram = createProgram || createEmitAndSemanticDiagnosticsBuilderProgram as any as CreateProgram; - const oldProgram = readBuilderProgram(options, path => host!.readFile(path)) as any as T; + const oldProgram = readBuilderProgram(options, path => host!.readFile(path), host.useCaseSensitiveFileNames()) as any as T; return createProgram(rootNames, options, host, oldProgram, configFileParsingDiagnostics, projectReferences); } @@ -747,7 +747,7 @@ namespace ts { ((typeDirectiveNames, containingFile, redirectedReference) => resolutionCache.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference)); const userProvidedResolution = !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives; - builderProgram = readBuilderProgram(compilerOptions, path => compilerHost.readFile(path)) as any as T; + builderProgram = readBuilderProgram(compilerOptions, path => compilerHost.readFile(path), compilerHost.useCaseSensitiveFileNames()) as any as T; synchronizeProgram(); // Update the wild card directory watch diff --git a/src/testRunner/unittests/tscWatch/incremental.ts b/src/testRunner/unittests/tscWatch/incremental.ts index 54109dec846..e0dfb29016c 100644 --- a/src/testRunner/unittests/tscWatch/incremental.ts +++ b/src/testRunner/unittests/tscWatch/incremental.ts @@ -129,6 +129,14 @@ namespace ts.tscWatch { signature: Harness.mockHash(libFile.content) }; + const getCanonicalFileName = createGetCanonicalFileName(/*useCaseSensitiveFileNames*/ false); + function relativeToBuildInfo(buildInfoPath: string, path: string) { + return getRelativePathFromFile(buildInfoPath, path, getCanonicalFileName); + } + + const buildInfoPath = `${project}/tsconfig.tsbuildinfo`; + const [libFilePath, file1Path, file2Path] = [libFile.path, `${project}/file1.ts`, `${project}/file2.ts`].map(path => relativeToBuildInfo(buildInfoPath, path)); + describe("non module compilation", () => { function getFileInfo(content: string): BuilderState.FileInfo { return { version: Harness.mockHash(content), signature: Harness.mockHash(`declare ${content}\n`) }; @@ -150,7 +158,6 @@ namespace ts.tscWatch { path: `${project}/file2.js`, content: "var y = 20;\n" }; - describe("own file emit without errors", () => { const modifiedFile2Content = file2.content.replace("y", "z").replace("20", "10"); verifyIncrementalWatchEmit({ @@ -163,14 +170,14 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(file1.content), - [file2.path]: getFileInfo(file2.content) + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(file1.content), + [file2Path]: getFileInfo(file2.content) }, options: { incremental: true, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, - semanticDiagnosticsPerFile: [libFile.path, file1.path, file2.path] + semanticDiagnosticsPerFile: [libFilePath, file1Path, file2Path] }, version }) @@ -186,14 +193,14 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(file1.content), - [file2.path]: getFileInfo(modifiedFile2Content) + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(file1.content), + [file2Path]: getFileInfo(modifiedFile2Content) }, options: { incremental: true, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, - semanticDiagnosticsPerFile: [libFile.path, file1.path, file2.path] + semanticDiagnosticsPerFile: [libFilePath, file1Path, file2Path] }, version }) @@ -213,16 +220,16 @@ namespace ts.tscWatch { signature: Harness.mockHash("declare const y: string;\n") }; const file2ReuasableError: ProgramBuildInfoDiagnostic = [ - file2.path, [ + file2Path, [ { - file: file2.path, + file: file2Path, start: 6, length: 1, code: Diagnostics.Type_0_is_not_assignable_to_type_1.code, category: Diagnostics.Type_0_is_not_assignable_to_type_1.category, messageText: "Type '20' is not assignable to type 'string'." } - ] as ReusableDiagnostic[] + ] ]; const file2Errors = [ "file2.ts(1,7): error TS2322: Type '20' is not assignable to type 'string'.\n" @@ -238,16 +245,16 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(file1.content), - [file2.path]: file2FileInfo + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(file1.content), + [file2Path]: file2FileInfo }, options: { incremental: true, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [ - libFile.path, - file1.path, + libFilePath, + file1Path, file2ReuasableError ] }, @@ -265,16 +272,16 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(modifiedFile1Content), - [file2.path]: file2FileInfo + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(modifiedFile1Content), + [file2Path]: file2FileInfo }, options: { incremental: true, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [ - libFile.path, - file1.path, + libFilePath, + file1Path, file2ReuasableError ] }, @@ -369,14 +376,14 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(file1.content), - [file2.path]: getFileInfo(file2.content) + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(file1.content), + [file2Path]: getFileInfo(file2.content) }, options: { incremental: true, module: ModuleKind.AMD, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, - semanticDiagnosticsPerFile: [libFile.path, file1.path, file2.path] + semanticDiagnosticsPerFile: [libFilePath, file1Path, file2Path] }, version }) @@ -391,14 +398,14 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(file1.content), - [file2.path]: getFileInfo(modifiedFile2Content) + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(file1.content), + [file2Path]: getFileInfo(modifiedFile2Content) }, options: { incremental: true, module: ModuleKind.AMD, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, - semanticDiagnosticsPerFile: [libFile.path, file1.path, file2.path] + semanticDiagnosticsPerFile: [libFilePath, file1Path, file2Path] }, version }) @@ -418,16 +425,16 @@ namespace ts.tscWatch { signature: Harness.mockHash("export declare const y: string;\n") }; const file2ReuasableError: ProgramBuildInfoDiagnostic = [ - file2.path, [ + file2Path, [ { - file: file2.path, + file: file2Path, start: 13, length: 1, code: Diagnostics.Type_0_is_not_assignable_to_type_1.code, category: Diagnostics.Type_0_is_not_assignable_to_type_1.category, messageText: "Type '20' is not assignable to type 'string'." } - ] as ReusableDiagnostic[] + ] ]; const file2Errors = [ "file2.ts(1,14): error TS2322: Type '20' is not assignable to type 'string'.\n" @@ -443,16 +450,16 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(file1.content), - [file2.path]: file2FileInfo + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(file1.content), + [file2Path]: file2FileInfo }, options: { incremental: true, module: ModuleKind.AMD, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [ - libFile.path, - file1.path, + libFilePath, + file1Path, file2ReuasableError ] }, @@ -469,17 +476,17 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(modifiedFile1Content), - [file2.path]: file2FileInfo + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(modifiedFile1Content), + [file2Path]: file2FileInfo }, options: { incremental: true, module: ModuleKind.AMD, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [ - libFile.path, + libFilePath, file2ReuasableError, - file1.path + file1Path ] }, version diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index cbab57b0644..8f4f774f5d6 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -4450,7 +4450,7 @@ declare namespace ts { function createAbstractBuilder(rootNames: ReadonlyArray | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: ReadonlyArray, projectReferences?: ReadonlyArray): BuilderProgram; } declare namespace ts { - function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined): EmitAndSemanticDiagnosticsBuilderProgram | undefined; + function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined, useCaseSensitiveFileNames: boolean): EmitAndSemanticDiagnosticsBuilderProgram | undefined; function createIncrementalCompilerHost(options: CompilerOptions, system?: System): CompilerHost; interface IncrementalProgramOptions { rootNames: ReadonlyArray; diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index fd254a2fe50..7efb518603e 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -4450,7 +4450,7 @@ declare namespace ts { function createAbstractBuilder(rootNames: ReadonlyArray | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: ReadonlyArray, projectReferences?: ReadonlyArray): BuilderProgram; } declare namespace ts { - function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined): EmitAndSemanticDiagnosticsBuilderProgram | undefined; + function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined, useCaseSensitiveFileNames: boolean): EmitAndSemanticDiagnosticsBuilderProgram | undefined; function createIncrementalCompilerHost(options: CompilerOptions, system?: System): CompilerHost; interface IncrementalProgramOptions { rootNames: ReadonlyArray; diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js index f7ffde933fd..e6fb4d53c12 100644 --- a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js +++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js @@ -30,27 +30,27 @@ export declare const lazyBar: LazyAction<() => void, typeof import("./lazyIndex" { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/bar.ts": { + "../bar.ts": { "version": "747071916", "signature": "-9232740537" }, - "/src/bundling.ts": { + "../bundling.ts": { "version": "-21659820217", "signature": "-40032907372" }, - "/src/global.d.ts": { + "../global.d.ts": { "version": "-9780226215", "signature": "-9780226215" }, - "/src/lazyindex.ts": { + "../lazyindex.ts": { "version": "-6956449754", "signature": "-6224542381" }, - "/src/index.ts": { + "../index.ts": { "version": "-11602502901", "signature": "6256067474" } @@ -63,30 +63,30 @@ export declare const lazyBar: LazyAction<() => void, typeof import("./lazyIndex" "configFilePath": "/src/tsconfig.json" }, "referencedMap": { - "/src/index.ts": [ - "/src/bundling.ts", - "/src/lazyindex.ts" + "../index.ts": [ + "../bundling.ts", + "../lazyindex.ts" ], - "/src/lazyindex.ts": [ - "/src/bar.ts" + "../lazyindex.ts": [ + "../bar.ts" ] }, "exportedModulesMap": { - "/src/index.ts": [ - "/src/bundling.ts", - "/src/lazyindex.ts" + "../index.ts": [ + "../bundling.ts", + "../lazyindex.ts" ], - "/src/lazyindex.ts": [ - "/src/bar.ts" + "../lazyindex.ts": [ + "../bar.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/bar.ts", - "/src/bundling.ts", - "/src/global.d.ts", - "/src/index.ts", - "/src/lazyindex.ts" + "../../lib/lib.d.ts", + "../bar.ts", + "../bundling.ts", + "../global.d.ts", + "../index.ts", + "../lazyindex.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module.js index e587db59b21..1de6d110e02 100644 --- a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module.js +++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module.js @@ -68,27 +68,27 @@ exports.bar = bar_1.default; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/bar.ts": { + "../bar.ts": { "version": "5936740878", "signature": "11191036521" }, - "/src/bundling.ts": { + "../bundling.ts": { "version": "-21659820217", "signature": "-40032907372" }, - "/src/global.d.ts": { + "../global.d.ts": { "version": "-9780226215", "signature": "-9780226215" }, - "/src/lazyindex.ts": { + "../lazyindex.ts": { "version": "-6956449754", "signature": "-6224542381" }, - "/src/index.ts": { + "../index.ts": { "version": "-11602502901", "signature": "18468008756" } @@ -101,30 +101,30 @@ exports.bar = bar_1.default; "configFilePath": "/src/tsconfig.json" }, "referencedMap": { - "/src/index.ts": [ - "/src/bundling.ts", - "/src/lazyindex.ts" + "../index.ts": [ + "../bundling.ts", + "../lazyindex.ts" ], - "/src/lazyindex.ts": [ - "/src/bar.ts" + "../lazyindex.ts": [ + "../bar.ts" ] }, "exportedModulesMap": { - "/src/index.ts": [ - "/src/bundling.ts", - "/src/lazyindex.ts" + "../index.ts": [ + "../bundling.ts", + "../lazyindex.ts" ], - "/src/lazyindex.ts": [ - "/src/bar.ts" + "../lazyindex.ts": [ + "../bar.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/bar.ts", - "/src/bundling.ts", - "/src/global.d.ts", - "/src/index.ts", - "/src/lazyindex.ts" + "../../lib/lib.d.ts", + "../bar.ts", + "../bundling.ts", + "../global.d.ts", + "../index.ts", + "../lazyindex.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js b/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js index b0549b1a8fb..fb85601c160 100644 --- a/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js +++ b/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js @@ -21,19 +21,19 @@ type A = HKT[typeof sym]; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/src/globals.d.ts": { + "./src/globals.d.ts": { "version": "-1994196675", "signature": "-1994196675" }, - "/src/src/hkt.ts": { + "./src/hkt.ts": { "version": "675797797", "signature": "2373810515" }, - "/src/src/main.ts": { + "./src/main.ts": { "version": "-27494779858", "signature": "-7779857705" } @@ -44,20 +44,20 @@ type A = HKT[typeof sym]; "configFilePath": "/src/tsconfig.json" }, "referencedMap": { - "/src/src/main.ts": [ - "/src/src/hkt.ts" + "./src/main.ts": [ + "./src/hkt.ts" ] }, "exportedModulesMap": { - "/src/src/main.ts": [ - "/src/src/hkt.ts" + "./src/main.ts": [ + "./src/hkt.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/src/globals.d.ts", - "/src/src/hkt.ts", - "/src/src/main.ts" + "../lib/lib.d.ts", + "./src/globals.d.ts", + "./src/hkt.ts", + "./src/main.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js b/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js index a48d6df88e4..48ae88b77cb 100644 --- a/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js +++ b/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js @@ -14,19 +14,19 @@ var x = 10; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/src/globals.d.ts": { + "./src/globals.d.ts": { "version": "-1994196675", "signature": "-1994196675" }, - "/src/src/hkt.ts": { + "./src/hkt.ts": { "version": "675797797", "signature": "2373810515" }, - "/src/src/main.ts": { + "./src/main.ts": { "version": "-28387946490", "signature": "-7779857705" } @@ -37,20 +37,20 @@ var x = 10; "configFilePath": "/src/tsconfig.json" }, "referencedMap": { - "/src/src/main.ts": [ - "/src/src/hkt.ts" + "./src/main.ts": [ + "./src/hkt.ts" ] }, "exportedModulesMap": { - "/src/src/main.ts": [ - "/src/src/hkt.ts" + "./src/main.ts": [ + "./src/hkt.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/src/globals.d.ts", - "/src/src/hkt.ts", - "/src/src/main.ts" + "../lib/lib.d.ts", + "./src/globals.d.ts", + "./src/hkt.ts", + "./src/main.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js index a698d6c34cf..e21e1a3b4cb 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js @@ -171,19 +171,19 @@ export class someClass { } { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "25219880154" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-13387000654", "signature": "12514354613" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -198,10 +198,10 @@ export class someClass { } "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" @@ -211,19 +211,19 @@ export class someClass { } { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-2069755619", "signature": "-2069755619" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "./index.ts": { "version": "-5786964698", "signature": "-6548680073" } @@ -237,21 +237,21 @@ export class someClass { } "configFilePath": "/src/logic/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" @@ -261,23 +261,23 @@ export class someClass { } { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-2069755619", "signature": "-2069755619" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "../logic/index.ts": { "version": "-6548680073", "signature": "-6548680073" }, - "/src/tests/index.ts": { + "./index.ts": { "version": "12336236525", "signature": "-9209611" } @@ -290,29 +290,29 @@ export class someClass { } "configFilePath": "/src/tests/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts", - "/src/logic/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts", + "../logic/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts", - "/src/tests/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "../logic/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js index 69c7b20d506..90d449acc85 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js @@ -20,19 +20,19 @@ export declare function multiply(a: number, b: number): number; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "-8396256275" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-18749805970", "signature": "1874987148" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -46,10 +46,10 @@ export declare function multiply(a: number, b: number): number; "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js index 53f222a4bf5..444c03f4d09 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js @@ -24,19 +24,19 @@ export declare const m: typeof mod; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "./index.ts": { "version": "-5786964698", "signature": "-6548680073" } @@ -51,21 +51,21 @@ export declare const m: typeof mod; "configFilePath": "/src/logic/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" @@ -75,23 +75,23 @@ export declare const m: typeof mod; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "../logic/index.ts": { "version": "-6548680073", "signature": "-6548680073" }, - "/src/tests/index.ts": { + "./index.ts": { "version": "12336236525", "signature": "-9209611" } @@ -104,29 +104,29 @@ export declare const m: typeof mod; "configFilePath": "/src/tests/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts", - "/src/logic/decls/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts", + "../logic/decls/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts", - "/src/tests/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "../logic/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-target-option-changes.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-target-option-changes.js index 53bd9b167fb..95de840f6bc 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-target-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-target-option-changes.js @@ -28,23 +28,23 @@ exports.multiply = multiply; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "8926001564", "signature": "8926001564" }, - "/lib/lib.esnext.d.ts": { + "../../lib/lib.esnext.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "-8396256275" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-18749805970", "signature": "1874987148" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -59,11 +59,11 @@ exports.multiply = multiply; "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/lib/lib.esnext.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "../../lib/lib.esnext.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js index aae81ea9fdc..715b0331f16 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js @@ -24,19 +24,19 @@ class someClass { } { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "25219880154" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-16698397488", "signature": "11051732871" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -51,10 +51,10 @@ class someClass { } "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js index ef63741766a..e61fc8ae88e 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js @@ -184,19 +184,19 @@ exports.multiply = multiply; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "25219880154" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-18749805970", "signature": "11051732871" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -211,10 +211,10 @@ exports.multiply = multiply; "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" @@ -369,19 +369,19 @@ sourceFile:index.ts { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "./index.ts": { "version": "-5786964698", "signature": "-6548680073" } @@ -395,21 +395,21 @@ sourceFile:index.ts "configFilePath": "/src/logic/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" @@ -435,23 +435,23 @@ exports.m = mod; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "../logic/index.ts": { "version": "-6548680073", "signature": "-6548680073" }, - "/src/tests/index.ts": { + "./index.ts": { "version": "12336236525", "signature": "-9209611" } @@ -464,29 +464,29 @@ exports.m = mod; "configFilePath": "/src/tests/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts", - "/src/logic/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts", + "../logic/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts", - "/src/tests/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "../logic/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js index 90f10c0a25c..9e1c9e71efb 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js @@ -26,19 +26,19 @@ exports.multiply = multiply; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "-8396256275" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-18749805970", "signature": "1874987148" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -51,10 +51,10 @@ exports.multiply = multiply; "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js index ef63741766a..e61fc8ae88e 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js @@ -184,19 +184,19 @@ exports.multiply = multiply; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "25219880154" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-18749805970", "signature": "11051732871" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -211,10 +211,10 @@ exports.multiply = multiply; "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" @@ -369,19 +369,19 @@ sourceFile:index.ts { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "./index.ts": { "version": "-5786964698", "signature": "-6548680073" } @@ -395,21 +395,21 @@ sourceFile:index.ts "configFilePath": "/src/logic/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" @@ -435,23 +435,23 @@ exports.m = mod; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "../logic/index.ts": { "version": "-6548680073", "signature": "-6548680073" }, - "/src/tests/index.ts": { + "./index.ts": { "version": "12336236525", "signature": "-9209611" } @@ -464,29 +464,29 @@ exports.m = mod; "configFilePath": "/src/tests/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts", - "/src/logic/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts", + "../logic/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts", - "/src/tests/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "../logic/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js index b3b74cb388c..809c003d732 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js @@ -184,19 +184,19 @@ exports.multiply = multiply; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "25219880154" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-18749805970", "signature": "11051732871" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -211,10 +211,10 @@ exports.multiply = multiply; "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" @@ -369,19 +369,19 @@ sourceFile:index.ts { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "./index.ts": { "version": "-5786964698", "signature": "-6548680073" } @@ -396,21 +396,21 @@ sourceFile:index.ts "configFilePath": "/src/logic/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" @@ -452,23 +452,23 @@ exports.m = mod; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "../logic/index.ts": { "version": "-6548680073", "signature": "-6548680073" }, - "/src/tests/index.ts": { + "./index.ts": { "version": "12336236525", "signature": "-9209611" } @@ -481,29 +481,29 @@ exports.m = mod; "configFilePath": "/src/tests/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts", - "/src/logic/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts", + "../logic/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts", - "/src/tests/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "../logic/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js index fdf7cc38412..884cb3d6186 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js @@ -45,23 +45,23 @@ export function multiply(a, b) { return a * b; } { "program": { "fileInfos": { - "/lib/lib.esnext.d.ts": { + "../../lib/lib.esnext.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/lib/lib.esnext.full.d.ts": { + "../../lib/lib.esnext.full.d.ts": { "version": "8926001564", "signature": "8926001564" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "-8396256275" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-18749805970", "signature": "1874987148" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -76,11 +76,11 @@ export function multiply(a, b) { return a * b; } "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.esnext.d.ts", - "/lib/lib.esnext.full.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.esnext.d.ts", + "../../lib/lib.esnext.full.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion"