diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index cbc78cb9bf8..0f891068b59 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -46,8 +46,8 @@ namespace ts { const sourceMapFilePath = jsFilePath && getSourceMapFilePath(jsFilePath, options); const declarationFilePath = (forceDtsPaths || getEmitDeclarations(options)) ? removeFileExtension(outPath) + Extension.Dts : undefined; const declarationMapPath = declarationFilePath && getAreDeclarationMapsEnabled(options) ? declarationFilePath + ".map" : undefined; - const bundleInfoPath = options.composite && jsFilePath ? combinePaths(getDirectoryPath(jsFilePath), infoFile) : undefined; - return { jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, bundleInfoPath }; + const buildInfoPath = options.composite && jsFilePath ? combinePaths(getDirectoryPath(jsFilePath), infoFile) : undefined; + return { jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, buildInfoPath }; } /*@internal*/ @@ -67,7 +67,7 @@ namespace ts { const isJs = isSourceFileJS(sourceFile); const declarationFilePath = ((forceDtsPaths || getEmitDeclarations(options)) && !isJs) ? getDeclarationEmitOutputFilePath(sourceFile.fileName, host) : undefined; const declarationMapPath = declarationFilePath && getAreDeclarationMapsEnabled(options) ? declarationFilePath + ".map" : undefined; - return { jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, bundleInfoPath: undefined }; + return { jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, buildInfoPath: undefined }; } } @@ -108,7 +108,7 @@ namespace ts { const newLine = getNewLineCharacter(compilerOptions, () => host.getNewLine()); const writer = createTextWriter(newLine); const { enter, exit } = performance.createTimer("printTime", "beforePrint", "afterPrint"); - let bundleInfo: BundleInfo | undefined; + let buildInfo: BuildInfo | undefined; let emitSkipped = false; let exportedModulesFromDeclarationEmit: ExportedModulesFromDeclarationEmit | undefined; @@ -126,13 +126,13 @@ namespace ts { exportedModulesFromDeclarationEmit }; - function emitSourceFileOrBundle({ jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, bundleInfoPath }: EmitFileNames, sourceFileOrBundle: SourceFile | Bundle) { - if (bundleInfoPath && !emitOnlyDtsFiles) bundleInfo = { js: [], dts: [] }; - emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, bundleInfo && bundleInfo.js); - emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath, bundleInfo && bundleInfo.dts); + function emitSourceFileOrBundle({ jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, buildInfoPath }: EmitFileNames, sourceFileOrBundle: SourceFile | Bundle) { + if (buildInfoPath && !emitOnlyDtsFiles) buildInfo = { js: [], dts: [] }; + emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, buildInfo && buildInfo.js); + emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath, buildInfo && buildInfo.dts); // Write bundled offset information if applicable - if (!emitOnlyDtsFiles && !emitSkipped && bundleInfoPath) { - writeFile(host, emitterDiagnostics, bundleInfoPath, JSON.stringify(bundleInfo, undefined, 2), /*writeByteOrderMark*/ false); + if (!emitOnlyDtsFiles && !emitSkipped && buildInfoPath) { + writeFile(host, emitterDiagnostics, buildInfoPath, JSON.stringify(buildInfo, undefined, 2), /*writeByteOrderMark*/ false); } if (!emitSkipped && emittedFilesList) { @@ -143,8 +143,8 @@ namespace ts { if (sourceMapFilePath) { emittedFilesList.push(sourceMapFilePath); } - if (bundleInfoPath) { - emittedFilesList.push(bundleInfoPath); + if (buildInfoPath) { + emittedFilesList.push(buildInfoPath); } } if (declarationFilePath) { @@ -156,7 +156,7 @@ namespace ts { } } - function emitJsFileOrBundle(sourceFileOrBundle: SourceFile | Bundle, jsFilePath: string | undefined, sourceMapFilePath: string | undefined, fileBundleInfo: FileBundleInfo | undefined) { + function emitJsFileOrBundle(sourceFileOrBundle: SourceFile | Bundle, jsFilePath: string | undefined, sourceMapFilePath: string | undefined, bundleFileInfo: BundleFileInfo | undefined) { if (emitOnlyDtsFiles || !jsFilePath) { return; } @@ -192,13 +192,13 @@ namespace ts { }); Debug.assert(transform.transformed.length === 1, "Should only see one output from the transform"); - printSourceFileOrBundle(jsFilePath, sourceMapFilePath, transform.transformed[0], fileBundleInfo, printer, compilerOptions); + printSourceFileOrBundle(jsFilePath, sourceMapFilePath, transform.transformed[0], bundleFileInfo, printer, compilerOptions); // Clean up emit nodes on parse tree transform.dispose(); } - function emitDeclarationFileOrBundle(sourceFileOrBundle: SourceFile | Bundle, declarationFilePath: string | undefined, declarationMapPath: string | undefined, fileBundleInfo: FileBundleInfo | undefined) { + function emitDeclarationFileOrBundle(sourceFileOrBundle: SourceFile | Bundle, declarationFilePath: string | undefined, declarationMapPath: string | undefined, bundleFileInfo: BundleFileInfo | undefined) { if (!(declarationFilePath && !isInJSFile(sourceFileOrBundle))) { return; } @@ -242,7 +242,7 @@ namespace ts { emitSkipped = emitSkipped || declBlocked; if (!declBlocked || emitOnlyDtsFiles) { Debug.assert(declarationTransform.transformed.length === 1, "Should only see one output from the decl transform"); - printSourceFileOrBundle(declarationFilePath, declarationMapPath, declarationTransform.transformed[0], fileBundleInfo, declarationPrinter, { + printSourceFileOrBundle(declarationFilePath, declarationMapPath, declarationTransform.transformed[0], bundleFileInfo, declarationPrinter, { sourceMap: compilerOptions.declarationMap, sourceRoot: compilerOptions.sourceRoot, mapRoot: compilerOptions.mapRoot, @@ -271,7 +271,7 @@ namespace ts { forEachChild(node, collectLinkedAliases); } - function printSourceFileOrBundle(jsFilePath: string, sourceMapFilePath: string | undefined, sourceFileOrBundle: SourceFile | Bundle, fileBundleInfo: FileBundleInfo | undefined, printer: Printer, mapOptions: SourceMapOptions) { + function printSourceFileOrBundle(jsFilePath: string, sourceMapFilePath: string | undefined, sourceFileOrBundle: SourceFile | Bundle, bundleFileInfo: BundleFileInfo | undefined, printer: Printer, mapOptions: SourceMapOptions) { const bundle = sourceFileOrBundle.kind === SyntaxKind.Bundle ? sourceFileOrBundle : undefined; const sourceFile = sourceFileOrBundle.kind === SyntaxKind.SourceFile ? sourceFileOrBundle : undefined; const sourceFiles = bundle ? bundle.sourceFiles : [sourceFile!]; @@ -287,7 +287,7 @@ namespace ts { } if (bundle) { - printer.writeBundle(bundle, fileBundleInfo, writer, sourceMapGenerator); + printer.writeBundle(bundle, bundleFileInfo, writer, sourceMapGenerator); } else { printer.writeFile(sourceFile!, writer, sourceMapGenerator); @@ -440,7 +440,7 @@ namespace ts { let ownWriter: EmitTextWriter; // Reusable `EmitTextWriter` for basic printing. let write = writeBase; let isOwnFileEmit: boolean; - let fileBundleInfo: FileBundleInfo | undefined; + let bundleFileInfo: BundleFileInfo | undefined; // Source Maps let sourceMapsDisabled = true; @@ -542,9 +542,9 @@ namespace ts { return writer.getTextPosWithWriteLine ? writer.getTextPosWithWriteLine() : writer.getTextPos(); } - function writeBundle(bundle: Bundle, bundleInfo: FileBundleInfo | undefined, output: EmitTextWriter, sourceMapGenerator: SourceMapGenerator | undefined) { + function writeBundle(bundle: Bundle, bundleInfo: BundleFileInfo | undefined, output: EmitTextWriter, sourceMapGenerator: SourceMapGenerator | undefined) { isOwnFileEmit = false; - fileBundleInfo = bundleInfo; + bundleFileInfo = bundleInfo; const previousWriter = writer; setWriter(output, sourceMapGenerator); emitShebangIfNeeded(bundle); @@ -561,7 +561,7 @@ namespace ts { for (const sourceFile of bundle.sourceFiles) { print(EmitHint.SourceFile, sourceFile, sourceFile); } - if (fileBundleInfo) fileBundleInfo.push({ pos, end: writer.getTextPos(), kind: BundleFileSectionKind.Text }); + if (bundleFileInfo) bundleFileInfo.push({ pos, end: writer.getTextPos(), kind: BundleFileSectionKind.Text }); reset(); writer = previousWriter; @@ -577,7 +577,7 @@ namespace ts { function writeFile(sourceFile: SourceFile, output: EmitTextWriter, sourceMapGenerator: SourceMapGenerator | undefined) { isOwnFileEmit = true; - fileBundleInfo = undefined; + bundleFileInfo = undefined; const previousWriter = writer; setWriter(output, sourceMapGenerator); emitShebangIfNeeded(sourceFile); @@ -635,7 +635,7 @@ namespace ts { currentSourceFile = undefined!; currentLineMap = undefined!; detachedCommentsInfo = undefined; - fileBundleInfo = undefined; + bundleFileInfo = undefined; setWriter(/*output*/ undefined, /*_sourceMapGenerator*/ undefined); } @@ -1171,7 +1171,7 @@ namespace ts { else { writeLines(helper.text(makeFileLevelOptimisticUniqueName)); } - if (fileBundleInfo) fileBundleInfo.push({ pos, end: writer.getTextPos(), kind: BundleFileSectionKind.EmitHelpers, name: helper.name }); + if (bundleFileInfo) bundleFileInfo.push({ pos, end: writer.getTextPos(), kind: BundleFileSectionKind.EmitHelpers, name: helper.name }); helpersEmitted = true; } } @@ -2938,7 +2938,7 @@ namespace ts { if (hasNoDefaultLib) { const pos = writer.getTextPos(); writeComment(`/// `); - if (fileBundleInfo) fileBundleInfo.push({ pos, end: writer.getTextPos(), kind: BundleFileSectionKind.NoDefaultLib }); + if (bundleFileInfo) bundleFileInfo.push({ pos, end: writer.getTextPos(), kind: BundleFileSectionKind.NoDefaultLib }); writeLine(); } if (currentSourceFile && currentSourceFile.moduleName) { @@ -2959,19 +2959,19 @@ namespace ts { for (const directive of files) { const pos = writer.getTextPos(); writeComment(`/// `); - if (fileBundleInfo) fileBundleInfo.push({ pos, end: writer.getTextPos(), kind: BundleFileSectionKind.Reference, fileName: directive.fileName }); + if (bundleFileInfo) bundleFileInfo.push({ pos, end: writer.getTextPos(), kind: BundleFileSectionKind.Reference, fileName: directive.fileName }); writeLine(); } for (const directive of types) { const pos = writer.getTextPos(); writeComment(`/// `); - if (fileBundleInfo) fileBundleInfo.push({ pos, end: writer.getTextPos(), kind: BundleFileSectionKind.Type, fileName: directive.fileName }); + if (bundleFileInfo) bundleFileInfo.push({ pos, end: writer.getTextPos(), kind: BundleFileSectionKind.Type, fileName: directive.fileName }); writeLine(); } for (const directive of libs) { const pos = writer.getTextPos(); writeComment(`/// `); - if (fileBundleInfo) fileBundleInfo.push({ pos, end: writer.getTextPos(), kind: BundleFileSectionKind.Lib, fileName: directive.fileName }); + if (bundleFileInfo) bundleFileInfo.push({ pos, end: writer.getTextPos(), kind: BundleFileSectionKind.Lib, fileName: directive.fileName }); writeLine(); } } @@ -3015,7 +3015,7 @@ namespace ts { writeLine(); const pos = writer.getTextPos(); emit(statement); - if (fileBundleInfo) fileBundleInfo.push({ pos, end: writer.getTextPos(), kind: BundleFileSectionKind.Prologue, text: statement.expression.text }); + if (bundleFileInfo) bundleFileInfo.push({ pos, end: writer.getTextPos(), kind: BundleFileSectionKind.Prologue, text: statement.expression.text }); if (seenPrologueDirectives) { seenPrologueDirectives.set(statement.expression.text, true); } @@ -3036,7 +3036,7 @@ namespace ts { writeLine(); const pos = writer.getTextPos(); emit(prologue); - if (fileBundleInfo) fileBundleInfo.push({ pos, end: writer.getTextPos(), kind: BundleFileSectionKind.Prologue, text: prologue.text }); + if (bundleFileInfo) bundleFileInfo.push({ pos, end: writer.getTextPos(), kind: BundleFileSectionKind.Prologue, text: prologue.text }); if (seenPrologueDirectives) { seenPrologueDirectives.set(prologue.text, true); } diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts index 0248465e914..cc8a50087c8 100644 --- a/src/compiler/factory.ts +++ b/src/compiler/factory.ts @@ -2673,7 +2673,7 @@ namespace ts { sourceMapText: { get() { return mapPathOrType === "js" ? textOrInputFiles.javascriptMapText : textOrInputFiles.declarationMapText; } }, }); - const sections = textOrInputFiles.bundleInfo ? mapPathOrType === "js" ? textOrInputFiles.bundleInfo.js : textOrInputFiles.bundleInfo.dts : undefined; + const sections = textOrInputFiles.buildInfo ? mapPathOrType === "js" ? textOrInputFiles.buildInfo.js : textOrInputFiles.buildInfo.dts : undefined; if (sections) { for (const section of sections) { switch (section.kind) { @@ -2734,7 +2734,7 @@ namespace ts { javascriptMapPath: string | undefined, declarationPath: string, declarationMapPath: string | undefined, - bundleInfoPath: string | undefined + buildInfoPath: string | undefined ): InputFiles; export function createInputFiles( javascriptText: string, @@ -2750,7 +2750,7 @@ namespace ts { javascriptMapPath?: string, javascriptMapTextOrDeclarationPath?: string, declarationMapPath?: string, - declarationMapTextOrBundleInfoPath?: string + declarationMapTextOrBuildInfoPath?: string ): InputFiles { const node = createNode(SyntaxKind.InputFiles); if (!isString(javascriptTextOrReadFileText)) { @@ -2770,19 +2770,19 @@ namespace ts { }; const jsonGetter = (path: string | undefined) => { const result = textGetter(path); - return result !== undefined ? JSON.parse(result) as BundleInfo : undefined; + return result !== undefined ? JSON.parse(result) as BuildInfo : undefined; }; node.javascriptPath = declarationTextOrJavascriptPath; node.javascriptMapPath = javascriptMapPath; node.declarationPath = Debug.assertDefined(javascriptMapTextOrDeclarationPath); node.declarationMapPath = declarationMapPath; - node.bundleInfoPath = declarationMapTextOrBundleInfoPath; + node.buildInfoPath = declarationMapTextOrBuildInfoPath; Object.defineProperties(node, { javascriptText: { get() { return definedTextGetter(declarationTextOrJavascriptPath); } }, 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 - bundleInfo: { get() { return jsonGetter(declarationMapTextOrBundleInfoPath); } } + buildInfo: { get() { return jsonGetter(declarationMapTextOrBuildInfoPath); } } }); } else { @@ -2791,7 +2791,7 @@ namespace ts { node.javascriptMapText = javascriptMapTextOrDeclarationPath; node.declarationText = declarationTextOrJavascriptPath; node.declarationMapPath = declarationMapPath; - node.declarationMapText = declarationMapTextOrBundleInfoPath; + node.declarationMapText = declarationMapTextOrBuildInfoPath; } return node; } diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 29d1b13b84c..92778fb635f 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1456,12 +1456,12 @@ namespace ts { // Upstream project didn't have outFile set -- skip (error will have been issued earlier) if (!out) continue; - const { jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, bundleInfoPath } = getOutputPathsForBundle(resolvedRefOpts.options, /*forceDtsPaths*/ true); + const { jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, buildInfoPath } = getOutputPathsForBundle(resolvedRefOpts.options, /*forceDtsPaths*/ true); const node = createInputFiles(fileName => { const path = toPath(fileName); const sourceFile = getSourceFileByPath(path); return sourceFile ? sourceFile.text : filesByName.has(path) ? undefined : host.readFile(path); - }, jsFilePath! , sourceMapFilePath, declarationFilePath! , declarationMapPath, bundleInfoPath); + }, jsFilePath! , sourceMapFilePath, declarationFilePath! , declarationMapPath, buildInfoPath); nodes.push(node); } } diff --git a/src/compiler/tsbuild.ts b/src/compiler/tsbuild.ts index d5b34271d38..0dafdf0cb78 100644 --- a/src/compiler/tsbuild.ts +++ b/src/compiler/tsbuild.ts @@ -289,9 +289,9 @@ namespace ts { return outputs; } - function getOutFileOutputs(project: ParsedCommandLine, ignoreBundleInfo?: boolean): ReadonlyArray { + function getOutFileOutputs(project: ParsedCommandLine, ignoreBuildInfo?: boolean): ReadonlyArray { Debug.assert(!!project.options.outFile || !!project.options.out, "outFile must be set"); - const { jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, bundleInfoPath } = getOutputPathsForBundle(project.options, /*forceDtsPaths*/ false); + const { jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, buildInfoPath } = getOutputPathsForBundle(project.options, /*forceDtsPaths*/ false); let outputs: string[] | undefined = []; const addOutput = (path: string | undefined) => path && (outputs || (outputs = [])).push(path); @@ -299,7 +299,7 @@ namespace ts { addOutput(sourceMapFilePath); addOutput(declarationFilePath); addOutput(declarationMapPath); - if (!ignoreBundleInfo) addOutput(bundleInfoPath); + if (!ignoreBuildInfo) addOutput(buildInfoPath); return outputs || emptyArray; } @@ -711,8 +711,8 @@ namespace ts { } // Collect the expected outputs of this project - // Do not use presence or absence of bundleInfo to determine status of build - const outputs = getAllProjectOutputs(project, /*ignoreBundleInfo*/ true); + // Do not use presence or absence of buildInfo to determine status of build + const outputs = getAllProjectOutputs(project, /*ignoreBuildInfo*/ true); if (outputs.length === 0) { return { @@ -1393,9 +1393,9 @@ namespace ts { return combinePaths(project, "tsconfig.json") as ResolvedConfigFileName; } - export function getAllProjectOutputs(project: ParsedCommandLine, ignoreBundleInfo?: true): ReadonlyArray { + export function getAllProjectOutputs(project: ParsedCommandLine, ignoreBuildInfo?: true): ReadonlyArray { if (project.options.outFile || project.options.out) { - return getOutFileOutputs(project, ignoreBundleInfo); + return getOutFileOutputs(project, ignoreBuildInfo); } else { const outputs: string[] = []; diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 308ac54735a..df1b7b21ac3 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2770,8 +2770,8 @@ namespace ts { declarationText: string; declarationMapPath?: string; declarationMapText?: string; - bundleInfoPath?: string; - /*@internal*/ bundleInfo?: BundleInfo; + buildInfoPath?: string; + /*@internal*/ buildInfo?: BuildInfo; } export interface UnparsedSource extends Node { @@ -5428,7 +5428,7 @@ namespace ts { /*@internal*/ writeNode(hint: EmitHint, node: Node, sourceFile: SourceFile | undefined, writer: EmitTextWriter): void; /*@internal*/ writeList(format: ListFormat, list: NodeArray | undefined, sourceFile: SourceFile | undefined, writer: EmitTextWriter): void; /*@internal*/ writeFile(sourceFile: SourceFile, writer: EmitTextWriter, sourceMapGenerator: SourceMapGenerator | undefined): void; - /*@internal*/ writeBundle(bundle: Bundle, info: FileBundleInfo | undefined, writer: EmitTextWriter, sourceMapGenerator: SourceMapGenerator | undefined): void; + /*@internal*/ writeBundle(bundle: Bundle, bundleFileInfo: BundleFileInfo | undefined, writer: EmitTextWriter, sourceMapGenerator: SourceMapGenerator | undefined): void; } /*@internal*/ @@ -5481,11 +5481,11 @@ namespace ts { BundleFileHasNoDefaultLib | BundleFileReference | BundleFileText; /*@internal*/ - export type FileBundleInfo = BundleFileSection[]; + export type BundleFileInfo = BundleFileSection[]; /* @internal */ - export interface BundleInfo { - js?: FileBundleInfo; - dts?: FileBundleInfo; + export interface BuildInfo { + js?: BundleFileInfo; + dts?: BundleFileInfo; } export interface PrintHandlers { diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index ffb344bdf20..3409ef449c4 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -3364,7 +3364,7 @@ namespace ts { sourceMapFilePath: string | undefined; declarationFilePath: string | undefined; declarationMapPath: string | undefined; - bundleInfoPath: string | undefined; + buildInfoPath: string | undefined; } /** diff --git a/src/testRunner/unittests/tsbuild.ts b/src/testRunner/unittests/tsbuild.ts index c342aacf196..f592e80ab51 100644 --- a/src/testRunner/unittests/tsbuild.ts +++ b/src/testRunner/unittests/tsbuild.ts @@ -472,14 +472,14 @@ export const b = new A();`); "/src/first/bin/first-output.js.map", "/src/first/bin/first-output.d.ts", "/src/first/bin/first-output.d.ts.map", - "/src/first/bin/first-output.tsbundleinfo" + "/src/first/bin/.tsbuildinfo" ], [ "/src/2/second-output.js", "/src/2/second-output.js.map", "/src/2/second-output.d.ts", "/src/2/second-output.d.ts.map", - "/src/2/second-output.tsbundleinfo" + "/src/2/.tsbuildinfo" ], [ "/src/third/thirdjs/output/third-output.js", @@ -489,8 +489,8 @@ export const b = new A();`); ] ]; - function verifyOutFileScenarioWorker(scenario: string, modifyFs: (fs: vfs.FileSystem) => void | ReadonlyArray, withoutBundleInfo: boolean) { - describe(`unittests:: tsbuild - outFile:: ${scenario}${withoutBundleInfo ? " without bundleInfo" : ""}`, () => { + function verifyOutFileScenarioWorker(scenario: string, modifyFs: (fs: vfs.FileSystem) => void | ReadonlyArray, withoutBuildInfo: boolean) { + describe(`unittests:: tsbuild - outFile:: ${scenario}${withoutBuildInfo ? " without build info" : ""}`, () => { let fs: vfs.FileSystem | undefined; const actualReadFileMap = createMap(); let additionalSourceFiles: ReadonlyArray | void; @@ -506,12 +506,12 @@ export const b = new A();`); if (path.startsWith("/src/")) { actualReadFileMap.set(path, (actualReadFileMap.get(path) || 0) + 1); } - if (withoutBundleInfo && getBaseFileName(path) === infoFile) { + if (withoutBuildInfo && getBaseFileName(path) === infoFile) { return undefined; } return originalReadFile.call(host, path); }; - if (withoutBundleInfo) { + if (withoutBuildInfo) { const originalWriteFile = host.writeFile; host.writeFile = (fileName, content, writeByteOrder) => { return getBaseFileName(fileName) !== infoFile && @@ -539,7 +539,7 @@ export const b = new A();`); const patch = fs!.diff(); // tslint:disable-next-line:no-null-keyword - Harness.Baseline.runBaseline(`outFile-${scenario.split(" ").join("-")}${withoutBundleInfo ? "-no-bundleInfo" : ""}.js`, patch ? vfs.formatPatch(patch) : null); + Harness.Baseline.runBaseline(`outFile-${scenario.split(" ").join("-")}${withoutBuildInfo ? "-no-buildInfo" : ""}.js`, patch ? vfs.formatPatch(patch) : null); }); it("verify readFile calls", () => { const expected = [ @@ -574,8 +574,8 @@ export const b = new A();`); } function verifyOutFileScenario(scenario: string, modifyFs: (fs: vfs.FileSystem) => void | ReadonlyArray) { - verifyOutFileScenarioWorker(scenario, modifyFs, /*withoutBundleInfo*/ false); - verifyOutFileScenarioWorker(scenario, modifyFs, /*withoutBundleInfo*/ true); + verifyOutFileScenarioWorker(scenario, modifyFs, /*withoutBuildInfo*/ false); + verifyOutFileScenarioWorker(scenario, modifyFs, /*withoutBuildInfo*/ true); } verifyOutFileScenario("baseline sectioned sourcemaps", noop); @@ -621,7 +621,7 @@ export const b = new A();`); builder.cleanAllProjects(); }); - it("unittests:: tsbuild - outFile:: verify tsbundleInfo presence or absence does not result in new build", () => { + it("unittests:: tsbuild - outFile:: verify buildInfo presence or absence does not result in new build", () => { const fs = outFileFs.shadow(); const expectedOutputs = [ ...outputFiles[0], diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index 8722b612517..854494b2333 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -1735,7 +1735,7 @@ declare namespace ts { declarationText: string; declarationMapPath?: string; declarationMapText?: string; - bundleInfoPath?: string; + buildInfoPath?: string; } interface UnparsedSource extends Node { kind: SyntaxKind.UnparsedSource; @@ -4005,7 +4005,7 @@ declare namespace ts { function createUnparsedSourceFile(inputFile: InputFiles, type: "js" | "dts"): UnparsedSource; function createUnparsedSourceFile(text: string, mapPath: string | undefined, map: string | undefined): UnparsedSource; function createInputFiles(javascriptText: string, declarationText: string): InputFiles; - function createInputFiles(readFileText: (path: string) => string | undefined, javascriptPath: string, javascriptMapPath: string | undefined, declarationPath: string, declarationMapPath: string | undefined, bundleInfoPath: string | undefined): InputFiles; + function createInputFiles(readFileText: (path: string) => string | undefined, javascriptPath: string, javascriptMapPath: string | undefined, declarationPath: string, declarationMapPath: string | undefined, buildInfoPath: string | undefined): InputFiles; function createInputFiles(javascriptText: string, declarationText: string, javascriptMapPath: string | undefined, javascriptMapText: string | undefined, declarationMapPath: string | undefined, declarationMapText: string | undefined): InputFiles; function updateBundle(node: Bundle, sourceFiles: ReadonlyArray, prepends?: ReadonlyArray): Bundle; function createImmediatelyInvokedFunctionExpression(statements: ReadonlyArray): CallExpression; @@ -8363,7 +8363,7 @@ declare namespace ts.server { excludedFiles: ReadonlyArray; private typeAcquisition; updateGraph(): boolean; - getExcludedFiles(): ReadonlyArray; + getExcludedFiles(): readonly NormalizedPath[]; getTypeAcquisition(): TypeAcquisition; setTypeAcquisition(newTypeAcquisition: TypeAcquisition): void; } diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index ca13a2740e6..e6379753de4 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -1735,7 +1735,7 @@ declare namespace ts { declarationText: string; declarationMapPath?: string; declarationMapText?: string; - bundleInfoPath?: string; + buildInfoPath?: string; } interface UnparsedSource extends Node { kind: SyntaxKind.UnparsedSource; @@ -4005,7 +4005,7 @@ declare namespace ts { function createUnparsedSourceFile(inputFile: InputFiles, type: "js" | "dts"): UnparsedSource; function createUnparsedSourceFile(text: string, mapPath: string | undefined, map: string | undefined): UnparsedSource; function createInputFiles(javascriptText: string, declarationText: string): InputFiles; - function createInputFiles(readFileText: (path: string) => string | undefined, javascriptPath: string, javascriptMapPath: string | undefined, declarationPath: string, declarationMapPath: string | undefined, bundleInfoPath: string | undefined): InputFiles; + function createInputFiles(readFileText: (path: string) => string | undefined, javascriptPath: string, javascriptMapPath: string | undefined, declarationPath: string, declarationMapPath: string | undefined, buildInfoPath: string | undefined): InputFiles; function createInputFiles(javascriptText: string, declarationText: string, javascriptMapPath: string | undefined, javascriptMapText: string | undefined, declarationMapPath: string | undefined, declarationMapText: string | undefined): InputFiles; function updateBundle(node: Bundle, sourceFiles: ReadonlyArray, prepends?: ReadonlyArray): Bundle; function createImmediatelyInvokedFunctionExpression(statements: ReadonlyArray): CallExpression; diff --git a/tests/baselines/reference/outFile-baseline-sectioned-sourcemaps-no-bundleInfo.js b/tests/baselines/reference/outFile-baseline-sectioned-sourcemaps-no-buildInfo.js similarity index 100% rename from tests/baselines/reference/outFile-baseline-sectioned-sourcemaps-no-bundleInfo.js rename to tests/baselines/reference/outFile-baseline-sectioned-sourcemaps-no-buildInfo.js diff --git a/tests/baselines/reference/outFile-baseline-sectioned-sourcemaps.js b/tests/baselines/reference/outFile-baseline-sectioned-sourcemaps.js index 9a387a8b6e5..bbfad6ac703 100644 --- a/tests/baselines/reference/outFile-baseline-sectioned-sourcemaps.js +++ b/tests/baselines/reference/outFile-baseline-sectioned-sourcemaps.js @@ -1,3 +1,21 @@ +//// [/src/2/.tsbuildinfo] +{ + "js": [ + { + "pos": 0, + "end": 285, + "kind": "text" + } + ], + "dts": [ + { + "pos": 0, + "end": 100, + "kind": "text" + } + ] +} + //// [/src/2/second-output.d.ts] declare namespace N { } @@ -383,19 +401,19 @@ sourceFile:../second/second_part2.ts --- >>>//# sourceMappingURL=second-output.js.map -//// [/src/2/second-output.tsbundleinfo] +//// [/src/first/bin/.tsbuildinfo] { "js": [ { "pos": 0, - "end": 285, + "end": 110, "kind": "text" } ], "dts": [ { "pos": 0, - "end": 100, + "end": 157, "kind": "text" } ] @@ -701,19 +719,19 @@ sourceFile:../first_part3.ts --- >>>//# sourceMappingURL=first-output.js.map -//// [/src/first/bin/first-output.tsbundleinfo] +//// [/src/third/thirdjs/output/.tsbuildinfo] { "js": [ { "pos": 0, - "end": 110, + "end": 516, "kind": "text" } ], "dts": [ { "pos": 0, - "end": 157, + "end": 365, "kind": "text" } ] @@ -1463,21 +1481,3 @@ sourceFile:../../third_part1.ts --- >>>//# sourceMappingURL=third-output.js.map -//// [/src/third/thirdjs/output/third-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 516, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 365, - "kind": "text" - } - ] -} - diff --git a/tests/baselines/reference/outFile-emitHelpers-in-all-projects-no-bundleInfo.js b/tests/baselines/reference/outFile-emitHelpers-in-all-projects-no-buildInfo.js similarity index 100% rename from tests/baselines/reference/outFile-emitHelpers-in-all-projects-no-bundleInfo.js rename to tests/baselines/reference/outFile-emitHelpers-in-all-projects-no-buildInfo.js diff --git a/tests/baselines/reference/outFile-emitHelpers-in-all-projects.js b/tests/baselines/reference/outFile-emitHelpers-in-all-projects.js index f0f322178e0..fb7aee7d13a 100644 --- a/tests/baselines/reference/outFile-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/outFile-emitHelpers-in-all-projects.js @@ -1,3 +1,27 @@ +//// [/src/2/.tsbuildinfo] +{ + "js": [ + { + "pos": 0, + "end": 597, + "kind": "emitHelpers", + "name": "typescript:extends" + }, + { + "pos": 599, + "end": 1186, + "kind": "text" + } + ], + "dts": [ + { + "pos": 0, + "end": 172, + "kind": "text" + } + ] +} + //// [/src/2/second-output.d.ts] declare namespace N { } @@ -574,7 +598,7 @@ sourceFile:../second/second_part2.ts --- >>>//# sourceMappingURL=second-output.js.map -//// [/src/2/second-output.tsbundleinfo] +//// [/src/first/bin/.tsbuildinfo] { "js": [ { @@ -585,14 +609,14 @@ sourceFile:../second/second_part2.ts }, { "pos": 599, - "end": 1186, + "end": 1003, "kind": "text" } ], "dts": [ { "pos": 0, - "end": 172, + "end": 226, "kind": "text" } ] @@ -1094,30 +1118,6 @@ sourceFile:../first_part3.ts --- >>>//# sourceMappingURL=first-output.js.map -//// [/src/first/bin/first-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 597, - "kind": "emitHelpers", - "name": "typescript:extends" - }, - { - "pos": 599, - "end": 1003, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 226, - "kind": "text" - } - ] -} - //// [/src/first/first_part2.ts] console.log(f()); @@ -1140,6 +1140,30 @@ namespace N { class second1 { } class second2 extends second1 { } +//// [/src/third/thirdjs/output/.tsbuildinfo] +{ + "js": [ + { + "pos": 0, + "end": 597, + "kind": "emitHelpers", + "name": "typescript:extends" + }, + { + "pos": 599, + "end": 2005, + "kind": "text" + } + ], + "dts": [ + { + "pos": 0, + "end": 575, + "kind": "text" + } + ] +} + //// [/src/third/thirdjs/output/third-output.d.ts] interface TheFirst { none: any; @@ -2411,30 +2435,6 @@ sourceFile:../../third_part1.ts --- >>>//# sourceMappingURL=third-output.js.map -//// [/src/third/thirdjs/output/third-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 597, - "kind": "emitHelpers", - "name": "typescript:extends" - }, - { - "pos": 599, - "end": 2005, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 575, - "kind": "text" - } - ] -} - //// [/src/third/third_part1.ts] var c = new C(); c.doSomething(); diff --git a/tests/baselines/reference/outFile-emitHelpers-in-only-one-dependency-project-no-bundleInfo.js b/tests/baselines/reference/outFile-emitHelpers-in-only-one-dependency-project-no-buildInfo.js similarity index 100% rename from tests/baselines/reference/outFile-emitHelpers-in-only-one-dependency-project-no-bundleInfo.js rename to tests/baselines/reference/outFile-emitHelpers-in-only-one-dependency-project-no-buildInfo.js diff --git a/tests/baselines/reference/outFile-emitHelpers-in-only-one-dependency-project.js b/tests/baselines/reference/outFile-emitHelpers-in-only-one-dependency-project.js index a9454e0079e..1175dbca11a 100644 --- a/tests/baselines/reference/outFile-emitHelpers-in-only-one-dependency-project.js +++ b/tests/baselines/reference/outFile-emitHelpers-in-only-one-dependency-project.js @@ -1,3 +1,27 @@ +//// [/src/2/.tsbuildinfo] +{ + "js": [ + { + "pos": 0, + "end": 597, + "kind": "emitHelpers", + "name": "typescript:extends" + }, + { + "pos": 599, + "end": 1186, + "kind": "text" + } + ], + "dts": [ + { + "pos": 0, + "end": 172, + "kind": "text" + } + ] +} + //// [/src/2/second-output.d.ts] declare namespace N { } @@ -574,25 +598,19 @@ sourceFile:../second/second_part2.ts --- >>>//# sourceMappingURL=second-output.js.map -//// [/src/2/second-output.tsbundleinfo] +//// [/src/first/bin/.tsbuildinfo] { "js": [ { "pos": 0, - "end": 597, - "kind": "emitHelpers", - "name": "typescript:extends" - }, - { - "pos": 599, - "end": 1186, + "end": 110, "kind": "text" } ], "dts": [ { "pos": 0, - "end": 172, + "end": 157, "kind": "text" } ] @@ -898,24 +916,6 @@ sourceFile:../first_part3.ts --- >>>//# sourceMappingURL=first-output.js.map -//// [/src/first/bin/first-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 110, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 157, - "kind": "text" - } - ] -} - //// [/src/second/second_part1.ts] namespace N { // Comment text @@ -932,6 +932,30 @@ namespace N { class second1 { } class second2 extends second1 { } +//// [/src/third/thirdjs/output/.tsbuildinfo] +{ + "js": [ + { + "pos": 0, + "end": 597, + "kind": "emitHelpers", + "name": "typescript:extends" + }, + { + "pos": 599, + "end": 1417, + "kind": "text" + } + ], + "dts": [ + { + "pos": 0, + "end": 437, + "kind": "text" + } + ] +} + //// [/src/third/thirdjs/output/third-output.d.ts] interface TheFirst { none: any; @@ -1867,27 +1891,3 @@ sourceFile:../../third_part1.ts --- >>>//# sourceMappingURL=third-output.js.map -//// [/src/third/thirdjs/output/third-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 597, - "kind": "emitHelpers", - "name": "typescript:extends" - }, - { - "pos": 599, - "end": 1417, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 437, - "kind": "text" - } - ] -} - diff --git a/tests/baselines/reference/outFile-multiple-emitHelpers-in-all-projects-no-bundleInfo.js b/tests/baselines/reference/outFile-multiple-emitHelpers-in-all-projects-no-buildInfo.js similarity index 100% rename from tests/baselines/reference/outFile-multiple-emitHelpers-in-all-projects-no-bundleInfo.js rename to tests/baselines/reference/outFile-multiple-emitHelpers-in-all-projects-no-buildInfo.js diff --git a/tests/baselines/reference/outFile-multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/outFile-multiple-emitHelpers-in-all-projects.js index 866e69880f1..f8f1ce796df 100644 --- a/tests/baselines/reference/outFile-multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/outFile-multiple-emitHelpers-in-all-projects.js @@ -1,3 +1,39 @@ +//// [/src/2/.tsbuildinfo] +{ + "js": [ + { + "pos": 0, + "end": 597, + "kind": "emitHelpers", + "name": "typescript:extends" + }, + { + "pos": 599, + "end": 1103, + "kind": "emitHelpers", + "name": "typescript:read" + }, + { + "pos": 1105, + "end": 1275, + "kind": "emitHelpers", + "name": "typescript:spread" + }, + { + "pos": 1277, + "end": 2080, + "kind": "text" + } + ], + "dts": [ + { + "pos": 0, + "end": 238, + "kind": "text" + } + ] +} + //// [/src/2/second-output.d.ts] declare namespace N { } @@ -749,7 +785,7 @@ sourceFile:../second/second_part2.ts --- >>>//# sourceMappingURL=second-output.js.map -//// [/src/2/second-output.tsbundleinfo] +//// [/src/first/bin/.tsbuildinfo] { "js": [ { @@ -772,14 +808,14 @@ sourceFile:../second/second_part2.ts }, { "pos": 1277, - "end": 2080, + "end": 1893, "kind": "text" } ], "dts": [ { "pos": 0, - "end": 238, + "end": 290, "kind": "text" } ] @@ -1454,42 +1490,6 @@ sourceFile:../first_part3.ts --- >>>//# sourceMappingURL=first-output.js.map -//// [/src/first/bin/first-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 597, - "kind": "emitHelpers", - "name": "typescript:extends" - }, - { - "pos": 599, - "end": 1103, - "kind": "emitHelpers", - "name": "typescript:read" - }, - { - "pos": 1105, - "end": 1275, - "kind": "emitHelpers", - "name": "typescript:spread" - }, - { - "pos": 1277, - "end": 1893, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 290, - "kind": "text" - } - ] -} - //// [/src/first/first_part2.ts] console.log(f()); @@ -1571,6 +1571,42 @@ secondsecond_part2Spread(...[10, 20, 30]); } +//// [/src/third/thirdjs/output/.tsbuildinfo] +{ + "js": [ + { + "pos": 0, + "end": 597, + "kind": "emitHelpers", + "name": "typescript:extends" + }, + { + "pos": 599, + "end": 1103, + "kind": "emitHelpers", + "name": "typescript:read" + }, + { + "pos": 1105, + "end": 1275, + "kind": "emitHelpers", + "name": "typescript:spread" + }, + { + "pos": 1277, + "end": 3323, + "kind": "text" + } + ], + "dts": [ + { + "pos": 0, + "end": 769, + "kind": "text" + } + ] +} + //// [/src/third/thirdjs/output/third-output.d.ts] interface TheFirst { none: any; @@ -3283,42 +3319,6 @@ sourceFile:../../third_part1.ts --- >>>//# sourceMappingURL=third-output.js.map -//// [/src/third/thirdjs/output/third-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 597, - "kind": "emitHelpers", - "name": "typescript:extends" - }, - { - "pos": 599, - "end": 1103, - "kind": "emitHelpers", - "name": "typescript:read" - }, - { - "pos": 1105, - "end": 1275, - "kind": "emitHelpers", - "name": "typescript:spread" - }, - { - "pos": 1277, - "end": 3323, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 769, - "kind": "text" - } - ] -} - //// [/src/third/third_part1.ts] var c = new C(); c.doSomething(); diff --git a/tests/baselines/reference/outFile-multiple-emitHelpers-in-different-projects-no-bundleInfo.js b/tests/baselines/reference/outFile-multiple-emitHelpers-in-different-projects-no-buildInfo.js similarity index 100% rename from tests/baselines/reference/outFile-multiple-emitHelpers-in-different-projects-no-bundleInfo.js rename to tests/baselines/reference/outFile-multiple-emitHelpers-in-different-projects-no-buildInfo.js diff --git a/tests/baselines/reference/outFile-multiple-emitHelpers-in-different-projects.js b/tests/baselines/reference/outFile-multiple-emitHelpers-in-different-projects.js index fa6f716e49b..4898a6cffa4 100644 --- a/tests/baselines/reference/outFile-multiple-emitHelpers-in-different-projects.js +++ b/tests/baselines/reference/outFile-multiple-emitHelpers-in-different-projects.js @@ -1,3 +1,27 @@ +//// [/src/2/.tsbuildinfo] +{ + "js": [ + { + "pos": 0, + "end": 597, + "kind": "emitHelpers", + "name": "typescript:extends" + }, + { + "pos": 599, + "end": 1186, + "kind": "text" + } + ], + "dts": [ + { + "pos": 0, + "end": 172, + "kind": "text" + } + ] +} + //// [/src/2/second-output.d.ts] declare namespace N { } @@ -574,25 +598,31 @@ sourceFile:../second/second_part2.ts --- >>>//# sourceMappingURL=second-output.js.map -//// [/src/2/second-output.tsbundleinfo] +//// [/src/first/bin/.tsbuildinfo] { "js": [ { "pos": 0, - "end": 597, + "end": 504, "kind": "emitHelpers", - "name": "typescript:extends" + "name": "typescript:read" }, { - "pos": 599, - "end": 1186, + "pos": 506, + "end": 676, + "kind": "emitHelpers", + "name": "typescript:spread" + }, + { + "pos": 678, + "end": 1000, "kind": "text" } ], "dts": [ { "pos": 0, - "end": 172, + "end": 221, "kind": "text" } ] @@ -1071,36 +1101,6 @@ sourceFile:../first_part3.ts --- >>>//# sourceMappingURL=first-output.js.map -//// [/src/first/bin/first-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 504, - "kind": "emitHelpers", - "name": "typescript:read" - }, - { - "pos": 506, - "end": 676, - "kind": "emitHelpers", - "name": "typescript:spread" - }, - { - "pos": 678, - "end": 1000, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 221, - "kind": "text" - } - ] -} - //// [/src/first/first_part3.ts] function f() { return "JS does hoists"; @@ -1147,6 +1147,42 @@ namespace N { class second1 { } class second2 extends second1 { } +//// [/src/third/thirdjs/output/.tsbuildinfo] +{ + "js": [ + { + "pos": 0, + "end": 504, + "kind": "emitHelpers", + "name": "typescript:read" + }, + { + "pos": 506, + "end": 676, + "kind": "emitHelpers", + "name": "typescript:spread" + }, + { + "pos": 678, + "end": 1275, + "kind": "emitHelpers", + "name": "typescript:extends" + }, + { + "pos": 1277, + "end": 2519, + "kind": "text" + } + ], + "dts": [ + { + "pos": 0, + "end": 565, + "kind": "text" + } + ] +} + //// [/src/third/thirdjs/output/third-output.d.ts] interface TheFirst { none: any; @@ -2391,42 +2427,6 @@ sourceFile:../../third_part1.ts --- >>>//# sourceMappingURL=third-output.js.map -//// [/src/third/thirdjs/output/third-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 504, - "kind": "emitHelpers", - "name": "typescript:read" - }, - { - "pos": 506, - "end": 676, - "kind": "emitHelpers", - "name": "typescript:spread" - }, - { - "pos": 678, - "end": 1275, - "kind": "emitHelpers", - "name": "typescript:extends" - }, - { - "pos": 1277, - "end": 2519, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 565, - "kind": "text" - } - ] -} - //// [/src/third/third_part1.ts] var c = new C(); c.doSomething(); diff --git a/tests/baselines/reference/outFile-multiple-prologues-in-all-projects-no-bundleInfo.js b/tests/baselines/reference/outFile-multiple-prologues-in-all-projects-no-buildInfo.js similarity index 100% rename from tests/baselines/reference/outFile-multiple-prologues-in-all-projects-no-bundleInfo.js rename to tests/baselines/reference/outFile-multiple-prologues-in-all-projects-no-buildInfo.js diff --git a/tests/baselines/reference/outFile-multiple-prologues-in-all-projects.js b/tests/baselines/reference/outFile-multiple-prologues-in-all-projects.js index 8b75236c051..80ce35e472d 100644 --- a/tests/baselines/reference/outFile-multiple-prologues-in-all-projects.js +++ b/tests/baselines/reference/outFile-multiple-prologues-in-all-projects.js @@ -1,3 +1,39 @@ +//// [/src/2/.tsbuildinfo] +{ + "js": [ + { + "pos": 0, + "end": 13, + "kind": "prologue", + "text": "use strict" + }, + { + "pos": 15, + "end": 28, + "kind": "prologue", + "text": "myPrologue" + }, + { + "pos": 30, + "end": 44, + "kind": "prologue", + "text": "myPrologue2" + }, + { + "pos": 46, + "end": 331, + "kind": "text" + } + ], + "dts": [ + { + "pos": 0, + "end": 100, + "kind": "text" + } + ] +} + //// [/src/2/second-output.d.ts] declare namespace N { } @@ -422,7 +458,7 @@ sourceFile:../second/second_part2.ts --- >>>//# sourceMappingURL=second-output.js.map -//// [/src/2/second-output.tsbundleinfo] +//// [/src/first/bin/.tsbuildinfo] { "js": [ { @@ -439,20 +475,14 @@ sourceFile:../second/second_part2.ts }, { "pos": 30, - "end": 44, - "kind": "prologue", - "text": "myPrologue2" - }, - { - "pos": 46, - "end": 331, + "end": 140, "kind": "text" } ], "dts": [ { "pos": 0, - "end": 100, + "end": 157, "kind": "text" } ] @@ -775,36 +805,6 @@ sourceFile:../first_part3.ts --- >>>//# sourceMappingURL=first-output.js.map -//// [/src/first/bin/first-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 13, - "kind": "prologue", - "text": "use strict" - }, - { - "pos": 15, - "end": 28, - "kind": "prologue", - "text": "myPrologue" - }, - { - "pos": 30, - "end": 140, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 157, - "kind": "text" - } - ] -} - //// [/src/first/first_PART1.ts] "myPrologue" interface TheFirst { @@ -884,6 +884,48 @@ class C { } +//// [/src/third/thirdjs/output/.tsbuildinfo] +{ + "js": [ + { + "pos": 0, + "end": 13, + "kind": "prologue", + "text": "use strict" + }, + { + "pos": 15, + "end": 28, + "kind": "prologue", + "text": "myPrologue" + }, + { + "pos": 30, + "end": 44, + "kind": "prologue", + "text": "myPrologue2" + }, + { + "pos": 46, + "end": 60, + "kind": "prologue", + "text": "myPrologue3" + }, + { + "pos": 62, + "end": 578, + "kind": "text" + } + ], + "dts": [ + { + "pos": 0, + "end": 365, + "kind": "text" + } + ] +} + //// [/src/third/thirdjs/output/third-output.d.ts] interface TheFirst { none: any; @@ -1691,48 +1733,6 @@ sourceFile:../../third_part1.ts --- >>>//# sourceMappingURL=third-output.js.map -//// [/src/third/thirdjs/output/third-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 13, - "kind": "prologue", - "text": "use strict" - }, - { - "pos": 15, - "end": 28, - "kind": "prologue", - "text": "myPrologue" - }, - { - "pos": 30, - "end": 44, - "kind": "prologue", - "text": "myPrologue2" - }, - { - "pos": 46, - "end": 60, - "kind": "prologue", - "text": "myPrologue3" - }, - { - "pos": 62, - "end": 578, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 365, - "kind": "text" - } - ] -} - //// [/src/third/third_part1.ts] "myPrologue3"; "myPrologue"; diff --git a/tests/baselines/reference/outFile-multiple-prologues-in-different-projects-no-bundleInfo.js b/tests/baselines/reference/outFile-multiple-prologues-in-different-projects-no-buildInfo.js similarity index 100% rename from tests/baselines/reference/outFile-multiple-prologues-in-different-projects-no-bundleInfo.js rename to tests/baselines/reference/outFile-multiple-prologues-in-different-projects-no-buildInfo.js diff --git a/tests/baselines/reference/outFile-multiple-prologues-in-different-projects.js b/tests/baselines/reference/outFile-multiple-prologues-in-different-projects.js index 95f3dc070f5..faa2092aaec 100644 --- a/tests/baselines/reference/outFile-multiple-prologues-in-different-projects.js +++ b/tests/baselines/reference/outFile-multiple-prologues-in-different-projects.js @@ -1,3 +1,33 @@ +//// [/src/2/.tsbuildinfo] +{ + "js": [ + { + "pos": 0, + "end": 13, + "kind": "prologue", + "text": "myPrologue" + }, + { + "pos": 15, + "end": 29, + "kind": "prologue", + "text": "myPrologue2" + }, + { + "pos": 31, + "end": 316, + "kind": "text" + } + ], + "dts": [ + { + "pos": 0, + "end": 100, + "kind": "text" + } + ] +} + //// [/src/2/second-output.d.ts] declare namespace N { } @@ -420,31 +450,25 @@ sourceFile:../second/second_part2.ts --- >>>//# sourceMappingURL=second-output.js.map -//// [/src/2/second-output.tsbundleinfo] +//// [/src/first/bin/.tsbuildinfo] { "js": [ { "pos": 0, "end": 13, "kind": "prologue", - "text": "myPrologue" + "text": "use strict" }, { "pos": 15, - "end": 29, - "kind": "prologue", - "text": "myPrologue2" - }, - { - "pos": 31, - "end": 316, + "end": 125, "kind": "text" } ], "dts": [ { "pos": 0, - "end": 100, + "end": 157, "kind": "text" } ] @@ -752,30 +776,6 @@ sourceFile:../first_part3.ts --- >>>//# sourceMappingURL=first-output.js.map -//// [/src/first/bin/first-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 13, - "kind": "prologue", - "text": "use strict" - }, - { - "pos": 15, - "end": 125, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 157, - "kind": "text" - } - ] -} - //// [/src/first/tsconfig.json] { "compilerOptions": { @@ -822,6 +822,42 @@ class C { } +//// [/src/third/thirdjs/output/.tsbuildinfo] +{ + "js": [ + { + "pos": 0, + "end": 13, + "kind": "prologue", + "text": "use strict" + }, + { + "pos": 15, + "end": 28, + "kind": "prologue", + "text": "myPrologue" + }, + { + "pos": 30, + "end": 44, + "kind": "prologue", + "text": "myPrologue2" + }, + { + "pos": 46, + "end": 562, + "kind": "text" + } + ], + "dts": [ + { + "pos": 0, + "end": 365, + "kind": "text" + } + ] +} + //// [/src/third/thirdjs/output/third-output.d.ts] interface TheFirst { none: any; @@ -1606,42 +1642,6 @@ sourceFile:../../third_part1.ts --- >>>//# sourceMappingURL=third-output.js.map -//// [/src/third/thirdjs/output/third-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 13, - "kind": "prologue", - "text": "use strict" - }, - { - "pos": 15, - "end": 28, - "kind": "prologue", - "text": "myPrologue" - }, - { - "pos": 30, - "end": 44, - "kind": "prologue", - "text": "myPrologue2" - }, - { - "pos": 46, - "end": 562, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 365, - "kind": "text" - } - ] -} - //// [/src/third/tsconfig.json] { "compilerOptions": { diff --git a/tests/baselines/reference/outFile-shebang-in-all-projects-no-bundleInfo.js b/tests/baselines/reference/outFile-shebang-in-all-projects-no-buildInfo.js similarity index 100% rename from tests/baselines/reference/outFile-shebang-in-all-projects-no-bundleInfo.js rename to tests/baselines/reference/outFile-shebang-in-all-projects-no-buildInfo.js diff --git a/tests/baselines/reference/outFile-shebang-in-all-projects.js b/tests/baselines/reference/outFile-shebang-in-all-projects.js index de622a9476e..093a4c1563c 100644 --- a/tests/baselines/reference/outFile-shebang-in-all-projects.js +++ b/tests/baselines/reference/outFile-shebang-in-all-projects.js @@ -1,3 +1,21 @@ +//// [/src/2/.tsbuildinfo] +{ + "js": [ + { + "pos": 35, + "end": 320, + "kind": "text" + } + ], + "dts": [ + { + "pos": 35, + "end": 135, + "kind": "text" + } + ] +} + //// [/src/2/second-output.d.ts] #!someshebang second second_part1 declare namespace N { @@ -389,19 +407,19 @@ sourceFile:../second/second_part2.ts --- >>>//# sourceMappingURL=second-output.js.map -//// [/src/2/second-output.tsbundleinfo] +//// [/src/first/bin/.tsbuildinfo] { "js": [ { - "pos": 35, - "end": 320, + "pos": 33, + "end": 143, "kind": "text" } ], "dts": [ { - "pos": 35, - "end": 135, + "pos": 33, + "end": 190, "kind": "text" } ] @@ -714,24 +732,6 @@ sourceFile:../first_part3.ts --- >>>//# sourceMappingURL=first-output.js.map -//// [/src/first/bin/first-output.tsbundleinfo] -{ - "js": [ - { - "pos": 33, - "end": 143, - "kind": "text" - } - ], - "dts": [ - { - "pos": 33, - "end": 190, - "kind": "text" - } - ] -} - //// [/src/first/first_PART1.ts] #!someshebang first first_PART1 interface TheFirst { @@ -767,6 +767,24 @@ namespace N { } +//// [/src/third/thirdjs/output/.tsbuildinfo] +{ + "js": [ + { + "pos": 33, + "end": 549, + "kind": "text" + } + ], + "dts": [ + { + "pos": 33, + "end": 398, + "kind": "text" + } + ] +} + //// [/src/third/thirdjs/output/third-output.d.ts] #!someshebang first first_PART1 interface TheFirst { @@ -1522,24 +1540,6 @@ sourceFile:../../third_part1.ts --- >>>//# sourceMappingURL=third-output.js.map -//// [/src/third/thirdjs/output/third-output.tsbundleinfo] -{ - "js": [ - { - "pos": 33, - "end": 549, - "kind": "text" - } - ], - "dts": [ - { - "pos": 33, - "end": 398, - "kind": "text" - } - ] -} - //// [/src/third/third_part1.ts] #!someshebang third third_part1 var c = new C(); diff --git a/tests/baselines/reference/outFile-shebang-in-only-one-dependency-project-no-bundleInfo.js b/tests/baselines/reference/outFile-shebang-in-only-one-dependency-project-no-buildInfo.js similarity index 100% rename from tests/baselines/reference/outFile-shebang-in-only-one-dependency-project-no-bundleInfo.js rename to tests/baselines/reference/outFile-shebang-in-only-one-dependency-project-no-buildInfo.js diff --git a/tests/baselines/reference/outFile-shebang-in-only-one-dependency-project.js b/tests/baselines/reference/outFile-shebang-in-only-one-dependency-project.js index 67fdd0c6d3b..00b8eece4f0 100644 --- a/tests/baselines/reference/outFile-shebang-in-only-one-dependency-project.js +++ b/tests/baselines/reference/outFile-shebang-in-only-one-dependency-project.js @@ -1,3 +1,21 @@ +//// [/src/2/.tsbuildinfo] +{ + "js": [ + { + "pos": 35, + "end": 320, + "kind": "text" + } + ], + "dts": [ + { + "pos": 35, + "end": 135, + "kind": "text" + } + ] +} + //// [/src/2/second-output.d.ts] #!someshebang second second_part1 declare namespace N { @@ -389,19 +407,19 @@ sourceFile:../second/second_part2.ts --- >>>//# sourceMappingURL=second-output.js.map -//// [/src/2/second-output.tsbundleinfo] +//// [/src/first/bin/.tsbuildinfo] { "js": [ { - "pos": 35, - "end": 320, + "pos": 0, + "end": 110, "kind": "text" } ], "dts": [ { - "pos": 35, - "end": 135, + "pos": 0, + "end": 157, "kind": "text" } ] @@ -707,24 +725,6 @@ sourceFile:../first_part3.ts --- >>>//# sourceMappingURL=first-output.js.map -//// [/src/first/bin/first-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 110, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 157, - "kind": "text" - } - ] -} - //// [/src/second/second_part1.ts] #!someshebang second second_part1 namespace N { @@ -740,6 +740,24 @@ namespace N { } +//// [/src/third/thirdjs/output/.tsbuildinfo] +{ + "js": [ + { + "pos": 35, + "end": 551, + "kind": "text" + } + ], + "dts": [ + { + "pos": 35, + "end": 400, + "kind": "text" + } + ] +} + //// [/src/third/thirdjs/output/third-output.d.ts] #!someshebang second second_part1 interface TheFirst { @@ -1490,21 +1508,3 @@ sourceFile:../../third_part1.ts --- >>>//# sourceMappingURL=third-output.js.map -//// [/src/third/thirdjs/output/third-output.tsbundleinfo] -{ - "js": [ - { - "pos": 35, - "end": 551, - "kind": "text" - } - ], - "dts": [ - { - "pos": 35, - "end": 400, - "kind": "text" - } - ] -} - diff --git a/tests/baselines/reference/outFile-strict-in-all-projects-no-bundleInfo.js b/tests/baselines/reference/outFile-strict-in-all-projects-no-buildInfo.js similarity index 100% rename from tests/baselines/reference/outFile-strict-in-all-projects-no-bundleInfo.js rename to tests/baselines/reference/outFile-strict-in-all-projects-no-buildInfo.js diff --git a/tests/baselines/reference/outFile-strict-in-all-projects.js b/tests/baselines/reference/outFile-strict-in-all-projects.js index f1911e22cc2..ea188b9f883 100644 --- a/tests/baselines/reference/outFile-strict-in-all-projects.js +++ b/tests/baselines/reference/outFile-strict-in-all-projects.js @@ -1,3 +1,27 @@ +//// [/src/2/.tsbuildinfo] +{ + "js": [ + { + "pos": 0, + "end": 13, + "kind": "prologue", + "text": "use strict" + }, + { + "pos": 15, + "end": 300, + "kind": "text" + } + ], + "dts": [ + { + "pos": 0, + "end": 100, + "kind": "text" + } + ] +} + //// [/src/2/second-output.d.ts] declare namespace N { } @@ -385,7 +409,7 @@ sourceFile:../second/second_part2.ts --- >>>//# sourceMappingURL=second-output.js.map -//// [/src/2/second-output.tsbundleinfo] +//// [/src/first/bin/.tsbuildinfo] { "js": [ { @@ -396,14 +420,14 @@ sourceFile:../second/second_part2.ts }, { "pos": 15, - "end": 300, + "end": 125, "kind": "text" } ], "dts": [ { "pos": 0, - "end": 100, + "end": 157, "kind": "text" } ] @@ -711,30 +735,6 @@ sourceFile:../first_part3.ts --- >>>//# sourceMappingURL=first-output.js.map -//// [/src/first/bin/first-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 13, - "kind": "prologue", - "text": "use strict" - }, - { - "pos": 15, - "end": 125, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 157, - "kind": "text" - } - ] -} - //// [/src/first/tsconfig.json] { "compilerOptions": { @@ -775,6 +775,30 @@ sourceFile:../first_part3.ts } +//// [/src/third/thirdjs/output/.tsbuildinfo] +{ + "js": [ + { + "pos": 0, + "end": 13, + "kind": "prologue", + "text": "use strict" + }, + { + "pos": 15, + "end": 531, + "kind": "text" + } + ], + "dts": [ + { + "pos": 0, + "end": 365, + "kind": "text" + } + ] +} + //// [/src/third/thirdjs/output/third-output.d.ts] interface TheFirst { none: any; @@ -1521,30 +1545,6 @@ sourceFile:../../third_part1.ts --- >>>//# sourceMappingURL=third-output.js.map -//// [/src/third/thirdjs/output/third-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 13, - "kind": "prologue", - "text": "use strict" - }, - { - "pos": 15, - "end": 531, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 365, - "kind": "text" - } - ] -} - //// [/src/third/tsconfig.json] { "compilerOptions": { diff --git a/tests/baselines/reference/outFile-strict-in-one-dependency-no-bundleInfo.js b/tests/baselines/reference/outFile-strict-in-one-dependency-no-buildInfo.js similarity index 100% rename from tests/baselines/reference/outFile-strict-in-one-dependency-no-bundleInfo.js rename to tests/baselines/reference/outFile-strict-in-one-dependency-no-buildInfo.js diff --git a/tests/baselines/reference/outFile-strict-in-one-dependency.js b/tests/baselines/reference/outFile-strict-in-one-dependency.js index bc4eaaa84fb..fbd04d5f03c 100644 --- a/tests/baselines/reference/outFile-strict-in-one-dependency.js +++ b/tests/baselines/reference/outFile-strict-in-one-dependency.js @@ -1,3 +1,27 @@ +//// [/src/2/.tsbuildinfo] +{ + "js": [ + { + "pos": 0, + "end": 13, + "kind": "prologue", + "text": "use strict" + }, + { + "pos": 15, + "end": 300, + "kind": "text" + } + ], + "dts": [ + { + "pos": 0, + "end": 100, + "kind": "text" + } + ] +} + //// [/src/2/second-output.d.ts] declare namespace N { } @@ -385,25 +409,19 @@ sourceFile:../second/second_part2.ts --- >>>//# sourceMappingURL=second-output.js.map -//// [/src/2/second-output.tsbundleinfo] +//// [/src/first/bin/.tsbuildinfo] { "js": [ { "pos": 0, - "end": 13, - "kind": "prologue", - "text": "use strict" - }, - { - "pos": 15, - "end": 300, + "end": 110, "kind": "text" } ], "dts": [ { "pos": 0, - "end": 100, + "end": 157, "kind": "text" } ] @@ -709,24 +727,6 @@ sourceFile:../first_part3.ts --- >>>//# sourceMappingURL=first-output.js.map -//// [/src/first/bin/first-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 110, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 157, - "kind": "text" - } - ] -} - //// [/src/second/tsconfig.json] { "compilerOptions": { @@ -745,6 +745,30 @@ sourceFile:../first_part3.ts } +//// [/src/third/thirdjs/output/.tsbuildinfo] +{ + "js": [ + { + "pos": 0, + "end": 13, + "kind": "prologue", + "text": "use strict" + }, + { + "pos": 15, + "end": 531, + "kind": "text" + } + ], + "dts": [ + { + "pos": 0, + "end": 365, + "kind": "text" + } + ] +} + //// [/src/third/thirdjs/output/third-output.d.ts] interface TheFirst { none: any; @@ -1491,27 +1515,3 @@ sourceFile:../../third_part1.ts --- >>>//# sourceMappingURL=third-output.js.map -//// [/src/third/thirdjs/output/third-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 13, - "kind": "prologue", - "text": "use strict" - }, - { - "pos": 15, - "end": 531, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 365, - "kind": "text" - } - ] -} - diff --git a/tests/baselines/reference/outFile-triple-slash-refs-in-all-projects-no-bundleInfo.js b/tests/baselines/reference/outFile-triple-slash-refs-in-all-projects-no-buildInfo.js similarity index 100% rename from tests/baselines/reference/outFile-triple-slash-refs-in-all-projects-no-bundleInfo.js rename to tests/baselines/reference/outFile-triple-slash-refs-in-all-projects-no-buildInfo.js diff --git a/tests/baselines/reference/outFile-triple-slash-refs-in-all-projects.js b/tests/baselines/reference/outFile-triple-slash-refs-in-all-projects.js index ef479887b39..56f37f9c3c8 100644 --- a/tests/baselines/reference/outFile-triple-slash-refs-in-all-projects.js +++ b/tests/baselines/reference/outFile-triple-slash-refs-in-all-projects.js @@ -1,3 +1,27 @@ +//// [/src/2/.tsbuildinfo] +{ + "js": [ + { + "pos": 0, + "end": 336, + "kind": "text" + } + ], + "dts": [ + { + "pos": 0, + "end": 49, + "kind": "reference", + "fileName": "../second/tripleRef.d.ts" + }, + { + "pos": 51, + "end": 205, + "kind": "text" + } + ] +} + //// [/src/2/second-output.d.ts] /// declare const second_part1Const: secondsecond_part1; @@ -437,25 +461,25 @@ sourceFile:../second/second_part2.ts --- >>>//# sourceMappingURL=second-output.js.map -//// [/src/2/second-output.tsbundleinfo] +//// [/src/first/bin/.tsbuildinfo] { "js": [ { "pos": 0, - "end": 336, + "end": 158, "kind": "text" } ], "dts": [ { "pos": 0, - "end": 49, + "end": 42, "kind": "reference", - "fileName": "../second/tripleRef.d.ts" + "fileName": "../tripleRef.d.ts" }, { - "pos": 51, - "end": 205, + "pos": 44, + "end": 252, "kind": "text" } ] @@ -818,30 +842,6 @@ sourceFile:../first_part3.ts --- >>>//# sourceMappingURL=first-output.js.map -//// [/src/first/bin/first-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 158, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 42, - "kind": "reference", - "fileName": "../tripleRef.d.ts" - }, - { - "pos": 44, - "end": 252, - "kind": "text" - } - ] -} - //// [/src/first/first_part2.ts] /// const first_part2Const = new firstfirst_part2(); @@ -870,6 +870,42 @@ namespace N { //// [/src/second/tripleRef.d.ts] declare class secondsecond_part1 { } +//// [/src/third/thirdjs/output/.tsbuildinfo] +{ + "js": [ + { + "pos": 0, + "end": 663, + "kind": "text" + } + ], + "dts": [ + { + "pos": 0, + "end": 45, + "kind": "reference", + "fileName": "../../tripleRef.d.ts" + }, + { + "pos": 47, + "end": 101, + "kind": "reference", + "fileName": "../../../first/tripleRef.d.ts" + }, + { + "pos": 103, + "end": 158, + "kind": "reference", + "fileName": "../../../second/tripleRef.d.ts" + }, + { + "pos": 160, + "end": 681, + "kind": "text" + } + ] +} + //// [/src/third/thirdjs/output/third-output.d.ts] /// /// @@ -1779,42 +1815,6 @@ sourceFile:../../third_part1.ts --- >>>//# sourceMappingURL=third-output.js.map -//// [/src/third/thirdjs/output/third-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 663, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 45, - "kind": "reference", - "fileName": "../../tripleRef.d.ts" - }, - { - "pos": 47, - "end": 101, - "kind": "reference", - "fileName": "../../../first/tripleRef.d.ts" - }, - { - "pos": 103, - "end": 158, - "kind": "reference", - "fileName": "../../../second/tripleRef.d.ts" - }, - { - "pos": 160, - "end": 681, - "kind": "text" - } - ] -} - //// [/src/third/third_part1.ts] /// const third_part1Const = new thirdthird_part1(); diff --git a/tests/baselines/reference/outFile-triple-slash-refs-in-one-project-no-bundleInfo.js b/tests/baselines/reference/outFile-triple-slash-refs-in-one-project-no-buildInfo.js similarity index 100% rename from tests/baselines/reference/outFile-triple-slash-refs-in-one-project-no-bundleInfo.js rename to tests/baselines/reference/outFile-triple-slash-refs-in-one-project-no-buildInfo.js diff --git a/tests/baselines/reference/outFile-triple-slash-refs-in-one-project.js b/tests/baselines/reference/outFile-triple-slash-refs-in-one-project.js index a96838e4102..8fb60cacdfb 100644 --- a/tests/baselines/reference/outFile-triple-slash-refs-in-one-project.js +++ b/tests/baselines/reference/outFile-triple-slash-refs-in-one-project.js @@ -1,3 +1,27 @@ +//// [/src/2/.tsbuildinfo] +{ + "js": [ + { + "pos": 0, + "end": 336, + "kind": "text" + } + ], + "dts": [ + { + "pos": 0, + "end": 49, + "kind": "reference", + "fileName": "../second/tripleRef.d.ts" + }, + { + "pos": 51, + "end": 205, + "kind": "text" + } + ] +} + //// [/src/2/second-output.d.ts] /// declare const second_part1Const: secondsecond_part1; @@ -437,25 +461,19 @@ sourceFile:../second/second_part2.ts --- >>>//# sourceMappingURL=second-output.js.map -//// [/src/2/second-output.tsbundleinfo] +//// [/src/first/bin/.tsbuildinfo] { "js": [ { "pos": 0, - "end": 336, + "end": 110, "kind": "text" } ], "dts": [ { "pos": 0, - "end": 49, - "kind": "reference", - "fileName": "../second/tripleRef.d.ts" - }, - { - "pos": 51, - "end": 205, + "end": 157, "kind": "text" } ] @@ -761,24 +779,6 @@ sourceFile:../first_part3.ts --- >>>//# sourceMappingURL=first-output.js.map -//// [/src/first/bin/first-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 110, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 157, - "kind": "text" - } - ] -} - //// [/src/second/second_part1.ts] /// const second_part1Const = new secondsecond_part1(); @@ -798,6 +798,30 @@ namespace N { //// [/src/second/tripleRef.d.ts] declare class secondsecond_part1 { } +//// [/src/third/thirdjs/output/.tsbuildinfo] +{ + "js": [ + { + "pos": 0, + "end": 567, + "kind": "text" + } + ], + "dts": [ + { + "pos": 0, + "end": 55, + "kind": "reference", + "fileName": "../../../second/tripleRef.d.ts" + }, + { + "pos": 57, + "end": 476, + "kind": "text" + } + ] +} + //// [/src/third/thirdjs/output/third-output.d.ts] /// interface TheFirst { @@ -1596,27 +1620,3 @@ sourceFile:../../third_part1.ts --- >>>//# sourceMappingURL=third-output.js.map -//// [/src/third/thirdjs/output/third-output.tsbundleinfo] -{ - "js": [ - { - "pos": 0, - "end": 567, - "kind": "text" - } - ], - "dts": [ - { - "pos": 0, - "end": 55, - "kind": "reference", - "fileName": "../../../second/tripleRef.d.ts" - }, - { - "pos": 57, - "end": 476, - "kind": "text" - } - ] -} -