diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 64a7ed16f16..0e8c97c2fb5 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -530,8 +530,8 @@ namespace ts { // error if no source map or for now if inline sourcemap if ((sourceMapFilePath && !sourceMapText) || config.options.inlineSourceMap) return sourceMapFilePath || "inline sourcemap decoding"; // read declaration text - const declarationText = declarationFilePath && host.readFile(declarationFilePath!); - if (declarationFilePath && !declarationText) return declarationFilePath!; + const declarationText = declarationFilePath && host.readFile(declarationFilePath); + if (declarationFilePath && !declarationText) return declarationFilePath; const declarationMapText = declarationMapPath && host.readFile(declarationMapPath); // error if no source map or for now if inline sourcemap if ((declarationMapPath && !declarationMapText) || config.options.inlineSourceMap) return declarationMapPath || "inline sourcemap decoding"; diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts index 8375afc7f82..30a83d10e17 100644 --- a/src/compiler/factory.ts +++ b/src/compiler/factory.ts @@ -2666,20 +2666,11 @@ namespace ts { export function createUnparsedSourceFile(inputFile: InputFiles, type: "js" | "dts", stripInternal?: boolean): UnparsedSource; export function createUnparsedSourceFile(text: string, mapPath: string | undefined, map: string | undefined): UnparsedSource; export function createUnparsedSourceFile(textOrInputFiles: string | InputFiles, mapPathOrType?: string, mapTextOrStripInternal?: string | boolean): UnparsedSource { - if (!isString(textOrInputFiles) && textOrInputFiles.oldFileOfCurrentEmit) { - Debug.assert(mapPathOrType === "js" || mapPathOrType === "dts"); - return mapPathOrType === "js" ? createUnparsedJsSourceFile(textOrInputFiles) : createUnparsedDtsSourceFile(textOrInputFiles); - } const node = createUnparsedSource(); - let prologues: UnparsedPrologue[] | undefined; - let helpers: UnscopedEmitHelper[] | undefined; - let referencedFiles: FileReference[] | undefined; - let typeReferenceDirectives: string[] | undefined; - let libReferenceDirectives: FileReference[] | undefined; - let texts: UnparsedSourceText[] | undefined; + let stripInternal: boolean | undefined; + let bundleFileInfo: BundleFileInfo | undefined; if (!isString(textOrInputFiles)) { Debug.assert(mapPathOrType === "js" || mapPathOrType === "dts"); - Debug.assert(!textOrInputFiles.oldFileOfCurrentEmit); node.fileName = (mapPathOrType === "js" ? textOrInputFiles.javascriptPath : textOrInputFiles.declarationPath) || ""; node.sourceMapPath = mapPathOrType === "js" ? textOrInputFiles.javascriptMapPath : textOrInputFiles.declarationMapPath; Object.defineProperties(node, { @@ -2687,45 +2678,15 @@ namespace ts { sourceMapText: { get() { return mapPathOrType === "js" ? textOrInputFiles.javascriptMapText : textOrInputFiles.declarationMapText; } }, }); + if (textOrInputFiles.buildInfo && textOrInputFiles.buildInfo.bundle) { + node.oldFileOfCurrentEmit = textOrInputFiles.oldFileOfCurrentEmit; Debug.assert(mapTextOrStripInternal === undefined || typeof mapTextOrStripInternal === "boolean"); - const stripInternal = mapTextOrStripInternal as boolean | undefined; - const bundleFileInfo = mapPathOrType === "js" ? textOrInputFiles.buildInfo.bundle.js : textOrInputFiles.buildInfo.bundle.dts; - for (const section of bundleFileInfo ? bundleFileInfo.sections : emptyArray) { - switch (section.kind) { - case BundleFileSectionKind.Prologue: - (prologues || (prologues = [])).push(createUnparsedNode(section, node) as UnparsedPrologue); - break; - case BundleFileSectionKind.EmitHelpers: - (helpers || (helpers = [])).push(getAllUnscopedEmitHelpers().get(section.data)!); - break; - case BundleFileSectionKind.NoDefaultLib: - node.hasNoDefaultLib = true; - break; - case BundleFileSectionKind.Reference: - (referencedFiles || (referencedFiles = [])).push({ pos: -1, end: -1, fileName: section.data }); - break; - case BundleFileSectionKind.Type: - (typeReferenceDirectives || (typeReferenceDirectives = [])).push(section.data); - break; - case BundleFileSectionKind.Lib: - (libReferenceDirectives || (libReferenceDirectives = [])).push({ pos: -1, end: -1, fileName: section.data }); - break; - case BundleFileSectionKind.Prepend: - const prependNode = createUnparsedNode(section, node) as UnparsedPrepend; - prependNode.texts = section.texts.map(text => createUnparsedNode(text, node) as UnparsedTextLike); - (texts || (texts = [])).push(prependNode); - break; - case BundleFileSectionKind.Internal: - if (stripInternal) break; - // falls through - case BundleFileSectionKind.Text: - case BundleFileSectionKind.SourceMapUrl: - (texts || (texts = [])).push(createUnparsedNode(section, node) as UnparsedTextLike); - break; - default: - Debug.assertNever(section); - } + stripInternal = mapTextOrStripInternal as boolean | undefined; + bundleFileInfo = mapPathOrType === "js" ? textOrInputFiles.buildInfo.bundle.js : textOrInputFiles.buildInfo.bundle.dts; + if (node.oldFileOfCurrentEmit) { + parseOldFileOfCurrentEmit(node, Debug.assertDefined(bundleFileInfo)); + return node; } } } @@ -2735,68 +2696,81 @@ namespace ts { node.sourceMapPath = mapPathOrType; node.sourceMapText = mapTextOrStripInternal as string; } + Debug.assert(!node.oldFileOfCurrentEmit); + parseUnparsedSourceFile(node, bundleFileInfo, stripInternal); + return node; + } + + function parseUnparsedSourceFile(node: UnparsedSource, bundleFileInfo: BundleFileInfo | undefined, stripInternal: boolean | undefined) { + let prologues: UnparsedPrologue[] | undefined; + let helpers: UnscopedEmitHelper[] | undefined; + let referencedFiles: FileReference[] | undefined; + let typeReferenceDirectives: string[] | undefined; + let libReferenceDirectives: FileReference[] | undefined; + let texts: UnparsedSourceText[] | undefined; + + for (const section of bundleFileInfo ? bundleFileInfo.sections : emptyArray) { + switch (section.kind) { + case BundleFileSectionKind.Prologue: + (prologues || (prologues = [])).push(createUnparsedNode(section, node) as UnparsedPrologue); + break; + case BundleFileSectionKind.EmitHelpers: + (helpers || (helpers = [])).push(getAllUnscopedEmitHelpers().get(section.data)!); + break; + case BundleFileSectionKind.NoDefaultLib: + node.hasNoDefaultLib = true; + break; + case BundleFileSectionKind.Reference: + (referencedFiles || (referencedFiles = [])).push({ pos: -1, end: -1, fileName: section.data }); + break; + case BundleFileSectionKind.Type: + (typeReferenceDirectives || (typeReferenceDirectives = [])).push(section.data); + break; + case BundleFileSectionKind.Lib: + (libReferenceDirectives || (libReferenceDirectives = [])).push({ pos: -1, end: -1, fileName: section.data }); + break; + case BundleFileSectionKind.Prepend: + const prependNode = createUnparsedNode(section, node) as UnparsedPrepend; + let prependTexts: UnparsedTextLike[] | undefined; + for (const text of section.texts) { + if (!stripInternal || text.kind !== BundleFileSectionKind.Internal) { + (prependTexts || (prependTexts = [])).push(createUnparsedNode(text, node) as UnparsedTextLike); + } + } + prependNode.texts = prependTexts || emptyArray; + (texts || (texts = [])).push(prependNode); + break; + case BundleFileSectionKind.Internal: + if (stripInternal) break; + // falls through + case BundleFileSectionKind.Text: + case BundleFileSectionKind.SourceMapUrl: + (texts || (texts = [])).push(createUnparsedNode(section, node) as UnparsedTextLike); + break; + default: + Debug.assertNever(section); + } + } + node.prologues = prologues || emptyArray; node.helpers = helpers; node.referencedFiles = referencedFiles || emptyArray; node.typeReferenceDirectives = typeReferenceDirectives; node.libReferenceDirectives = libReferenceDirectives || emptyArray; node.texts = texts || [createUnparsedNode({ kind: BundleFileSectionKind.Text, pos: 0, end: node.text.length }, node)]; - return node; } - function createUnparsedJsSourceFile(input: InputFiles) { - Debug.assert(!!input.oldFileOfCurrentEmit); - const node = createUnparsedSource(); - node.oldFileOfCurrentEmit = true; - node.fileName = Debug.assertDefined(input.javascriptPath); - node.sourceMapPath = input.javascriptMapPath; - node.text = input.javascriptText; - Object.defineProperties(node, { - sourceMapText: { get() { return input.javascriptMapText; } }, - }); - - const bundleFileInfo = Debug.assertDefined(input.buildInfo && input.buildInfo.bundle && input.buildInfo.bundle.js); - const texts: UnparsedTextLike[] = []; - for (const section of bundleFileInfo.sections) { - switch (section.kind) { - case BundleFileSectionKind.Text: - texts.push(createUnparsedNode(section, node) as UnparsedTextLike); - break; - // Ignore - case BundleFileSectionKind.Prologue: - case BundleFileSectionKind.EmitHelpers: - case BundleFileSectionKind.Prepend: - case BundleFileSectionKind.SourceMapUrl: - break; - case BundleFileSectionKind.NoDefaultLib: - case BundleFileSectionKind.Reference: - case BundleFileSectionKind.Type: - case BundleFileSectionKind.Lib: - case BundleFileSectionKind.Internal: - Debug.fail(`js shouldnt have section: ${JSON.stringify(section)}`); - break; - default: - Debug.assertNever(section); - } - } - node.texts = texts; - node.helpers = map(bundleFileInfo.sources && bundleFileInfo.sources.helpers, name => getAllUnscopedEmitHelpers().get(name)!); - return node; - } - - function createUnparsedDtsSourceFile(input: InputFiles): UnparsedSource { - Debug.assert(!!input.oldFileOfCurrentEmit); - const node = createUnparsedSource(); - node.oldFileOfCurrentEmit = true; - node.fileName = Debug.assertDefined(input.declarationPath); - node.sourceMapPath = Debug.assertDefined(input.declarationMapPath); - node.text = input.declarationText; - node.sourceMapText = input.declarationMapText; - const texts: UnparsedTextLike[] = []; + function parseOldFileOfCurrentEmit(node: UnparsedSource, bundleFileInfo: BundleFileInfo) { + Debug.assert(!!node.oldFileOfCurrentEmit); + let texts: UnparsedTextLike[] | undefined; let syntheticReferences: UnparsedSyntheticReference[] | undefined; - const bundleFileInfo = Debug.assertDefined(input.buildInfo && input.buildInfo.bundle && input.buildInfo.bundle.dts); for (const section of bundleFileInfo.sections) { switch (section.kind) { + case BundleFileSectionKind.Internal: + case BundleFileSectionKind.Text: + (texts || (texts = [])).push(createUnparsedNode(section, node) as UnparsedTextLike); + break; + case BundleFileSectionKind.NoDefaultLib: case BundleFileSectionKind.Reference: case BundleFileSectionKind.Type: @@ -2804,27 +2778,19 @@ namespace ts { (syntheticReferences || (syntheticReferences = [])).push(createUnparsedSyntheticReference(section, node)); break; - case BundleFileSectionKind.Internal: - case BundleFileSectionKind.Text: - texts.push(createUnparsedNode(section, node) as UnparsedTextLike); - break; - // Ignore - case BundleFileSectionKind.Prepend: - case BundleFileSectionKind.SourceMapUrl: - break; - - // Should never have case BundleFileSectionKind.Prologue: case BundleFileSectionKind.EmitHelpers: - Debug.fail(`Dts shouldnt have section: ${JSON.stringify(section)}`); + case BundleFileSectionKind.Prepend: + case BundleFileSectionKind.SourceMapUrl: break; default: Debug.assertNever(section); } } - node.texts = texts; + node.texts = texts || emptyArray; + node.helpers = map(bundleFileInfo.sources && bundleFileInfo.sources.helpers, name => getAllUnscopedEmitHelpers().get(name)!); node.syntheticReferences = syntheticReferences; return node; } diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/buildInfo/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/buildInfo/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js index ad6740f1eb1..c119ae35c06 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/buildInfo/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/buildInfo/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js @@ -3310,45 +3310,40 @@ console.log(s); "sections": [ { "pos": 0, - "end": 403, + "end": 362, "kind": "prepend", "data": "/src/2/second-output.d.ts", "texts": [ { "pos": 0, - "end": 39, - "kind": "internal" - }, - { - "pos": 41, - "end": 156, + "end": 115, "kind": "text" }, { - "pos": 156, - "end": 198, + "pos": 115, + "end": 157, "kind": "sourceMapUrl" }, { - "pos": 200, - "end": 360, + "pos": 159, + "end": 319, "kind": "text" }, { - "pos": 360, - "end": 403, + "pos": 319, + "end": 362, "kind": "sourceMapUrl" } ] }, { - "pos": 405, - "end": 424, + "pos": 364, + "end": 383, "kind": "text" }, { - "pos": 424, - "end": 466, + "pos": 383, + "end": 425, "kind": "sourceMapUrl" } ] @@ -3493,14 +3488,9 @@ sourceMapUrl: (3282-3322) ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-403):: /src/2/second-output.d.ts texts:: 5 +prepend: (0-362):: /src/2/second-output.d.ts texts:: 4 >>-------------------------------------------------------------------- -internal: (0-39) -interface TheFirst { - none: any; -} ->>-------------------------------------------------------------------- -text: (41-156) +text: (0-115) declare const s = "Hola, world"; interface NoJsForHereEither { none: any; @@ -3508,10 +3498,10 @@ interface NoJsForHereEither { declare function f(): string; >>-------------------------------------------------------------------- -sourceMapUrl: (156-198) +sourceMapUrl: (115-157) //# sourceMappingURL=first-output.d.ts.map >>-------------------------------------------------------------------- -text: (200-360) +text: (159-319) declare namespace N { } declare namespace N { @@ -3525,21 +3515,18 @@ declare class C { } >>-------------------------------------------------------------------- -sourceMapUrl: (360-403) +sourceMapUrl: (319-362) //# sourceMappingURL=second-output.d.ts.map ---------------------------------------------------------------------- -text: (405-424) +text: (364-383) declare var c: C; ---------------------------------------------------------------------- -sourceMapUrl: (424-466) +sourceMapUrl: (383-425) //# sourceMappingURL=third-output.d.ts.map ====================================================================== //// [/src/third/thirdjs/output/third-output.d.ts] -interface TheFirst { - none: any; -} declare const s = "Hola, world"; interface NoJsForHereEither { none: any; @@ -3562,7 +3549,7 @@ declare var c: C; //# sourceMappingURL=third-output.d.ts.map //// [/src/third/thirdjs/output/third-output.d.ts.map] -{"version":3,"file":"third-output.d.ts","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":"AAAe,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;CAMZ;AACD,kBAAU,OAAO,CAAC;CASjB;AC5BD,cAAM,CAAC;IACH,WAAW;CAGd;;ACJD,QAAA,IAAI,CAAC,GAAU,CAAC"} +{"version":3,"file":"third-output.d.ts","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":"AAIA,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;CAMZ;AACD,kBAAU,OAAO,CAAC;CASjB;AC5BD,cAAM,CAAC;IACH,WAAW;CAGd;;ACJD,QAAA,IAAI,CAAC,GAAU,CAAC"} //// [/src/third/thirdjs/output/third-output.d.ts.map.baseline.txt] =================================================================== @@ -3575,50 +3562,16 @@ sources: ../../../first/first_PART1.ts,../../../first/first_part3.ts,../../../se emittedFile:/src/third/thirdjs/output/third-output.d.ts sourceFile:../../../first/first_PART1.ts ------------------------------------------------------------------- ->>>interface TheFirst { -1 > -2 >^^^^^^^^^^ -3 > ^^^^^^^^ -1 >/**@internal*/ -2 >interface -3 > TheFirst -1 >Emitted(1, 1) Source(1, 16) + SourceIndex(0) -2 >Emitted(1, 11) Source(1, 26) + SourceIndex(0) -3 >Emitted(1, 19) Source(1, 34) + SourceIndex(0) ---- ->>> none: any; -1 >^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^ -5 > ^ -1 > { - > -2 > none -3 > : -4 > any -5 > ; -1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0) -2 >Emitted(2, 9) Source(2, 9) + SourceIndex(0) -3 >Emitted(2, 11) Source(2, 11) + SourceIndex(0) -4 >Emitted(2, 14) Source(2, 14) + SourceIndex(0) -5 >Emitted(2, 15) Source(2, 15) + SourceIndex(0) ---- ->>>} -1 >^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - >} -1 >Emitted(3, 2) Source(3, 2) + SourceIndex(0) ---- >>>declare const s = "Hola, world"; -1-> +1 > 2 >^^^^^^^^ 3 > ^^^^^^ 4 > ^ 5 > ^^^^^^^^^^^^^^^^ 6 > ^ -1-> +1 >/**@internal*/ interface TheFirst { + > none: any; + >} > > 2 > @@ -3626,12 +3579,12 @@ sourceFile:../../../first/first_PART1.ts 4 > s 5 > = "Hola, world" 6 > ; -1->Emitted(4, 1) Source(5, 1) + SourceIndex(0) -2 >Emitted(4, 9) Source(5, 1) + SourceIndex(0) -3 >Emitted(4, 15) Source(5, 7) + SourceIndex(0) -4 >Emitted(4, 16) Source(5, 8) + SourceIndex(0) -5 >Emitted(4, 32) Source(5, 24) + SourceIndex(0) -6 >Emitted(4, 33) Source(5, 25) + SourceIndex(0) +1 >Emitted(1, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(1, 9) Source(5, 1) + SourceIndex(0) +3 >Emitted(1, 15) Source(5, 7) + SourceIndex(0) +4 >Emitted(1, 16) Source(5, 8) + SourceIndex(0) +5 >Emitted(1, 32) Source(5, 24) + SourceIndex(0) +6 >Emitted(1, 33) Source(5, 25) + SourceIndex(0) --- >>>interface NoJsForHereEither { 1 > @@ -3642,9 +3595,9 @@ sourceFile:../../../first/first_PART1.ts > 2 >interface 3 > NoJsForHereEither -1 >Emitted(5, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(5, 11) Source(7, 11) + SourceIndex(0) -3 >Emitted(5, 28) Source(7, 28) + SourceIndex(0) +1 >Emitted(2, 1) Source(7, 1) + SourceIndex(0) +2 >Emitted(2, 11) Source(7, 11) + SourceIndex(0) +3 >Emitted(2, 28) Source(7, 28) + SourceIndex(0) --- >>> none: any; 1 >^^^^ @@ -3658,18 +3611,18 @@ sourceFile:../../../first/first_PART1.ts 3 > : 4 > any 5 > ; -1 >Emitted(6, 5) Source(8, 5) + SourceIndex(0) -2 >Emitted(6, 9) Source(8, 9) + SourceIndex(0) -3 >Emitted(6, 11) Source(8, 11) + SourceIndex(0) -4 >Emitted(6, 14) Source(8, 14) + SourceIndex(0) -5 >Emitted(6, 15) Source(8, 15) + SourceIndex(0) +1 >Emitted(3, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(3, 9) Source(8, 9) + SourceIndex(0) +3 >Emitted(3, 11) Source(8, 11) + SourceIndex(0) +4 >Emitted(3, 14) Source(8, 14) + SourceIndex(0) +5 >Emitted(3, 15) Source(8, 15) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(7, 2) Source(9, 2) + SourceIndex(0) +1 >Emitted(4, 2) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3687,10 +3640,10 @@ sourceFile:../../../first/first_part3.ts 4 > () { > return "JS does hoists"; > } -1->Emitted(8, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(8, 18) Source(1, 10) + SourceIndex(1) -3 >Emitted(8, 19) Source(1, 11) + SourceIndex(1) -4 >Emitted(8, 30) Source(3, 2) + SourceIndex(1) +1->Emitted(5, 1) Source(1, 1) + SourceIndex(1) +2 >Emitted(5, 18) Source(1, 10) + SourceIndex(1) +3 >Emitted(5, 19) Source(1, 11) + SourceIndex(1) +4 >Emitted(5, 30) Source(3, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3706,10 +3659,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > N 4 > -1->Emitted(10, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(10, 19) Source(1, 11) + SourceIndex(2) -3 >Emitted(10, 20) Source(1, 12) + SourceIndex(2) -4 >Emitted(10, 21) Source(1, 13) + SourceIndex(2) +1->Emitted(7, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(7, 19) Source(1, 11) + SourceIndex(2) +3 >Emitted(7, 20) Source(1, 12) + SourceIndex(2) +4 >Emitted(7, 21) Source(1, 13) + SourceIndex(2) --- >>>} 1 >^ @@ -3717,7 +3670,7 @@ sourceFile:../../../second/second_part1.ts 1 >{ > // Comment text >} -1 >Emitted(11, 2) Source(3, 2) + SourceIndex(2) +1 >Emitted(8, 2) Source(3, 2) + SourceIndex(2) --- >>>declare namespace N { 1-> @@ -3730,10 +3683,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > N 4 > -1->Emitted(12, 1) Source(5, 1) + SourceIndex(2) -2 >Emitted(12, 19) Source(5, 11) + SourceIndex(2) -3 >Emitted(12, 20) Source(5, 12) + SourceIndex(2) -4 >Emitted(12, 21) Source(5, 13) + SourceIndex(2) +1->Emitted(9, 1) Source(5, 1) + SourceIndex(2) +2 >Emitted(9, 19) Source(5, 11) + SourceIndex(2) +3 >Emitted(9, 20) Source(5, 12) + SourceIndex(2) +4 >Emitted(9, 21) Source(5, 13) + SourceIndex(2) --- >>>} 1 >^ @@ -3745,7 +3698,7 @@ sourceFile:../../../second/second_part1.ts > > f(); >} -1 >Emitted(13, 2) Source(11, 2) + SourceIndex(2) +1 >Emitted(10, 2) Source(11, 2) + SourceIndex(2) --- >>>declare class normalC { 1-> @@ -3756,9 +3709,9 @@ sourceFile:../../../second/second_part1.ts > 2 >class 3 > normalC -1->Emitted(14, 1) Source(13, 1) + SourceIndex(2) -2 >Emitted(14, 15) Source(13, 7) + SourceIndex(2) -3 >Emitted(14, 22) Source(13, 14) + SourceIndex(2) +1->Emitted(11, 1) Source(13, 1) + SourceIndex(2) +2 >Emitted(11, 15) Source(13, 7) + SourceIndex(2) +3 >Emitted(11, 22) Source(13, 14) + SourceIndex(2) --- >>>} 1 >^ @@ -3770,7 +3723,7 @@ sourceFile:../../../second/second_part1.ts > /**@internal*/ get c() { return 10; } > /**@internal*/ set c(val: number) { } >} -1 >Emitted(15, 2) Source(19, 2) + SourceIndex(2) +1 >Emitted(12, 2) Source(19, 2) + SourceIndex(2) --- >>>declare namespace normalN { 1-> @@ -3782,10 +3735,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > normalN 4 > -1->Emitted(16, 1) Source(20, 1) + SourceIndex(2) -2 >Emitted(16, 19) Source(20, 11) + SourceIndex(2) -3 >Emitted(16, 26) Source(20, 18) + SourceIndex(2) -4 >Emitted(16, 27) Source(20, 19) + SourceIndex(2) +1->Emitted(13, 1) Source(20, 1) + SourceIndex(2) +2 >Emitted(13, 19) Source(20, 11) + SourceIndex(2) +3 >Emitted(13, 26) Source(20, 18) + SourceIndex(2) +4 >Emitted(13, 27) Source(20, 19) + SourceIndex(2) --- >>>} 1 >^ @@ -3800,7 +3753,7 @@ sourceFile:../../../second/second_part1.ts > /**@internal*/ export const internalConst = 10; > /**@internal*/ export enum internalEnum { a, b, c } >} -1 >Emitted(17, 2) Source(29, 2) + SourceIndex(2) +1 >Emitted(14, 2) Source(29, 2) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3814,9 +3767,9 @@ sourceFile:../../../second/second_part2.ts 1-> 2 >class 3 > C -1->Emitted(18, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(18, 15) Source(1, 7) + SourceIndex(3) -3 >Emitted(18, 16) Source(1, 8) + SourceIndex(3) +1->Emitted(15, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(15, 15) Source(1, 7) + SourceIndex(3) +3 >Emitted(15, 16) Source(1, 8) + SourceIndex(3) --- >>> doSomething(): void; 1->^^^^ @@ -3824,8 +3777,8 @@ sourceFile:../../../second/second_part2.ts 1-> { > 2 > doSomething -1->Emitted(19, 5) Source(2, 5) + SourceIndex(3) -2 >Emitted(19, 16) Source(2, 16) + SourceIndex(3) +1->Emitted(16, 5) Source(2, 5) + SourceIndex(3) +2 >Emitted(16, 16) Source(2, 16) + SourceIndex(3) --- >>>} 1 >^ @@ -3834,7 +3787,7 @@ sourceFile:../../../second/second_part2.ts > console.log("something got done"); > } >} -1 >Emitted(20, 2) Source(5, 2) + SourceIndex(3) +1 >Emitted(17, 2) Source(5, 2) + SourceIndex(3) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3855,12 +3808,12 @@ sourceFile:../../third_part1.ts 4 > c 5 > = new C() 6 > ; -1->Emitted(22, 1) Source(1, 1) + SourceIndex(4) -2 >Emitted(22, 9) Source(1, 1) + SourceIndex(4) -3 >Emitted(22, 13) Source(1, 5) + SourceIndex(4) -4 >Emitted(22, 14) Source(1, 6) + SourceIndex(4) -5 >Emitted(22, 17) Source(1, 16) + SourceIndex(4) -6 >Emitted(22, 18) Source(1, 17) + SourceIndex(4) +1->Emitted(19, 1) Source(1, 1) + SourceIndex(4) +2 >Emitted(19, 9) Source(1, 1) + SourceIndex(4) +3 >Emitted(19, 13) Source(1, 5) + SourceIndex(4) +4 >Emitted(19, 14) Source(1, 6) + SourceIndex(4) +5 >Emitted(19, 17) Source(1, 16) + SourceIndex(4) +6 >Emitted(19, 18) Source(1, 17) + SourceIndex(4) --- >>>//# sourceMappingURL=third-output.d.ts.map diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/buildInfo/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/buildInfo/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index 801744121b6..8b84efeed53 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/buildInfo/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/buildInfo/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -3546,45 +3546,40 @@ console.log(s); "sections": [ { "pos": 0, - "end": 418, + "end": 362, "kind": "prepend", "data": "/src/2/second-output.d.ts", "texts": [ { "pos": 0, - "end": 54, - "kind": "internal" - }, - { - "pos": 56, - "end": 171, + "end": 115, "kind": "text" }, { - "pos": 171, - "end": 213, + "pos": 115, + "end": 157, "kind": "sourceMapUrl" }, { - "pos": 215, - "end": 375, + "pos": 159, + "end": 319, "kind": "text" }, { - "pos": 375, - "end": 418, + "pos": 319, + "end": 362, "kind": "sourceMapUrl" } ] }, { - "pos": 420, - "end": 439, + "pos": 364, + "end": 383, "kind": "text" }, { - "pos": 439, - "end": 481, + "pos": 383, + "end": 425, "kind": "sourceMapUrl" } ] @@ -3729,14 +3724,9 @@ sourceMapUrl: (3664-3704) ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-418):: /src/2/second-output.d.ts texts:: 5 +prepend: (0-362):: /src/2/second-output.d.ts texts:: 4 >>-------------------------------------------------------------------- -internal: (0-54) -/**@internal*/ interface TheFirst { - none: any; -} ->>-------------------------------------------------------------------- -text: (56-171) +text: (0-115) declare const s = "Hola, world"; interface NoJsForHereEither { none: any; @@ -3744,10 +3734,10 @@ interface NoJsForHereEither { declare function f(): string; >>-------------------------------------------------------------------- -sourceMapUrl: (171-213) +sourceMapUrl: (115-157) //# sourceMappingURL=first-output.d.ts.map >>-------------------------------------------------------------------- -text: (215-375) +text: (159-319) declare namespace N { } declare namespace N { @@ -3761,21 +3751,18 @@ declare class C { } >>-------------------------------------------------------------------- -sourceMapUrl: (375-418) +sourceMapUrl: (319-362) //# sourceMappingURL=second-output.d.ts.map ---------------------------------------------------------------------- -text: (420-439) +text: (364-383) declare var c: C; ---------------------------------------------------------------------- -sourceMapUrl: (439-481) +sourceMapUrl: (383-425) //# sourceMappingURL=third-output.d.ts.map ====================================================================== //// [/src/third/thirdjs/output/third-output.d.ts] -/**@internal*/ interface TheFirst { - none: any; -} declare const s = "Hola, world"; interface NoJsForHereEither { none: any; @@ -3798,7 +3785,7 @@ declare var c: C; //# sourceMappingURL=third-output.d.ts.map //// [/src/third/thirdjs/output/third-output.d.ts.map] -{"version":3,"file":"third-output.d.ts","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":"AAAA,cAAc,CAAC,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;CAMZ;AACD,kBAAU,OAAO,CAAC;CASjB;AC5BD,cAAM,CAAC;IACH,WAAW;CAGd;;ACJD,QAAA,IAAI,CAAC,GAAU,CAAC"} +{"version":3,"file":"third-output.d.ts","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":"AAIA,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;CAMZ;AACD,kBAAU,OAAO,CAAC;CASjB;AC5BD,cAAM,CAAC;IACH,WAAW;CAGd;;ACJD,QAAA,IAAI,CAAC,GAAU,CAAC"} //// [/src/third/thirdjs/output/third-output.d.ts.map.baseline.txt] =================================================================== @@ -3811,56 +3798,16 @@ sources: ../../../first/first_PART1.ts,../../../first/first_part3.ts,../../../se emittedFile:/src/third/thirdjs/output/third-output.d.ts sourceFile:../../../first/first_PART1.ts ------------------------------------------------------------------- ->>>/**@internal*/ interface TheFirst { -1 > -2 >^^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^ -5 > ^^^^^^^^ -1 > -2 >/**@internal*/ -3 > -4 > interface -5 > TheFirst -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 15) Source(1, 15) + SourceIndex(0) -3 >Emitted(1, 16) Source(1, 16) + SourceIndex(0) -4 >Emitted(1, 26) Source(1, 26) + SourceIndex(0) -5 >Emitted(1, 34) Source(1, 34) + SourceIndex(0) ---- ->>> none: any; -1 >^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^ -5 > ^ -1 > { - > -2 > none -3 > : -4 > any -5 > ; -1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0) -2 >Emitted(2, 9) Source(2, 9) + SourceIndex(0) -3 >Emitted(2, 11) Source(2, 11) + SourceIndex(0) -4 >Emitted(2, 14) Source(2, 14) + SourceIndex(0) -5 >Emitted(2, 15) Source(2, 15) + SourceIndex(0) ---- ->>>} -1 >^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - >} -1 >Emitted(3, 2) Source(3, 2) + SourceIndex(0) ---- >>>declare const s = "Hola, world"; -1-> +1 > 2 >^^^^^^^^ 3 > ^^^^^^ 4 > ^ 5 > ^^^^^^^^^^^^^^^^ 6 > ^ -1-> +1 >/**@internal*/ interface TheFirst { + > none: any; + >} > > 2 > @@ -3868,12 +3815,12 @@ sourceFile:../../../first/first_PART1.ts 4 > s 5 > = "Hola, world" 6 > ; -1->Emitted(4, 1) Source(5, 1) + SourceIndex(0) -2 >Emitted(4, 9) Source(5, 1) + SourceIndex(0) -3 >Emitted(4, 15) Source(5, 7) + SourceIndex(0) -4 >Emitted(4, 16) Source(5, 8) + SourceIndex(0) -5 >Emitted(4, 32) Source(5, 24) + SourceIndex(0) -6 >Emitted(4, 33) Source(5, 25) + SourceIndex(0) +1 >Emitted(1, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(1, 9) Source(5, 1) + SourceIndex(0) +3 >Emitted(1, 15) Source(5, 7) + SourceIndex(0) +4 >Emitted(1, 16) Source(5, 8) + SourceIndex(0) +5 >Emitted(1, 32) Source(5, 24) + SourceIndex(0) +6 >Emitted(1, 33) Source(5, 25) + SourceIndex(0) --- >>>interface NoJsForHereEither { 1 > @@ -3884,9 +3831,9 @@ sourceFile:../../../first/first_PART1.ts > 2 >interface 3 > NoJsForHereEither -1 >Emitted(5, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(5, 11) Source(7, 11) + SourceIndex(0) -3 >Emitted(5, 28) Source(7, 28) + SourceIndex(0) +1 >Emitted(2, 1) Source(7, 1) + SourceIndex(0) +2 >Emitted(2, 11) Source(7, 11) + SourceIndex(0) +3 >Emitted(2, 28) Source(7, 28) + SourceIndex(0) --- >>> none: any; 1 >^^^^ @@ -3900,18 +3847,18 @@ sourceFile:../../../first/first_PART1.ts 3 > : 4 > any 5 > ; -1 >Emitted(6, 5) Source(8, 5) + SourceIndex(0) -2 >Emitted(6, 9) Source(8, 9) + SourceIndex(0) -3 >Emitted(6, 11) Source(8, 11) + SourceIndex(0) -4 >Emitted(6, 14) Source(8, 14) + SourceIndex(0) -5 >Emitted(6, 15) Source(8, 15) + SourceIndex(0) +1 >Emitted(3, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(3, 9) Source(8, 9) + SourceIndex(0) +3 >Emitted(3, 11) Source(8, 11) + SourceIndex(0) +4 >Emitted(3, 14) Source(8, 14) + SourceIndex(0) +5 >Emitted(3, 15) Source(8, 15) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(7, 2) Source(9, 2) + SourceIndex(0) +1 >Emitted(4, 2) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3929,10 +3876,10 @@ sourceFile:../../../first/first_part3.ts 4 > () { > return "JS does hoists"; > } -1->Emitted(8, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(8, 18) Source(1, 10) + SourceIndex(1) -3 >Emitted(8, 19) Source(1, 11) + SourceIndex(1) -4 >Emitted(8, 30) Source(3, 2) + SourceIndex(1) +1->Emitted(5, 1) Source(1, 1) + SourceIndex(1) +2 >Emitted(5, 18) Source(1, 10) + SourceIndex(1) +3 >Emitted(5, 19) Source(1, 11) + SourceIndex(1) +4 >Emitted(5, 30) Source(3, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3948,10 +3895,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > N 4 > -1->Emitted(10, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(10, 19) Source(1, 11) + SourceIndex(2) -3 >Emitted(10, 20) Source(1, 12) + SourceIndex(2) -4 >Emitted(10, 21) Source(1, 13) + SourceIndex(2) +1->Emitted(7, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(7, 19) Source(1, 11) + SourceIndex(2) +3 >Emitted(7, 20) Source(1, 12) + SourceIndex(2) +4 >Emitted(7, 21) Source(1, 13) + SourceIndex(2) --- >>>} 1 >^ @@ -3959,7 +3906,7 @@ sourceFile:../../../second/second_part1.ts 1 >{ > // Comment text >} -1 >Emitted(11, 2) Source(3, 2) + SourceIndex(2) +1 >Emitted(8, 2) Source(3, 2) + SourceIndex(2) --- >>>declare namespace N { 1-> @@ -3972,10 +3919,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > N 4 > -1->Emitted(12, 1) Source(5, 1) + SourceIndex(2) -2 >Emitted(12, 19) Source(5, 11) + SourceIndex(2) -3 >Emitted(12, 20) Source(5, 12) + SourceIndex(2) -4 >Emitted(12, 21) Source(5, 13) + SourceIndex(2) +1->Emitted(9, 1) Source(5, 1) + SourceIndex(2) +2 >Emitted(9, 19) Source(5, 11) + SourceIndex(2) +3 >Emitted(9, 20) Source(5, 12) + SourceIndex(2) +4 >Emitted(9, 21) Source(5, 13) + SourceIndex(2) --- >>>} 1 >^ @@ -3987,7 +3934,7 @@ sourceFile:../../../second/second_part1.ts > > f(); >} -1 >Emitted(13, 2) Source(11, 2) + SourceIndex(2) +1 >Emitted(10, 2) Source(11, 2) + SourceIndex(2) --- >>>declare class normalC { 1-> @@ -3998,9 +3945,9 @@ sourceFile:../../../second/second_part1.ts > 2 >class 3 > normalC -1->Emitted(14, 1) Source(13, 1) + SourceIndex(2) -2 >Emitted(14, 15) Source(13, 7) + SourceIndex(2) -3 >Emitted(14, 22) Source(13, 14) + SourceIndex(2) +1->Emitted(11, 1) Source(13, 1) + SourceIndex(2) +2 >Emitted(11, 15) Source(13, 7) + SourceIndex(2) +3 >Emitted(11, 22) Source(13, 14) + SourceIndex(2) --- >>>} 1 >^ @@ -4012,7 +3959,7 @@ sourceFile:../../../second/second_part1.ts > /**@internal*/ get c() { return 10; } > /**@internal*/ set c(val: number) { } >} -1 >Emitted(15, 2) Source(19, 2) + SourceIndex(2) +1 >Emitted(12, 2) Source(19, 2) + SourceIndex(2) --- >>>declare namespace normalN { 1-> @@ -4024,10 +3971,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > normalN 4 > -1->Emitted(16, 1) Source(20, 1) + SourceIndex(2) -2 >Emitted(16, 19) Source(20, 11) + SourceIndex(2) -3 >Emitted(16, 26) Source(20, 18) + SourceIndex(2) -4 >Emitted(16, 27) Source(20, 19) + SourceIndex(2) +1->Emitted(13, 1) Source(20, 1) + SourceIndex(2) +2 >Emitted(13, 19) Source(20, 11) + SourceIndex(2) +3 >Emitted(13, 26) Source(20, 18) + SourceIndex(2) +4 >Emitted(13, 27) Source(20, 19) + SourceIndex(2) --- >>>} 1 >^ @@ -4042,7 +3989,7 @@ sourceFile:../../../second/second_part1.ts > /**@internal*/ export const internalConst = 10; > /**@internal*/ export enum internalEnum { a, b, c } >} -1 >Emitted(17, 2) Source(29, 2) + SourceIndex(2) +1 >Emitted(14, 2) Source(29, 2) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -4056,9 +4003,9 @@ sourceFile:../../../second/second_part2.ts 1-> 2 >class 3 > C -1->Emitted(18, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(18, 15) Source(1, 7) + SourceIndex(3) -3 >Emitted(18, 16) Source(1, 8) + SourceIndex(3) +1->Emitted(15, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(15, 15) Source(1, 7) + SourceIndex(3) +3 >Emitted(15, 16) Source(1, 8) + SourceIndex(3) --- >>> doSomething(): void; 1->^^^^ @@ -4066,8 +4013,8 @@ sourceFile:../../../second/second_part2.ts 1-> { > 2 > doSomething -1->Emitted(19, 5) Source(2, 5) + SourceIndex(3) -2 >Emitted(19, 16) Source(2, 16) + SourceIndex(3) +1->Emitted(16, 5) Source(2, 5) + SourceIndex(3) +2 >Emitted(16, 16) Source(2, 16) + SourceIndex(3) --- >>>} 1 >^ @@ -4076,7 +4023,7 @@ sourceFile:../../../second/second_part2.ts > console.log("something got done"); > } >} -1 >Emitted(20, 2) Source(5, 2) + SourceIndex(3) +1 >Emitted(17, 2) Source(5, 2) + SourceIndex(3) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -4097,12 +4044,12 @@ sourceFile:../../third_part1.ts 4 > c 5 > = new C() 6 > ; -1->Emitted(22, 1) Source(1, 1) + SourceIndex(4) -2 >Emitted(22, 9) Source(1, 1) + SourceIndex(4) -3 >Emitted(22, 13) Source(1, 5) + SourceIndex(4) -4 >Emitted(22, 14) Source(1, 6) + SourceIndex(4) -5 >Emitted(22, 17) Source(1, 16) + SourceIndex(4) -6 >Emitted(22, 18) Source(1, 17) + SourceIndex(4) +1->Emitted(19, 1) Source(1, 1) + SourceIndex(4) +2 >Emitted(19, 9) Source(1, 1) + SourceIndex(4) +3 >Emitted(19, 13) Source(1, 5) + SourceIndex(4) +4 >Emitted(19, 14) Source(1, 6) + SourceIndex(4) +5 >Emitted(19, 17) Source(1, 16) + SourceIndex(4) +6 >Emitted(19, 18) Source(1, 17) + SourceIndex(4) --- >>>//# sourceMappingURL=third-output.d.ts.map diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/buildInfo/stripInternal-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/buildInfo/stripInternal-when-one-two-three-are-prepended-in-order.js index 3790c876e8e..16fce5c3819 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/buildInfo/stripInternal-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/buildInfo/stripInternal-when-one-two-three-are-prepended-in-order.js @@ -3310,45 +3310,40 @@ console.log(s); "sections": [ { "pos": 0, - "end": 403, + "end": 362, "kind": "prepend", "data": "/src/2/second-output.d.ts", "texts": [ { "pos": 0, - "end": 39, - "kind": "internal" - }, - { - "pos": 41, - "end": 156, + "end": 115, "kind": "text" }, { - "pos": 156, - "end": 198, + "pos": 115, + "end": 157, "kind": "sourceMapUrl" }, { - "pos": 200, - "end": 360, + "pos": 159, + "end": 319, "kind": "text" }, { - "pos": 360, - "end": 403, + "pos": 319, + "end": 362, "kind": "sourceMapUrl" } ] }, { - "pos": 405, - "end": 424, + "pos": 364, + "end": 383, "kind": "text" }, { - "pos": 424, - "end": 466, + "pos": 383, + "end": 425, "kind": "sourceMapUrl" } ] @@ -3493,14 +3488,9 @@ sourceMapUrl: (3282-3322) ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-403):: /src/2/second-output.d.ts texts:: 5 +prepend: (0-362):: /src/2/second-output.d.ts texts:: 4 >>-------------------------------------------------------------------- -internal: (0-39) -interface TheFirst { - none: any; -} ->>-------------------------------------------------------------------- -text: (41-156) +text: (0-115) declare const s = "Hola, world"; interface NoJsForHereEither { none: any; @@ -3508,10 +3498,10 @@ interface NoJsForHereEither { declare function f(): string; >>-------------------------------------------------------------------- -sourceMapUrl: (156-198) +sourceMapUrl: (115-157) //# sourceMappingURL=first-output.d.ts.map >>-------------------------------------------------------------------- -text: (200-360) +text: (159-319) declare namespace N { } declare namespace N { @@ -3525,21 +3515,18 @@ declare class C { } >>-------------------------------------------------------------------- -sourceMapUrl: (360-403) +sourceMapUrl: (319-362) //# sourceMappingURL=second-output.d.ts.map ---------------------------------------------------------------------- -text: (405-424) +text: (364-383) declare var c: C; ---------------------------------------------------------------------- -sourceMapUrl: (424-466) +sourceMapUrl: (383-425) //# sourceMappingURL=third-output.d.ts.map ====================================================================== //// [/src/third/thirdjs/output/third-output.d.ts] -interface TheFirst { - none: any; -} declare const s = "Hola, world"; interface NoJsForHereEither { none: any; @@ -3562,7 +3549,7 @@ declare var c: C; //# sourceMappingURL=third-output.d.ts.map //// [/src/third/thirdjs/output/third-output.d.ts.map] -{"version":3,"file":"third-output.d.ts","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;CAMZ;AACD,kBAAU,OAAO,CAAC;CASjB;AC5BD,cAAM,CAAC;IACH,WAAW;CAGd;;ACJD,QAAA,IAAI,CAAC,GAAU,CAAC"} +{"version":3,"file":"third-output.d.ts","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":"AAIA,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;CAMZ;AACD,kBAAU,OAAO,CAAC;CASjB;AC5BD,cAAM,CAAC;IACH,WAAW;CAGd;;ACJD,QAAA,IAAI,CAAC,GAAU,CAAC"} //// [/src/third/thirdjs/output/third-output.d.ts.map.baseline.txt] =================================================================== @@ -3575,50 +3562,16 @@ sources: ../../../first/first_PART1.ts,../../../first/first_part3.ts,../../../se emittedFile:/src/third/thirdjs/output/third-output.d.ts sourceFile:../../../first/first_PART1.ts ------------------------------------------------------------------- ->>>interface TheFirst { -1 > -2 >^^^^^^^^^^ -3 > ^^^^^^^^ -1 >/*@internal*/ -2 >interface -3 > TheFirst -1 >Emitted(1, 1) Source(1, 15) + SourceIndex(0) -2 >Emitted(1, 11) Source(1, 25) + SourceIndex(0) -3 >Emitted(1, 19) Source(1, 33) + SourceIndex(0) ---- ->>> none: any; -1 >^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^ -5 > ^ -1 > { - > -2 > none -3 > : -4 > any -5 > ; -1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0) -2 >Emitted(2, 9) Source(2, 9) + SourceIndex(0) -3 >Emitted(2, 11) Source(2, 11) + SourceIndex(0) -4 >Emitted(2, 14) Source(2, 14) + SourceIndex(0) -5 >Emitted(2, 15) Source(2, 15) + SourceIndex(0) ---- ->>>} -1 >^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - >} -1 >Emitted(3, 2) Source(3, 2) + SourceIndex(0) ---- >>>declare const s = "Hola, world"; -1-> +1 > 2 >^^^^^^^^ 3 > ^^^^^^ 4 > ^ 5 > ^^^^^^^^^^^^^^^^ 6 > ^ -1-> +1 >/*@internal*/ interface TheFirst { + > none: any; + >} > > 2 > @@ -3626,12 +3579,12 @@ sourceFile:../../../first/first_PART1.ts 4 > s 5 > = "Hola, world" 6 > ; -1->Emitted(4, 1) Source(5, 1) + SourceIndex(0) -2 >Emitted(4, 9) Source(5, 1) + SourceIndex(0) -3 >Emitted(4, 15) Source(5, 7) + SourceIndex(0) -4 >Emitted(4, 16) Source(5, 8) + SourceIndex(0) -5 >Emitted(4, 32) Source(5, 24) + SourceIndex(0) -6 >Emitted(4, 33) Source(5, 25) + SourceIndex(0) +1 >Emitted(1, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(1, 9) Source(5, 1) + SourceIndex(0) +3 >Emitted(1, 15) Source(5, 7) + SourceIndex(0) +4 >Emitted(1, 16) Source(5, 8) + SourceIndex(0) +5 >Emitted(1, 32) Source(5, 24) + SourceIndex(0) +6 >Emitted(1, 33) Source(5, 25) + SourceIndex(0) --- >>>interface NoJsForHereEither { 1 > @@ -3642,9 +3595,9 @@ sourceFile:../../../first/first_PART1.ts > 2 >interface 3 > NoJsForHereEither -1 >Emitted(5, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(5, 11) Source(7, 11) + SourceIndex(0) -3 >Emitted(5, 28) Source(7, 28) + SourceIndex(0) +1 >Emitted(2, 1) Source(7, 1) + SourceIndex(0) +2 >Emitted(2, 11) Source(7, 11) + SourceIndex(0) +3 >Emitted(2, 28) Source(7, 28) + SourceIndex(0) --- >>> none: any; 1 >^^^^ @@ -3658,18 +3611,18 @@ sourceFile:../../../first/first_PART1.ts 3 > : 4 > any 5 > ; -1 >Emitted(6, 5) Source(8, 5) + SourceIndex(0) -2 >Emitted(6, 9) Source(8, 9) + SourceIndex(0) -3 >Emitted(6, 11) Source(8, 11) + SourceIndex(0) -4 >Emitted(6, 14) Source(8, 14) + SourceIndex(0) -5 >Emitted(6, 15) Source(8, 15) + SourceIndex(0) +1 >Emitted(3, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(3, 9) Source(8, 9) + SourceIndex(0) +3 >Emitted(3, 11) Source(8, 11) + SourceIndex(0) +4 >Emitted(3, 14) Source(8, 14) + SourceIndex(0) +5 >Emitted(3, 15) Source(8, 15) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(7, 2) Source(9, 2) + SourceIndex(0) +1 >Emitted(4, 2) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3687,10 +3640,10 @@ sourceFile:../../../first/first_part3.ts 4 > () { > return "JS does hoists"; > } -1->Emitted(8, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(8, 18) Source(1, 10) + SourceIndex(1) -3 >Emitted(8, 19) Source(1, 11) + SourceIndex(1) -4 >Emitted(8, 30) Source(3, 2) + SourceIndex(1) +1->Emitted(5, 1) Source(1, 1) + SourceIndex(1) +2 >Emitted(5, 18) Source(1, 10) + SourceIndex(1) +3 >Emitted(5, 19) Source(1, 11) + SourceIndex(1) +4 >Emitted(5, 30) Source(3, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3706,10 +3659,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > N 4 > -1->Emitted(10, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(10, 19) Source(1, 11) + SourceIndex(2) -3 >Emitted(10, 20) Source(1, 12) + SourceIndex(2) -4 >Emitted(10, 21) Source(1, 13) + SourceIndex(2) +1->Emitted(7, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(7, 19) Source(1, 11) + SourceIndex(2) +3 >Emitted(7, 20) Source(1, 12) + SourceIndex(2) +4 >Emitted(7, 21) Source(1, 13) + SourceIndex(2) --- >>>} 1 >^ @@ -3717,7 +3670,7 @@ sourceFile:../../../second/second_part1.ts 1 >{ > // Comment text >} -1 >Emitted(11, 2) Source(3, 2) + SourceIndex(2) +1 >Emitted(8, 2) Source(3, 2) + SourceIndex(2) --- >>>declare namespace N { 1-> @@ -3730,10 +3683,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > N 4 > -1->Emitted(12, 1) Source(5, 1) + SourceIndex(2) -2 >Emitted(12, 19) Source(5, 11) + SourceIndex(2) -3 >Emitted(12, 20) Source(5, 12) + SourceIndex(2) -4 >Emitted(12, 21) Source(5, 13) + SourceIndex(2) +1->Emitted(9, 1) Source(5, 1) + SourceIndex(2) +2 >Emitted(9, 19) Source(5, 11) + SourceIndex(2) +3 >Emitted(9, 20) Source(5, 12) + SourceIndex(2) +4 >Emitted(9, 21) Source(5, 13) + SourceIndex(2) --- >>>} 1 >^ @@ -3745,7 +3698,7 @@ sourceFile:../../../second/second_part1.ts > > f(); >} -1 >Emitted(13, 2) Source(11, 2) + SourceIndex(2) +1 >Emitted(10, 2) Source(11, 2) + SourceIndex(2) --- >>>declare class normalC { 1-> @@ -3756,9 +3709,9 @@ sourceFile:../../../second/second_part1.ts > 2 >class 3 > normalC -1->Emitted(14, 1) Source(13, 1) + SourceIndex(2) -2 >Emitted(14, 15) Source(13, 7) + SourceIndex(2) -3 >Emitted(14, 22) Source(13, 14) + SourceIndex(2) +1->Emitted(11, 1) Source(13, 1) + SourceIndex(2) +2 >Emitted(11, 15) Source(13, 7) + SourceIndex(2) +3 >Emitted(11, 22) Source(13, 14) + SourceIndex(2) --- >>>} 1 >^ @@ -3770,7 +3723,7 @@ sourceFile:../../../second/second_part1.ts > /*@internal*/ get c() { return 10; } > /*@internal*/ set c(val: number) { } >} -1 >Emitted(15, 2) Source(19, 2) + SourceIndex(2) +1 >Emitted(12, 2) Source(19, 2) + SourceIndex(2) --- >>>declare namespace normalN { 1-> @@ -3782,10 +3735,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > normalN 4 > -1->Emitted(16, 1) Source(20, 1) + SourceIndex(2) -2 >Emitted(16, 19) Source(20, 11) + SourceIndex(2) -3 >Emitted(16, 26) Source(20, 18) + SourceIndex(2) -4 >Emitted(16, 27) Source(20, 19) + SourceIndex(2) +1->Emitted(13, 1) Source(20, 1) + SourceIndex(2) +2 >Emitted(13, 19) Source(20, 11) + SourceIndex(2) +3 >Emitted(13, 26) Source(20, 18) + SourceIndex(2) +4 >Emitted(13, 27) Source(20, 19) + SourceIndex(2) --- >>>} 1 >^ @@ -3800,7 +3753,7 @@ sourceFile:../../../second/second_part1.ts > /*@internal*/ export const internalConst = 10; > /*@internal*/ export enum internalEnum { a, b, c } >} -1 >Emitted(17, 2) Source(29, 2) + SourceIndex(2) +1 >Emitted(14, 2) Source(29, 2) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3814,9 +3767,9 @@ sourceFile:../../../second/second_part2.ts 1-> 2 >class 3 > C -1->Emitted(18, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(18, 15) Source(1, 7) + SourceIndex(3) -3 >Emitted(18, 16) Source(1, 8) + SourceIndex(3) +1->Emitted(15, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(15, 15) Source(1, 7) + SourceIndex(3) +3 >Emitted(15, 16) Source(1, 8) + SourceIndex(3) --- >>> doSomething(): void; 1->^^^^ @@ -3824,8 +3777,8 @@ sourceFile:../../../second/second_part2.ts 1-> { > 2 > doSomething -1->Emitted(19, 5) Source(2, 5) + SourceIndex(3) -2 >Emitted(19, 16) Source(2, 16) + SourceIndex(3) +1->Emitted(16, 5) Source(2, 5) + SourceIndex(3) +2 >Emitted(16, 16) Source(2, 16) + SourceIndex(3) --- >>>} 1 >^ @@ -3834,7 +3787,7 @@ sourceFile:../../../second/second_part2.ts > console.log("something got done"); > } >} -1 >Emitted(20, 2) Source(5, 2) + SourceIndex(3) +1 >Emitted(17, 2) Source(5, 2) + SourceIndex(3) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3855,12 +3808,12 @@ sourceFile:../../third_part1.ts 4 > c 5 > = new C() 6 > ; -1->Emitted(22, 1) Source(1, 1) + SourceIndex(4) -2 >Emitted(22, 9) Source(1, 1) + SourceIndex(4) -3 >Emitted(22, 13) Source(1, 5) + SourceIndex(4) -4 >Emitted(22, 14) Source(1, 6) + SourceIndex(4) -5 >Emitted(22, 17) Source(1, 16) + SourceIndex(4) -6 >Emitted(22, 18) Source(1, 17) + SourceIndex(4) +1->Emitted(19, 1) Source(1, 1) + SourceIndex(4) +2 >Emitted(19, 9) Source(1, 1) + SourceIndex(4) +3 >Emitted(19, 13) Source(1, 5) + SourceIndex(4) +4 >Emitted(19, 14) Source(1, 6) + SourceIndex(4) +5 >Emitted(19, 17) Source(1, 16) + SourceIndex(4) +6 >Emitted(19, 18) Source(1, 17) + SourceIndex(4) --- >>>//# sourceMappingURL=third-output.d.ts.map diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/buildInfo/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/buildInfo/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index 242fcc23526..ca623429847 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/buildInfo/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/buildInfo/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -3410,45 +3410,40 @@ console.log(s); "sections": [ { "pos": 0, - "end": 403, + "end": 362, "kind": "prepend", "data": "/src/2/second-output.d.ts", "texts": [ { "pos": 0, - "end": 39, - "kind": "internal" - }, - { - "pos": 41, - "end": 156, + "end": 115, "kind": "text" }, { - "pos": 156, - "end": 198, + "pos": 115, + "end": 157, "kind": "sourceMapUrl" }, { - "pos": 200, - "end": 360, + "pos": 159, + "end": 319, "kind": "text" }, { - "pos": 360, - "end": 403, + "pos": 319, + "end": 362, "kind": "sourceMapUrl" } ] }, { - "pos": 405, - "end": 424, + "pos": 364, + "end": 383, "kind": "text" }, { - "pos": 424, - "end": 466, + "pos": 383, + "end": 425, "kind": "sourceMapUrl" } ] @@ -3593,14 +3588,9 @@ sourceMapUrl: (3646-3686) ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-403):: /src/2/second-output.d.ts texts:: 5 +prepend: (0-362):: /src/2/second-output.d.ts texts:: 4 >>-------------------------------------------------------------------- -internal: (0-39) -interface TheFirst { - none: any; -} ->>-------------------------------------------------------------------- -text: (41-156) +text: (0-115) declare const s = "Hola, world"; interface NoJsForHereEither { none: any; @@ -3608,10 +3598,10 @@ interface NoJsForHereEither { declare function f(): string; >>-------------------------------------------------------------------- -sourceMapUrl: (156-198) +sourceMapUrl: (115-157) //# sourceMappingURL=first-output.d.ts.map >>-------------------------------------------------------------------- -text: (200-360) +text: (159-319) declare namespace N { } declare namespace N { @@ -3625,21 +3615,18 @@ declare class C { } >>-------------------------------------------------------------------- -sourceMapUrl: (360-403) +sourceMapUrl: (319-362) //# sourceMappingURL=second-output.d.ts.map ---------------------------------------------------------------------- -text: (405-424) +text: (364-383) declare var c: C; ---------------------------------------------------------------------- -sourceMapUrl: (424-466) +sourceMapUrl: (383-425) //# sourceMappingURL=third-output.d.ts.map ====================================================================== //// [/src/third/thirdjs/output/third-output.d.ts] -interface TheFirst { - none: any; -} declare const s = "Hola, world"; interface NoJsForHereEither { none: any; @@ -3662,7 +3649,7 @@ declare var c: C; //# sourceMappingURL=third-output.d.ts.map //// [/src/third/thirdjs/output/third-output.d.ts.map] -{"version":3,"file":"third-output.d.ts","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;CAMZ;AACD,kBAAU,OAAO,CAAC;CASjB;AC5BD,cAAM,CAAC;IACH,WAAW;CAGd;;ACJD,QAAA,IAAI,CAAC,GAAU,CAAC"} +{"version":3,"file":"third-output.d.ts","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":"AAIA,QAAA,MAAM,CAAC,gBAAgB,CAAC;AAExB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;CAMZ;AACD,kBAAU,OAAO,CAAC;CASjB;AC5BD,cAAM,CAAC;IACH,WAAW;CAGd;;ACJD,QAAA,IAAI,CAAC,GAAU,CAAC"} //// [/src/third/thirdjs/output/third-output.d.ts.map.baseline.txt] =================================================================== @@ -3675,50 +3662,16 @@ sources: ../../../first/first_PART1.ts,../../../first/first_part3.ts,../../../se emittedFile:/src/third/thirdjs/output/third-output.d.ts sourceFile:../../../first/first_PART1.ts ------------------------------------------------------------------- ->>>interface TheFirst { -1 > -2 >^^^^^^^^^^ -3 > ^^^^^^^^ -1 >/*@internal*/ -2 >interface -3 > TheFirst -1 >Emitted(1, 1) Source(1, 15) + SourceIndex(0) -2 >Emitted(1, 11) Source(1, 25) + SourceIndex(0) -3 >Emitted(1, 19) Source(1, 33) + SourceIndex(0) ---- ->>> none: any; -1 >^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^ -5 > ^ -1 > { - > -2 > none -3 > : -4 > any -5 > ; -1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0) -2 >Emitted(2, 9) Source(2, 9) + SourceIndex(0) -3 >Emitted(2, 11) Source(2, 11) + SourceIndex(0) -4 >Emitted(2, 14) Source(2, 14) + SourceIndex(0) -5 >Emitted(2, 15) Source(2, 15) + SourceIndex(0) ---- ->>>} -1 >^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - >} -1 >Emitted(3, 2) Source(3, 2) + SourceIndex(0) ---- >>>declare const s = "Hola, world"; -1-> +1 > 2 >^^^^^^^^ 3 > ^^^^^^ 4 > ^ 5 > ^^^^^^^^^^^^^^^^ 6 > ^ -1-> +1 >/*@internal*/ interface TheFirst { + > none: any; + >} > > 2 > @@ -3726,12 +3679,12 @@ sourceFile:../../../first/first_PART1.ts 4 > s 5 > = "Hola, world" 6 > ; -1->Emitted(4, 1) Source(5, 1) + SourceIndex(0) -2 >Emitted(4, 9) Source(5, 1) + SourceIndex(0) -3 >Emitted(4, 15) Source(5, 7) + SourceIndex(0) -4 >Emitted(4, 16) Source(5, 8) + SourceIndex(0) -5 >Emitted(4, 32) Source(5, 24) + SourceIndex(0) -6 >Emitted(4, 33) Source(5, 25) + SourceIndex(0) +1 >Emitted(1, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(1, 9) Source(5, 1) + SourceIndex(0) +3 >Emitted(1, 15) Source(5, 7) + SourceIndex(0) +4 >Emitted(1, 16) Source(5, 8) + SourceIndex(0) +5 >Emitted(1, 32) Source(5, 24) + SourceIndex(0) +6 >Emitted(1, 33) Source(5, 25) + SourceIndex(0) --- >>>interface NoJsForHereEither { 1 > @@ -3742,9 +3695,9 @@ sourceFile:../../../first/first_PART1.ts > 2 >interface 3 > NoJsForHereEither -1 >Emitted(5, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(5, 11) Source(7, 11) + SourceIndex(0) -3 >Emitted(5, 28) Source(7, 28) + SourceIndex(0) +1 >Emitted(2, 1) Source(7, 1) + SourceIndex(0) +2 >Emitted(2, 11) Source(7, 11) + SourceIndex(0) +3 >Emitted(2, 28) Source(7, 28) + SourceIndex(0) --- >>> none: any; 1 >^^^^ @@ -3758,18 +3711,18 @@ sourceFile:../../../first/first_PART1.ts 3 > : 4 > any 5 > ; -1 >Emitted(6, 5) Source(8, 5) + SourceIndex(0) -2 >Emitted(6, 9) Source(8, 9) + SourceIndex(0) -3 >Emitted(6, 11) Source(8, 11) + SourceIndex(0) -4 >Emitted(6, 14) Source(8, 14) + SourceIndex(0) -5 >Emitted(6, 15) Source(8, 15) + SourceIndex(0) +1 >Emitted(3, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(3, 9) Source(8, 9) + SourceIndex(0) +3 >Emitted(3, 11) Source(8, 11) + SourceIndex(0) +4 >Emitted(3, 14) Source(8, 14) + SourceIndex(0) +5 >Emitted(3, 15) Source(8, 15) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(7, 2) Source(9, 2) + SourceIndex(0) +1 >Emitted(4, 2) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3787,10 +3740,10 @@ sourceFile:../../../first/first_part3.ts 4 > () { > return "JS does hoists"; > } -1->Emitted(8, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(8, 18) Source(1, 10) + SourceIndex(1) -3 >Emitted(8, 19) Source(1, 11) + SourceIndex(1) -4 >Emitted(8, 30) Source(3, 2) + SourceIndex(1) +1->Emitted(5, 1) Source(1, 1) + SourceIndex(1) +2 >Emitted(5, 18) Source(1, 10) + SourceIndex(1) +3 >Emitted(5, 19) Source(1, 11) + SourceIndex(1) +4 >Emitted(5, 30) Source(3, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3806,10 +3759,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > N 4 > -1->Emitted(10, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(10, 19) Source(1, 11) + SourceIndex(2) -3 >Emitted(10, 20) Source(1, 12) + SourceIndex(2) -4 >Emitted(10, 21) Source(1, 13) + SourceIndex(2) +1->Emitted(7, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(7, 19) Source(1, 11) + SourceIndex(2) +3 >Emitted(7, 20) Source(1, 12) + SourceIndex(2) +4 >Emitted(7, 21) Source(1, 13) + SourceIndex(2) --- >>>} 1 >^ @@ -3817,7 +3770,7 @@ sourceFile:../../../second/second_part1.ts 1 >{ > // Comment text >} -1 >Emitted(11, 2) Source(3, 2) + SourceIndex(2) +1 >Emitted(8, 2) Source(3, 2) + SourceIndex(2) --- >>>declare namespace N { 1-> @@ -3830,10 +3783,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > N 4 > -1->Emitted(12, 1) Source(5, 1) + SourceIndex(2) -2 >Emitted(12, 19) Source(5, 11) + SourceIndex(2) -3 >Emitted(12, 20) Source(5, 12) + SourceIndex(2) -4 >Emitted(12, 21) Source(5, 13) + SourceIndex(2) +1->Emitted(9, 1) Source(5, 1) + SourceIndex(2) +2 >Emitted(9, 19) Source(5, 11) + SourceIndex(2) +3 >Emitted(9, 20) Source(5, 12) + SourceIndex(2) +4 >Emitted(9, 21) Source(5, 13) + SourceIndex(2) --- >>>} 1 >^ @@ -3845,7 +3798,7 @@ sourceFile:../../../second/second_part1.ts > > f(); >} -1 >Emitted(13, 2) Source(11, 2) + SourceIndex(2) +1 >Emitted(10, 2) Source(11, 2) + SourceIndex(2) --- >>>declare class normalC { 1-> @@ -3856,9 +3809,9 @@ sourceFile:../../../second/second_part1.ts > 2 >class 3 > normalC -1->Emitted(14, 1) Source(13, 1) + SourceIndex(2) -2 >Emitted(14, 15) Source(13, 7) + SourceIndex(2) -3 >Emitted(14, 22) Source(13, 14) + SourceIndex(2) +1->Emitted(11, 1) Source(13, 1) + SourceIndex(2) +2 >Emitted(11, 15) Source(13, 7) + SourceIndex(2) +3 >Emitted(11, 22) Source(13, 14) + SourceIndex(2) --- >>>} 1 >^ @@ -3870,7 +3823,7 @@ sourceFile:../../../second/second_part1.ts > /*@internal*/ get c() { return 10; } > /*@internal*/ set c(val: number) { } >} -1 >Emitted(15, 2) Source(19, 2) + SourceIndex(2) +1 >Emitted(12, 2) Source(19, 2) + SourceIndex(2) --- >>>declare namespace normalN { 1-> @@ -3882,10 +3835,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > normalN 4 > -1->Emitted(16, 1) Source(20, 1) + SourceIndex(2) -2 >Emitted(16, 19) Source(20, 11) + SourceIndex(2) -3 >Emitted(16, 26) Source(20, 18) + SourceIndex(2) -4 >Emitted(16, 27) Source(20, 19) + SourceIndex(2) +1->Emitted(13, 1) Source(20, 1) + SourceIndex(2) +2 >Emitted(13, 19) Source(20, 11) + SourceIndex(2) +3 >Emitted(13, 26) Source(20, 18) + SourceIndex(2) +4 >Emitted(13, 27) Source(20, 19) + SourceIndex(2) --- >>>} 1 >^ @@ -3900,7 +3853,7 @@ sourceFile:../../../second/second_part1.ts > /*@internal*/ export const internalConst = 10; > /*@internal*/ export enum internalEnum { a, b, c } >} -1 >Emitted(17, 2) Source(29, 2) + SourceIndex(2) +1 >Emitted(14, 2) Source(29, 2) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3914,9 +3867,9 @@ sourceFile:../../../second/second_part2.ts 1-> 2 >class 3 > C -1->Emitted(18, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(18, 15) Source(1, 7) + SourceIndex(3) -3 >Emitted(18, 16) Source(1, 8) + SourceIndex(3) +1->Emitted(15, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(15, 15) Source(1, 7) + SourceIndex(3) +3 >Emitted(15, 16) Source(1, 8) + SourceIndex(3) --- >>> doSomething(): void; 1->^^^^ @@ -3924,8 +3877,8 @@ sourceFile:../../../second/second_part2.ts 1-> { > 2 > doSomething -1->Emitted(19, 5) Source(2, 5) + SourceIndex(3) -2 >Emitted(19, 16) Source(2, 16) + SourceIndex(3) +1->Emitted(16, 5) Source(2, 5) + SourceIndex(3) +2 >Emitted(16, 16) Source(2, 16) + SourceIndex(3) --- >>>} 1 >^ @@ -3934,7 +3887,7 @@ sourceFile:../../../second/second_part2.ts > console.log("something got done"); > } >} -1 >Emitted(20, 2) Source(5, 2) + SourceIndex(3) +1 >Emitted(17, 2) Source(5, 2) + SourceIndex(3) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3955,12 +3908,12 @@ sourceFile:../../third_part1.ts 4 > c 5 > = new C() 6 > ; -1->Emitted(22, 1) Source(1, 1) + SourceIndex(4) -2 >Emitted(22, 9) Source(1, 1) + SourceIndex(4) -3 >Emitted(22, 13) Source(1, 5) + SourceIndex(4) -4 >Emitted(22, 14) Source(1, 6) + SourceIndex(4) -5 >Emitted(22, 17) Source(1, 16) + SourceIndex(4) -6 >Emitted(22, 18) Source(1, 17) + SourceIndex(4) +1->Emitted(19, 1) Source(1, 1) + SourceIndex(4) +2 >Emitted(19, 9) Source(1, 1) + SourceIndex(4) +3 >Emitted(19, 13) Source(1, 5) + SourceIndex(4) +4 >Emitted(19, 14) Source(1, 6) + SourceIndex(4) +5 >Emitted(19, 17) Source(1, 16) + SourceIndex(4) +6 >Emitted(19, 18) Source(1, 17) + SourceIndex(4) --- >>>//# sourceMappingURL=third-output.d.ts.map diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js index 28349398aaf..ce38083a02f 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js @@ -2379,45 +2379,40 @@ console.log(s); "sections": [ { "pos": 0, - "end": 404, + "end": 363, "kind": "prepend", "data": "/src/2/second-output.d.ts", "texts": [ { "pos": 0, - "end": 39, - "kind": "internal" - }, - { - "pos": 41, - "end": 157, + "end": 116, "kind": "text" }, { - "pos": 157, - "end": 199, + "pos": 116, + "end": 158, "kind": "sourceMapUrl" }, { - "pos": 201, - "end": 361, + "pos": 160, + "end": 320, "kind": "text" }, { - "pos": 361, - "end": 404, + "pos": 320, + "end": 363, "kind": "sourceMapUrl" } ] }, { - "pos": 406, - "end": 425, + "pos": 365, + "end": 384, "kind": "text" }, { - "pos": 425, - "end": 467, + "pos": 384, + "end": 426, "kind": "sourceMapUrl" } ] @@ -2563,14 +2558,9 @@ sourceMapUrl: (3300-3340) ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-404):: /src/2/second-output.d.ts texts:: 5 +prepend: (0-363):: /src/2/second-output.d.ts texts:: 4 >>-------------------------------------------------------------------- -internal: (0-39) -interface TheFirst { - none: any; -} ->>-------------------------------------------------------------------- -text: (41-157) +text: (0-116) declare const s = "Hello, world"; interface NoJsForHereEither { none: any; @@ -2578,10 +2568,10 @@ interface NoJsForHereEither { declare function f(): string; >>-------------------------------------------------------------------- -sourceMapUrl: (157-199) +sourceMapUrl: (116-158) //# sourceMappingURL=first-output.d.ts.map >>-------------------------------------------------------------------- -text: (201-361) +text: (160-320) declare namespace N { } declare namespace N { @@ -2595,14 +2585,14 @@ declare class C { } >>-------------------------------------------------------------------- -sourceMapUrl: (361-404) +sourceMapUrl: (320-363) //# sourceMappingURL=second-output.d.ts.map ---------------------------------------------------------------------- -text: (406-425) +text: (365-384) declare var c: C; ---------------------------------------------------------------------- -sourceMapUrl: (425-467) +sourceMapUrl: (384-426) //# sourceMappingURL=third-output.d.ts.map ====================================================================== diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index e22abdfba3d..31a0a3e70ad 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -2479,45 +2479,40 @@ console.log(s); "sections": [ { "pos": 0, - "end": 419, + "end": 363, "kind": "prepend", "data": "/src/2/second-output.d.ts", "texts": [ { "pos": 0, - "end": 54, - "kind": "internal" - }, - { - "pos": 56, - "end": 172, + "end": 116, "kind": "text" }, { - "pos": 172, - "end": 214, + "pos": 116, + "end": 158, "kind": "sourceMapUrl" }, { - "pos": 216, - "end": 376, + "pos": 160, + "end": 320, "kind": "text" }, { - "pos": 376, - "end": 419, + "pos": 320, + "end": 363, "kind": "sourceMapUrl" } ] }, { - "pos": 421, - "end": 440, + "pos": 365, + "end": 384, "kind": "text" }, { - "pos": 440, - "end": 482, + "pos": 384, + "end": 426, "kind": "sourceMapUrl" } ] @@ -2663,14 +2658,9 @@ sourceMapUrl: (3682-3722) ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-419):: /src/2/second-output.d.ts texts:: 5 +prepend: (0-363):: /src/2/second-output.d.ts texts:: 4 >>-------------------------------------------------------------------- -internal: (0-54) -/**@internal*/ interface TheFirst { - none: any; -} ->>-------------------------------------------------------------------- -text: (56-172) +text: (0-116) declare const s = "Hello, world"; interface NoJsForHereEither { none: any; @@ -2678,10 +2668,10 @@ interface NoJsForHereEither { declare function f(): string; >>-------------------------------------------------------------------- -sourceMapUrl: (172-214) +sourceMapUrl: (116-158) //# sourceMappingURL=first-output.d.ts.map >>-------------------------------------------------------------------- -text: (216-376) +text: (160-320) declare namespace N { } declare namespace N { @@ -2695,14 +2685,14 @@ declare class C { } >>-------------------------------------------------------------------- -sourceMapUrl: (376-419) +sourceMapUrl: (320-363) //# sourceMappingURL=second-output.d.ts.map ---------------------------------------------------------------------- -text: (421-440) +text: (365-384) declare var c: C; ---------------------------------------------------------------------- -sourceMapUrl: (440-482) +sourceMapUrl: (384-426) //# sourceMappingURL=third-output.d.ts.map ====================================================================== diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/stripInternal-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/stripInternal-when-one-two-three-are-prepended-in-order.js index 05155eba6b2..20d9e65fd99 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/stripInternal-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/stripInternal-when-one-two-three-are-prepended-in-order.js @@ -2379,45 +2379,40 @@ console.log(s); "sections": [ { "pos": 0, - "end": 404, + "end": 363, "kind": "prepend", "data": "/src/2/second-output.d.ts", "texts": [ { "pos": 0, - "end": 39, - "kind": "internal" - }, - { - "pos": 41, - "end": 157, + "end": 116, "kind": "text" }, { - "pos": 157, - "end": 199, + "pos": 116, + "end": 158, "kind": "sourceMapUrl" }, { - "pos": 201, - "end": 361, + "pos": 160, + "end": 320, "kind": "text" }, { - "pos": 361, - "end": 404, + "pos": 320, + "end": 363, "kind": "sourceMapUrl" } ] }, { - "pos": 406, - "end": 425, + "pos": 365, + "end": 384, "kind": "text" }, { - "pos": 425, - "end": 467, + "pos": 384, + "end": 426, "kind": "sourceMapUrl" } ] @@ -2563,14 +2558,9 @@ sourceMapUrl: (3300-3340) ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-404):: /src/2/second-output.d.ts texts:: 5 +prepend: (0-363):: /src/2/second-output.d.ts texts:: 4 >>-------------------------------------------------------------------- -internal: (0-39) -interface TheFirst { - none: any; -} ->>-------------------------------------------------------------------- -text: (41-157) +text: (0-116) declare const s = "Hello, world"; interface NoJsForHereEither { none: any; @@ -2578,10 +2568,10 @@ interface NoJsForHereEither { declare function f(): string; >>-------------------------------------------------------------------- -sourceMapUrl: (157-199) +sourceMapUrl: (116-158) //# sourceMappingURL=first-output.d.ts.map >>-------------------------------------------------------------------- -text: (201-361) +text: (160-320) declare namespace N { } declare namespace N { @@ -2595,14 +2585,14 @@ declare class C { } >>-------------------------------------------------------------------- -sourceMapUrl: (361-404) +sourceMapUrl: (320-363) //# sourceMappingURL=second-output.d.ts.map ---------------------------------------------------------------------- -text: (406-425) +text: (365-384) declare var c: C; ---------------------------------------------------------------------- -sourceMapUrl: (425-467) +sourceMapUrl: (384-426) //# sourceMappingURL=third-output.d.ts.map ====================================================================== diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index 326f4d1be2a..71a75fd0bfd 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/buildInfo/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -2479,45 +2479,40 @@ console.log(s); "sections": [ { "pos": 0, - "end": 404, + "end": 363, "kind": "prepend", "data": "/src/2/second-output.d.ts", "texts": [ { "pos": 0, - "end": 39, - "kind": "internal" - }, - { - "pos": 41, - "end": 157, + "end": 116, "kind": "text" }, { - "pos": 157, - "end": 199, + "pos": 116, + "end": 158, "kind": "sourceMapUrl" }, { - "pos": 201, - "end": 361, + "pos": 160, + "end": 320, "kind": "text" }, { - "pos": 361, - "end": 404, + "pos": 320, + "end": 363, "kind": "sourceMapUrl" } ] }, { - "pos": 406, - "end": 425, + "pos": 365, + "end": 384, "kind": "text" }, { - "pos": 425, - "end": 467, + "pos": 384, + "end": 426, "kind": "sourceMapUrl" } ] @@ -2663,14 +2658,9 @@ sourceMapUrl: (3664-3704) ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-404):: /src/2/second-output.d.ts texts:: 5 +prepend: (0-363):: /src/2/second-output.d.ts texts:: 4 >>-------------------------------------------------------------------- -internal: (0-39) -interface TheFirst { - none: any; -} ->>-------------------------------------------------------------------- -text: (41-157) +text: (0-116) declare const s = "Hello, world"; interface NoJsForHereEither { none: any; @@ -2678,10 +2668,10 @@ interface NoJsForHereEither { declare function f(): string; >>-------------------------------------------------------------------- -sourceMapUrl: (157-199) +sourceMapUrl: (116-158) //# sourceMappingURL=first-output.d.ts.map >>-------------------------------------------------------------------- -text: (201-361) +text: (160-320) declare namespace N { } declare namespace N { @@ -2695,14 +2685,14 @@ declare class C { } >>-------------------------------------------------------------------- -sourceMapUrl: (361-404) +sourceMapUrl: (320-363) //# sourceMappingURL=second-output.d.ts.map ---------------------------------------------------------------------- -text: (406-425) +text: (365-384) declare var c: C; ---------------------------------------------------------------------- -sourceMapUrl: (425-467) +sourceMapUrl: (384-426) //# sourceMappingURL=third-output.d.ts.map ====================================================================== diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change/buildInfo/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change/buildInfo/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js index eede18aa1f1..24a5b946a2b 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change/buildInfo/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change/buildInfo/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js @@ -1,3 +1,324 @@ +//// [/src/2/.tsbuildinfo] +{ + "bundle": { + "commonSourceDirectory": "/src/second/", + "js": { + "sections": [ + { + "pos": 0, + "end": 150, + "kind": "prepend", + "data": "/src/first/bin/first-output.js", + "texts": [ + { + "pos": 0, + "end": 110, + "kind": "text" + }, + { + "pos": 110, + "end": 150, + "kind": "sourceMapUrl" + } + ] + }, + { + "pos": 152, + "end": 3204, + "kind": "text" + }, + { + "pos": 3204, + "end": 3245, + "kind": "sourceMapUrl" + } + ] + }, + "dts": { + "sections": [ + { + "pos": 0, + "end": 199, + "kind": "prepend", + "data": "/src/first/bin/first-output.d.ts", + "texts": [ + { + "pos": 0, + "end": 157, + "kind": "text" + }, + { + "pos": 157, + "end": 199, + "kind": "sourceMapUrl" + } + ] + }, + { + "pos": 201, + "end": 278, + "kind": "text" + }, + { + "pos": 278, + "end": 352, + "kind": "internal" + }, + { + "pos": 354, + "end": 386, + "kind": "text" + }, + { + "pos": 386, + "end": 778, + "kind": "internal" + }, + { + "pos": 780, + "end": 783, + "kind": "text" + }, + { + "pos": 783, + "end": 1196, + "kind": "internal" + }, + { + "pos": 1198, + "end": 1246, + "kind": "text" + }, + { + "pos": 1246, + "end": 1289, + "kind": "sourceMapUrl" + } + ] + } + } +} + +//// [/src/2/.tsbuildinfo.baseline.txt] +====================================================================== +File:: /src/2/second-output.js +---------------------------------------------------------------------- +prepend: (0-150):: /src/first/bin/first-output.js texts:: 2 +>>-------------------------------------------------------------------- +text: (0-110) +var s = "Hello, world"; +console.log(s); +console.log(f()); +function f() { + return "JS does hoists"; +} + +>>-------------------------------------------------------------------- +sourceMapUrl: (110-150) +//# sourceMappingURL=first-output.js.map +---------------------------------------------------------------------- +text: (152-3204) +var N; +(function (N) { + function f() { + console.log('testing'); + } + f(); +})(N || (N = {})); +var normalC = (function () { + function normalC() { + } + normalC.prototype.method = function () { }; + Object.defineProperty(normalC.prototype, "c", { + get: function () { return 10; }, + set: function (val) { }, + enumerable: true, + configurable: true + }); + return normalC; +}()); +var normalN; +(function (normalN) { + var C = (function () { + function C() { + } + return C; + }()); + normalN.C = C; + function foo() { } + normalN.foo = foo; + var someNamespace; + (function (someNamespace) { + var C = (function () { + function C() { + } + return C; + }()); + someNamespace.C = C; + })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {})); + var someOther; + (function (someOther) { + var something; + (function (something) { + var someClass = (function () { + function someClass() { + } + return someClass; + }()); + something.someClass = someClass; + })(something = someOther.something || (someOther.something = {})); + })(someOther = normalN.someOther || (normalN.someOther = {})); + normalN.someImport = someNamespace.C; + normalN.internalConst = 10; + var internalEnum; + (function (internalEnum) { + internalEnum[internalEnum["a"] = 0] = "a"; + internalEnum[internalEnum["b"] = 1] = "b"; + internalEnum[internalEnum["c"] = 2] = "c"; + })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {})); +})(normalN || (normalN = {})); +var internalC = (function () { + function internalC() { + } + return internalC; +}()); +function internalfoo() { } +var internalNamespace; +(function (internalNamespace) { + var someClass = (function () { + function someClass() { + } + return someClass; + }()); + internalNamespace.someClass = someClass; +})(internalNamespace || (internalNamespace = {})); +var internalOther; +(function (internalOther) { + var something; + (function (something) { + var someClass = (function () { + function someClass() { + } + return someClass; + }()); + something.someClass = someClass; + })(something = internalOther.something || (internalOther.something = {})); +})(internalOther || (internalOther = {})); +var internalImport = internalNamespace.someClass; +var internalConst = 10; +var internalEnum; +(function (internalEnum) { + internalEnum[internalEnum["a"] = 0] = "a"; + internalEnum[internalEnum["b"] = 1] = "b"; + internalEnum[internalEnum["c"] = 2] = "c"; +})(internalEnum || (internalEnum = {})); +var C = (function () { + function C() { + } + C.prototype.doSomething = function () { + console.log("something got done"); + }; + return C; +}()); + +---------------------------------------------------------------------- +sourceMapUrl: (3204-3245) +//# sourceMappingURL=second-output.js.map +====================================================================== +====================================================================== +File:: /src/2/second-output.d.ts +---------------------------------------------------------------------- +prepend: (0-199):: /src/first/bin/first-output.d.ts texts:: 2 +>>-------------------------------------------------------------------- +text: (0-157) +interface TheFirst { + none: any; +} +declare const s = "Hello, world"; +interface NoJsForHereEither { + none: any; +} +declare function f(): string; + +>>-------------------------------------------------------------------- +sourceMapUrl: (157-199) +//# sourceMappingURL=first-output.d.ts.map +---------------------------------------------------------------------- +text: (201-278) +declare namespace N { +} +declare namespace N { +} +declare class normalC { + +---------------------------------------------------------------------- +internal: (278-352) + constructor(); + prop: string; + method(): void; + c: number; +---------------------------------------------------------------------- +text: (354-386) +} +declare namespace normalN { + +---------------------------------------------------------------------- +internal: (386-778) + class C { + } + function foo(): void; + namespace someNamespace { + class C { + } + } + namespace someOther.something { + class someClass { + } + } + export import someImport = someNamespace.C; + type internalType = internalC; + const internalConst = 10; + enum internalEnum { + a = 0, + b = 1, + c = 2 + } +---------------------------------------------------------------------- +text: (780-783) +} + +---------------------------------------------------------------------- +internal: (783-1196) +declare class internalC { +} +declare function internalfoo(): void; +declare namespace internalNamespace { + class someClass { + } +} +declare namespace internalOther.something { + class someClass { + } +} +import internalImport = internalNamespace.someClass; +declare type internalType = internalC; +declare const internalConst = 10; +declare enum internalEnum { + a = 0, + b = 1, + c = 2 +} +---------------------------------------------------------------------- +text: (1198-1246) +declare class C { + doSomething(): void; +} + +---------------------------------------------------------------------- +sourceMapUrl: (1246-1289) +//# sourceMappingURL=second-output.d.ts.map +====================================================================== + //// [/src/2/second-output.d.ts.map] {"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEM,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACF,CAAC,EACM,MAAM;CACnC;AACD,kBAAU,OAAO,CAAC;IACC,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACtD;AACc,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC5C,cAAM,CAAC;IACH,WAAW;CAGd"} @@ -2722,6 +3043,300 @@ interface NoJsForHereEither { console.log(s); +//// [/src/third/thirdjs/output/.tsbuildinfo] +{ + "bundle": { + "commonSourceDirectory": "/src/third/", + "js": { + "sections": [ + { + "pos": 0, + "end": 3245, + "kind": "prepend", + "data": "/src/2/second-output.js", + "texts": [ + { + "pos": 0, + "end": 110, + "kind": "text" + }, + { + "pos": 110, + "end": 150, + "kind": "sourceMapUrl" + }, + { + "pos": 152, + "end": 3204, + "kind": "text" + }, + { + "pos": 3204, + "end": 3245, + "kind": "sourceMapUrl" + } + ] + }, + { + "pos": 3247, + "end": 3283, + "kind": "text" + }, + { + "pos": 3283, + "end": 3323, + "kind": "sourceMapUrl" + } + ] + }, + "dts": { + "sections": [ + { + "pos": 0, + "end": 404, + "kind": "prepend", + "data": "/src/2/second-output.d.ts", + "texts": [ + { + "pos": 0, + "end": 157, + "kind": "text" + }, + { + "pos": 157, + "end": 199, + "kind": "sourceMapUrl" + }, + { + "pos": 201, + "end": 361, + "kind": "text" + }, + { + "pos": 361, + "end": 404, + "kind": "sourceMapUrl" + } + ] + }, + { + "pos": 406, + "end": 425, + "kind": "text" + }, + { + "pos": 425, + "end": 467, + "kind": "sourceMapUrl" + } + ] + } + } +} + +//// [/src/third/thirdjs/output/.tsbuildinfo.baseline.txt] +====================================================================== +File:: /src/third/thirdjs/output/third-output.js +---------------------------------------------------------------------- +prepend: (0-3245):: /src/2/second-output.js texts:: 4 +>>-------------------------------------------------------------------- +text: (0-110) +var s = "Hello, world"; +console.log(s); +console.log(f()); +function f() { + return "JS does hoists"; +} + +>>-------------------------------------------------------------------- +sourceMapUrl: (110-150) +//# sourceMappingURL=first-output.js.map +>>-------------------------------------------------------------------- +text: (152-3204) +var N; +(function (N) { + function f() { + console.log('testing'); + } + f(); +})(N || (N = {})); +var normalC = (function () { + function normalC() { + } + normalC.prototype.method = function () { }; + Object.defineProperty(normalC.prototype, "c", { + get: function () { return 10; }, + set: function (val) { }, + enumerable: true, + configurable: true + }); + return normalC; +}()); +var normalN; +(function (normalN) { + var C = (function () { + function C() { + } + return C; + }()); + normalN.C = C; + function foo() { } + normalN.foo = foo; + var someNamespace; + (function (someNamespace) { + var C = (function () { + function C() { + } + return C; + }()); + someNamespace.C = C; + })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {})); + var someOther; + (function (someOther) { + var something; + (function (something) { + var someClass = (function () { + function someClass() { + } + return someClass; + }()); + something.someClass = someClass; + })(something = someOther.something || (someOther.something = {})); + })(someOther = normalN.someOther || (normalN.someOther = {})); + normalN.someImport = someNamespace.C; + normalN.internalConst = 10; + var internalEnum; + (function (internalEnum) { + internalEnum[internalEnum["a"] = 0] = "a"; + internalEnum[internalEnum["b"] = 1] = "b"; + internalEnum[internalEnum["c"] = 2] = "c"; + })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {})); +})(normalN || (normalN = {})); +var internalC = (function () { + function internalC() { + } + return internalC; +}()); +function internalfoo() { } +var internalNamespace; +(function (internalNamespace) { + var someClass = (function () { + function someClass() { + } + return someClass; + }()); + internalNamespace.someClass = someClass; +})(internalNamespace || (internalNamespace = {})); +var internalOther; +(function (internalOther) { + var something; + (function (something) { + var someClass = (function () { + function someClass() { + } + return someClass; + }()); + something.someClass = someClass; + })(something = internalOther.something || (internalOther.something = {})); +})(internalOther || (internalOther = {})); +var internalImport = internalNamespace.someClass; +var internalConst = 10; +var internalEnum; +(function (internalEnum) { + internalEnum[internalEnum["a"] = 0] = "a"; + internalEnum[internalEnum["b"] = 1] = "b"; + internalEnum[internalEnum["c"] = 2] = "c"; +})(internalEnum || (internalEnum = {})); +var C = (function () { + function C() { + } + C.prototype.doSomething = function () { + console.log("something got done"); + }; + return C; +}()); + +>>-------------------------------------------------------------------- +sourceMapUrl: (3204-3245) +//# sourceMappingURL=second-output.js.map +---------------------------------------------------------------------- +text: (3247-3283) +var c = new C(); +c.doSomething(); + +---------------------------------------------------------------------- +sourceMapUrl: (3283-3323) +//# sourceMappingURL=third-output.js.map +====================================================================== +====================================================================== +File:: /src/third/thirdjs/output/third-output.d.ts +---------------------------------------------------------------------- +prepend: (0-404):: /src/2/second-output.d.ts texts:: 4 +>>-------------------------------------------------------------------- +text: (0-157) +interface TheFirst { + none: any; +} +declare const s = "Hello, world"; +interface NoJsForHereEither { + none: any; +} +declare function f(): string; + +>>-------------------------------------------------------------------- +sourceMapUrl: (157-199) +//# sourceMappingURL=first-output.d.ts.map +>>-------------------------------------------------------------------- +text: (201-361) +declare namespace N { +} +declare namespace N { +} +declare class normalC { +} +declare namespace normalN { +} +declare class C { + doSomething(): void; +} + +>>-------------------------------------------------------------------- +sourceMapUrl: (361-404) +//# sourceMappingURL=second-output.d.ts.map +---------------------------------------------------------------------- +text: (406-425) +declare var c: C; + +---------------------------------------------------------------------- +sourceMapUrl: (425-467) +//# sourceMappingURL=third-output.d.ts.map +====================================================================== + +//// [/src/third/thirdjs/output/third-output.d.ts] +interface TheFirst { + none: any; +} +declare const s = "Hello, world"; +interface NoJsForHereEither { + none: any; +} +declare function f(): string; +//# sourceMappingURL=first-output.d.ts.map +declare namespace N { +} +declare namespace N { +} +declare class normalC { +} +declare namespace normalN { +} +declare class C { + doSomething(): void; +} +//# sourceMappingURL=second-output.d.ts.map +declare var c: C; +//# sourceMappingURL=third-output.d.ts.map + //// [/src/third/thirdjs/output/third-output.d.ts.map] {"version":3,"file":"third-output.d.ts","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;CAMZ;AACD,kBAAU,OAAO,CAAC;CASjB;AC5BD,cAAM,CAAC;IACH,WAAW;CAGd;;ACJD,QAAA,IAAI,CAAC,GAAU,CAAC"} diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change/buildInfo/stripInternal-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change/buildInfo/stripInternal-when-one-two-three-are-prepended-in-order.js index fa0899fa02f..661a16cdf12 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change/buildInfo/stripInternal-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change/buildInfo/stripInternal-when-one-two-three-are-prepended-in-order.js @@ -1,3 +1,324 @@ +//// [/src/2/.tsbuildinfo] +{ + "bundle": { + "commonSourceDirectory": "/src/second/", + "js": { + "sections": [ + { + "pos": 0, + "end": 150, + "kind": "prepend", + "data": "/src/first/bin/first-output.js", + "texts": [ + { + "pos": 0, + "end": 110, + "kind": "text" + }, + { + "pos": 110, + "end": 150, + "kind": "sourceMapUrl" + } + ] + }, + { + "pos": 152, + "end": 3204, + "kind": "text" + }, + { + "pos": 3204, + "end": 3245, + "kind": "sourceMapUrl" + } + ] + }, + "dts": { + "sections": [ + { + "pos": 0, + "end": 199, + "kind": "prepend", + "data": "/src/first/bin/first-output.d.ts", + "texts": [ + { + "pos": 0, + "end": 157, + "kind": "text" + }, + { + "pos": 157, + "end": 199, + "kind": "sourceMapUrl" + } + ] + }, + { + "pos": 201, + "end": 278, + "kind": "text" + }, + { + "pos": 278, + "end": 352, + "kind": "internal" + }, + { + "pos": 354, + "end": 386, + "kind": "text" + }, + { + "pos": 386, + "end": 778, + "kind": "internal" + }, + { + "pos": 780, + "end": 783, + "kind": "text" + }, + { + "pos": 783, + "end": 1196, + "kind": "internal" + }, + { + "pos": 1198, + "end": 1246, + "kind": "text" + }, + { + "pos": 1246, + "end": 1289, + "kind": "sourceMapUrl" + } + ] + } + } +} + +//// [/src/2/.tsbuildinfo.baseline.txt] +====================================================================== +File:: /src/2/second-output.js +---------------------------------------------------------------------- +prepend: (0-150):: /src/first/bin/first-output.js texts:: 2 +>>-------------------------------------------------------------------- +text: (0-110) +var s = "Hello, world"; +console.log(s); +console.log(f()); +function f() { + return "JS does hoists"; +} + +>>-------------------------------------------------------------------- +sourceMapUrl: (110-150) +//# sourceMappingURL=first-output.js.map +---------------------------------------------------------------------- +text: (152-3204) +var N; +(function (N) { + function f() { + console.log('testing'); + } + f(); +})(N || (N = {})); +var normalC = (function () { + function normalC() { + } + normalC.prototype.method = function () { }; + Object.defineProperty(normalC.prototype, "c", { + get: function () { return 10; }, + set: function (val) { }, + enumerable: true, + configurable: true + }); + return normalC; +}()); +var normalN; +(function (normalN) { + var C = (function () { + function C() { + } + return C; + }()); + normalN.C = C; + function foo() { } + normalN.foo = foo; + var someNamespace; + (function (someNamespace) { + var C = (function () { + function C() { + } + return C; + }()); + someNamespace.C = C; + })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {})); + var someOther; + (function (someOther) { + var something; + (function (something) { + var someClass = (function () { + function someClass() { + } + return someClass; + }()); + something.someClass = someClass; + })(something = someOther.something || (someOther.something = {})); + })(someOther = normalN.someOther || (normalN.someOther = {})); + normalN.someImport = someNamespace.C; + normalN.internalConst = 10; + var internalEnum; + (function (internalEnum) { + internalEnum[internalEnum["a"] = 0] = "a"; + internalEnum[internalEnum["b"] = 1] = "b"; + internalEnum[internalEnum["c"] = 2] = "c"; + })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {})); +})(normalN || (normalN = {})); +var internalC = (function () { + function internalC() { + } + return internalC; +}()); +function internalfoo() { } +var internalNamespace; +(function (internalNamespace) { + var someClass = (function () { + function someClass() { + } + return someClass; + }()); + internalNamespace.someClass = someClass; +})(internalNamespace || (internalNamespace = {})); +var internalOther; +(function (internalOther) { + var something; + (function (something) { + var someClass = (function () { + function someClass() { + } + return someClass; + }()); + something.someClass = someClass; + })(something = internalOther.something || (internalOther.something = {})); +})(internalOther || (internalOther = {})); +var internalImport = internalNamespace.someClass; +var internalConst = 10; +var internalEnum; +(function (internalEnum) { + internalEnum[internalEnum["a"] = 0] = "a"; + internalEnum[internalEnum["b"] = 1] = "b"; + internalEnum[internalEnum["c"] = 2] = "c"; +})(internalEnum || (internalEnum = {})); +var C = (function () { + function C() { + } + C.prototype.doSomething = function () { + console.log("something got done"); + }; + return C; +}()); + +---------------------------------------------------------------------- +sourceMapUrl: (3204-3245) +//# sourceMappingURL=second-output.js.map +====================================================================== +====================================================================== +File:: /src/2/second-output.d.ts +---------------------------------------------------------------------- +prepend: (0-199):: /src/first/bin/first-output.d.ts texts:: 2 +>>-------------------------------------------------------------------- +text: (0-157) +interface TheFirst { + none: any; +} +declare const s = "Hello, world"; +interface NoJsForHereEither { + none: any; +} +declare function f(): string; + +>>-------------------------------------------------------------------- +sourceMapUrl: (157-199) +//# sourceMappingURL=first-output.d.ts.map +---------------------------------------------------------------------- +text: (201-278) +declare namespace N { +} +declare namespace N { +} +declare class normalC { + +---------------------------------------------------------------------- +internal: (278-352) + constructor(); + prop: string; + method(): void; + c: number; +---------------------------------------------------------------------- +text: (354-386) +} +declare namespace normalN { + +---------------------------------------------------------------------- +internal: (386-778) + class C { + } + function foo(): void; + namespace someNamespace { + class C { + } + } + namespace someOther.something { + class someClass { + } + } + export import someImport = someNamespace.C; + type internalType = internalC; + const internalConst = 10; + enum internalEnum { + a = 0, + b = 1, + c = 2 + } +---------------------------------------------------------------------- +text: (780-783) +} + +---------------------------------------------------------------------- +internal: (783-1196) +declare class internalC { +} +declare function internalfoo(): void; +declare namespace internalNamespace { + class someClass { + } +} +declare namespace internalOther.something { + class someClass { + } +} +import internalImport = internalNamespace.someClass; +declare type internalType = internalC; +declare const internalConst = 10; +declare enum internalEnum { + a = 0, + b = 1, + c = 2 +} +---------------------------------------------------------------------- +text: (1198-1246) +declare class C { + doSomething(): void; +} + +---------------------------------------------------------------------- +sourceMapUrl: (1246-1289) +//# sourceMappingURL=second-output.d.ts.map +====================================================================== + //// [/src/2/second-output.d.ts.map] {"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;IACF,CAAC,EACM,MAAM;CAClC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"} @@ -2722,6 +3043,300 @@ interface NoJsForHereEither { console.log(s); +//// [/src/third/thirdjs/output/.tsbuildinfo] +{ + "bundle": { + "commonSourceDirectory": "/src/third/", + "js": { + "sections": [ + { + "pos": 0, + "end": 3245, + "kind": "prepend", + "data": "/src/2/second-output.js", + "texts": [ + { + "pos": 0, + "end": 110, + "kind": "text" + }, + { + "pos": 110, + "end": 150, + "kind": "sourceMapUrl" + }, + { + "pos": 152, + "end": 3204, + "kind": "text" + }, + { + "pos": 3204, + "end": 3245, + "kind": "sourceMapUrl" + } + ] + }, + { + "pos": 3247, + "end": 3283, + "kind": "text" + }, + { + "pos": 3283, + "end": 3323, + "kind": "sourceMapUrl" + } + ] + }, + "dts": { + "sections": [ + { + "pos": 0, + "end": 404, + "kind": "prepend", + "data": "/src/2/second-output.d.ts", + "texts": [ + { + "pos": 0, + "end": 157, + "kind": "text" + }, + { + "pos": 157, + "end": 199, + "kind": "sourceMapUrl" + }, + { + "pos": 201, + "end": 361, + "kind": "text" + }, + { + "pos": 361, + "end": 404, + "kind": "sourceMapUrl" + } + ] + }, + { + "pos": 406, + "end": 425, + "kind": "text" + }, + { + "pos": 425, + "end": 467, + "kind": "sourceMapUrl" + } + ] + } + } +} + +//// [/src/third/thirdjs/output/.tsbuildinfo.baseline.txt] +====================================================================== +File:: /src/third/thirdjs/output/third-output.js +---------------------------------------------------------------------- +prepend: (0-3245):: /src/2/second-output.js texts:: 4 +>>-------------------------------------------------------------------- +text: (0-110) +var s = "Hello, world"; +console.log(s); +console.log(f()); +function f() { + return "JS does hoists"; +} + +>>-------------------------------------------------------------------- +sourceMapUrl: (110-150) +//# sourceMappingURL=first-output.js.map +>>-------------------------------------------------------------------- +text: (152-3204) +var N; +(function (N) { + function f() { + console.log('testing'); + } + f(); +})(N || (N = {})); +var normalC = (function () { + function normalC() { + } + normalC.prototype.method = function () { }; + Object.defineProperty(normalC.prototype, "c", { + get: function () { return 10; }, + set: function (val) { }, + enumerable: true, + configurable: true + }); + return normalC; +}()); +var normalN; +(function (normalN) { + var C = (function () { + function C() { + } + return C; + }()); + normalN.C = C; + function foo() { } + normalN.foo = foo; + var someNamespace; + (function (someNamespace) { + var C = (function () { + function C() { + } + return C; + }()); + someNamespace.C = C; + })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {})); + var someOther; + (function (someOther) { + var something; + (function (something) { + var someClass = (function () { + function someClass() { + } + return someClass; + }()); + something.someClass = someClass; + })(something = someOther.something || (someOther.something = {})); + })(someOther = normalN.someOther || (normalN.someOther = {})); + normalN.someImport = someNamespace.C; + normalN.internalConst = 10; + var internalEnum; + (function (internalEnum) { + internalEnum[internalEnum["a"] = 0] = "a"; + internalEnum[internalEnum["b"] = 1] = "b"; + internalEnum[internalEnum["c"] = 2] = "c"; + })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {})); +})(normalN || (normalN = {})); +var internalC = (function () { + function internalC() { + } + return internalC; +}()); +function internalfoo() { } +var internalNamespace; +(function (internalNamespace) { + var someClass = (function () { + function someClass() { + } + return someClass; + }()); + internalNamespace.someClass = someClass; +})(internalNamespace || (internalNamespace = {})); +var internalOther; +(function (internalOther) { + var something; + (function (something) { + var someClass = (function () { + function someClass() { + } + return someClass; + }()); + something.someClass = someClass; + })(something = internalOther.something || (internalOther.something = {})); +})(internalOther || (internalOther = {})); +var internalImport = internalNamespace.someClass; +var internalConst = 10; +var internalEnum; +(function (internalEnum) { + internalEnum[internalEnum["a"] = 0] = "a"; + internalEnum[internalEnum["b"] = 1] = "b"; + internalEnum[internalEnum["c"] = 2] = "c"; +})(internalEnum || (internalEnum = {})); +var C = (function () { + function C() { + } + C.prototype.doSomething = function () { + console.log("something got done"); + }; + return C; +}()); + +>>-------------------------------------------------------------------- +sourceMapUrl: (3204-3245) +//# sourceMappingURL=second-output.js.map +---------------------------------------------------------------------- +text: (3247-3283) +var c = new C(); +c.doSomething(); + +---------------------------------------------------------------------- +sourceMapUrl: (3283-3323) +//# sourceMappingURL=third-output.js.map +====================================================================== +====================================================================== +File:: /src/third/thirdjs/output/third-output.d.ts +---------------------------------------------------------------------- +prepend: (0-404):: /src/2/second-output.d.ts texts:: 4 +>>-------------------------------------------------------------------- +text: (0-157) +interface TheFirst { + none: any; +} +declare const s = "Hello, world"; +interface NoJsForHereEither { + none: any; +} +declare function f(): string; + +>>-------------------------------------------------------------------- +sourceMapUrl: (157-199) +//# sourceMappingURL=first-output.d.ts.map +>>-------------------------------------------------------------------- +text: (201-361) +declare namespace N { +} +declare namespace N { +} +declare class normalC { +} +declare namespace normalN { +} +declare class C { + doSomething(): void; +} + +>>-------------------------------------------------------------------- +sourceMapUrl: (361-404) +//# sourceMappingURL=second-output.d.ts.map +---------------------------------------------------------------------- +text: (406-425) +declare var c: C; + +---------------------------------------------------------------------- +sourceMapUrl: (425-467) +//# sourceMappingURL=third-output.d.ts.map +====================================================================== + +//// [/src/third/thirdjs/output/third-output.d.ts] +interface TheFirst { + none: any; +} +declare const s = "Hello, world"; +interface NoJsForHereEither { + none: any; +} +declare function f(): string; +//# sourceMappingURL=first-output.d.ts.map +declare namespace N { +} +declare namespace N { +} +declare class normalC { +} +declare namespace normalN { +} +declare class C { + doSomething(): void; +} +//# sourceMappingURL=second-output.d.ts.map +declare var c: C; +//# sourceMappingURL=third-output.d.ts.map + //// [/src/third/thirdjs/output/third-output.d.ts.map] {"version":3,"file":"third-output.d.ts","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;CAMZ;AACD,kBAAU,OAAO,CAAC;CASjB;AC5BD,cAAM,CAAC;IACH,WAAW;CAGd;;ACJD,QAAA,IAAI,CAAC,GAAU,CAAC"} diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change/buildInfo/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change/buildInfo/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index ddf355bd62a..4a07f3c92c2 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change/buildInfo/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change/buildInfo/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -1,3 +1,324 @@ +//// [/src/2/.tsbuildinfo] +{ + "bundle": { + "commonSourceDirectory": "/src/second/", + "js": { + "sections": [ + { + "pos": 0, + "end": 150, + "kind": "prepend", + "data": "/src/first/bin/first-output.js", + "texts": [ + { + "pos": 0, + "end": 110, + "kind": "text" + }, + { + "pos": 110, + "end": 150, + "kind": "sourceMapUrl" + } + ] + }, + { + "pos": 152, + "end": 3568, + "kind": "text" + }, + { + "pos": 3568, + "end": 3609, + "kind": "sourceMapUrl" + } + ] + }, + "dts": { + "sections": [ + { + "pos": 0, + "end": 199, + "kind": "prepend", + "data": "/src/first/bin/first-output.d.ts", + "texts": [ + { + "pos": 0, + "end": 157, + "kind": "text" + }, + { + "pos": 157, + "end": 199, + "kind": "sourceMapUrl" + } + ] + }, + { + "pos": 201, + "end": 278, + "kind": "text" + }, + { + "pos": 278, + "end": 366, + "kind": "internal" + }, + { + "pos": 368, + "end": 400, + "kind": "text" + }, + { + "pos": 400, + "end": 792, + "kind": "internal" + }, + { + "pos": 794, + "end": 797, + "kind": "text" + }, + { + "pos": 797, + "end": 1210, + "kind": "internal" + }, + { + "pos": 1212, + "end": 1260, + "kind": "text" + }, + { + "pos": 1260, + "end": 1303, + "kind": "sourceMapUrl" + } + ] + } + } +} + +//// [/src/2/.tsbuildinfo.baseline.txt] +====================================================================== +File:: /src/2/second-output.js +---------------------------------------------------------------------- +prepend: (0-150):: /src/first/bin/first-output.js texts:: 2 +>>-------------------------------------------------------------------- +text: (0-110) +var s = "Hello, world"; +console.log(s); +console.log(f()); +function f() { + return "JS does hoists"; +} + +>>-------------------------------------------------------------------- +sourceMapUrl: (110-150) +//# sourceMappingURL=first-output.js.map +---------------------------------------------------------------------- +text: (152-3568) +var N; +(function (N) { + function f() { + console.log('testing'); + } + f(); +})(N || (N = {})); +var normalC = /** @class */ (function () { + /*@internal*/ function normalC() { + } + /*@internal*/ normalC.prototype.method = function () { }; + Object.defineProperty(normalC.prototype, "c", { + /*@internal*/ get: function () { return 10; }, + /*@internal*/ set: function (val) { }, + enumerable: true, + configurable: true + }); + return normalC; +}()); +var normalN; +(function (normalN) { + /*@internal*/ var C = /** @class */ (function () { + function C() { + } + return C; + }()); + normalN.C = C; + /*@internal*/ function foo() { } + normalN.foo = foo; + /*@internal*/ var someNamespace; + (function (someNamespace) { + var C = /** @class */ (function () { + function C() { + } + return C; + }()); + someNamespace.C = C; + })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {})); + /*@internal*/ var someOther; + (function (someOther) { + var something; + (function (something) { + var someClass = /** @class */ (function () { + function someClass() { + } + return someClass; + }()); + something.someClass = someClass; + })(something = someOther.something || (someOther.something = {})); + })(someOther = normalN.someOther || (normalN.someOther = {})); + /*@internal*/ normalN.someImport = someNamespace.C; + /*@internal*/ normalN.internalConst = 10; + /*@internal*/ var internalEnum; + (function (internalEnum) { + internalEnum[internalEnum["a"] = 0] = "a"; + internalEnum[internalEnum["b"] = 1] = "b"; + internalEnum[internalEnum["c"] = 2] = "c"; + })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {})); +})(normalN || (normalN = {})); +/*@internal*/ var internalC = /** @class */ (function () { + function internalC() { + } + return internalC; +}()); +/*@internal*/ function internalfoo() { } +/*@internal*/ var internalNamespace; +(function (internalNamespace) { + var someClass = /** @class */ (function () { + function someClass() { + } + return someClass; + }()); + internalNamespace.someClass = someClass; +})(internalNamespace || (internalNamespace = {})); +/*@internal*/ var internalOther; +(function (internalOther) { + var something; + (function (something) { + var someClass = /** @class */ (function () { + function someClass() { + } + return someClass; + }()); + something.someClass = someClass; + })(something = internalOther.something || (internalOther.something = {})); +})(internalOther || (internalOther = {})); +/*@internal*/ var internalImport = internalNamespace.someClass; +/*@internal*/ var internalConst = 10; +/*@internal*/ var internalEnum; +(function (internalEnum) { + internalEnum[internalEnum["a"] = 0] = "a"; + internalEnum[internalEnum["b"] = 1] = "b"; + internalEnum[internalEnum["c"] = 2] = "c"; +})(internalEnum || (internalEnum = {})); +var C = /** @class */ (function () { + function C() { + } + C.prototype.doSomething = function () { + console.log("something got done"); + }; + return C; +}()); + +---------------------------------------------------------------------- +sourceMapUrl: (3568-3609) +//# sourceMappingURL=second-output.js.map +====================================================================== +====================================================================== +File:: /src/2/second-output.d.ts +---------------------------------------------------------------------- +prepend: (0-199):: /src/first/bin/first-output.d.ts texts:: 2 +>>-------------------------------------------------------------------- +text: (0-157) +interface TheFirst { + none: any; +} +declare const s = "Hello, world"; +interface NoJsForHereEither { + none: any; +} +declare function f(): string; + +>>-------------------------------------------------------------------- +sourceMapUrl: (157-199) +//# sourceMappingURL=first-output.d.ts.map +---------------------------------------------------------------------- +text: (201-278) +declare namespace N { +} +declare namespace N { +} +declare class normalC { + +---------------------------------------------------------------------- +internal: (278-366) + constructor(); + prop: string; + method(): void; + /*@internal*/ c: number; +---------------------------------------------------------------------- +text: (368-400) +} +declare namespace normalN { + +---------------------------------------------------------------------- +internal: (400-792) + class C { + } + function foo(): void; + namespace someNamespace { + class C { + } + } + namespace someOther.something { + class someClass { + } + } + export import someImport = someNamespace.C; + type internalType = internalC; + const internalConst = 10; + enum internalEnum { + a = 0, + b = 1, + c = 2 + } +---------------------------------------------------------------------- +text: (794-797) +} + +---------------------------------------------------------------------- +internal: (797-1210) +declare class internalC { +} +declare function internalfoo(): void; +declare namespace internalNamespace { + class someClass { + } +} +declare namespace internalOther.something { + class someClass { + } +} +import internalImport = internalNamespace.someClass; +declare type internalType = internalC; +declare const internalConst = 10; +declare enum internalEnum { + a = 0, + b = 1, + c = 2 +} +---------------------------------------------------------------------- +text: (1212-1260) +declare class C { + doSomething(): void; +} + +---------------------------------------------------------------------- +sourceMapUrl: (1260-1303) +//# sourceMappingURL=second-output.d.ts.map +====================================================================== + //// [/src/2/second-output.d.ts.map] {"version":3,"file":"second-output.d.ts","sourceRoot":"","sources":["../first/first_PART1.ts","../first/first_part3.ts","../second/second_part1.ts","../second/second_part2.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;;IAEK,IAAI,EAAE,MAAM,CAAC;IACb,MAAM;kBACF,CAAC,EACM,MAAM;CAClC;AACD,kBAAU,OAAO,CAAC;IACA,MAAa,CAAC;KAAI;IAClB,SAAgB,GAAG,SAAK;IACxB,UAAiB,aAAa,CAAC;QAAE,MAAa,CAAC;SAAG;KAAE;IACpD,UAAiB,SAAS,CAAC,SAAS,CAAC;QAAE,MAAa,SAAS;SAAG;KAAE;IAClE,MAAM,QAAQ,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC;IAC3C,KAAY,YAAY,GAAG,SAAS,CAAC;IAC9B,MAAM,aAAa,KAAK,CAAC;IAChC,KAAY,YAAY;QAAG,CAAC,IAAA;QAAE,CAAC,IAAA;QAAE,CAAC,IAAA;KAAE;CACrD;AACa,cAAM,SAAS;CAAG;AAClB,iBAAS,WAAW,SAAK;AACzB,kBAAU,iBAAiB,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AACzD,kBAAU,aAAa,CAAC,SAAS,CAAC;IAAE,MAAa,SAAS;KAAG;CAAE;AAC/D,OAAO,cAAc,GAAG,iBAAiB,CAAC,SAAS,CAAC;AACpD,aAAK,YAAY,GAAG,SAAS,CAAC;AAC9B,QAAA,MAAM,aAAa,KAAK,CAAC;AACzB,aAAK,YAAY;IAAG,CAAC,IAAA;IAAE,CAAC,IAAA;IAAE,CAAC,IAAA;CAAE;ACpC3C,cAAM,CAAC;IACH,WAAW;CAGd"} @@ -2822,6 +3143,300 @@ interface NoJsForHereEither { console.log(s); +//// [/src/third/thirdjs/output/.tsbuildinfo] +{ + "bundle": { + "commonSourceDirectory": "/src/third/", + "js": { + "sections": [ + { + "pos": 0, + "end": 3609, + "kind": "prepend", + "data": "/src/2/second-output.js", + "texts": [ + { + "pos": 0, + "end": 110, + "kind": "text" + }, + { + "pos": 110, + "end": 150, + "kind": "sourceMapUrl" + }, + { + "pos": 152, + "end": 3568, + "kind": "text" + }, + { + "pos": 3568, + "end": 3609, + "kind": "sourceMapUrl" + } + ] + }, + { + "pos": 3611, + "end": 3647, + "kind": "text" + }, + { + "pos": 3647, + "end": 3687, + "kind": "sourceMapUrl" + } + ] + }, + "dts": { + "sections": [ + { + "pos": 0, + "end": 404, + "kind": "prepend", + "data": "/src/2/second-output.d.ts", + "texts": [ + { + "pos": 0, + "end": 157, + "kind": "text" + }, + { + "pos": 157, + "end": 199, + "kind": "sourceMapUrl" + }, + { + "pos": 201, + "end": 361, + "kind": "text" + }, + { + "pos": 361, + "end": 404, + "kind": "sourceMapUrl" + } + ] + }, + { + "pos": 406, + "end": 425, + "kind": "text" + }, + { + "pos": 425, + "end": 467, + "kind": "sourceMapUrl" + } + ] + } + } +} + +//// [/src/third/thirdjs/output/.tsbuildinfo.baseline.txt] +====================================================================== +File:: /src/third/thirdjs/output/third-output.js +---------------------------------------------------------------------- +prepend: (0-3609):: /src/2/second-output.js texts:: 4 +>>-------------------------------------------------------------------- +text: (0-110) +var s = "Hello, world"; +console.log(s); +console.log(f()); +function f() { + return "JS does hoists"; +} + +>>-------------------------------------------------------------------- +sourceMapUrl: (110-150) +//# sourceMappingURL=first-output.js.map +>>-------------------------------------------------------------------- +text: (152-3568) +var N; +(function (N) { + function f() { + console.log('testing'); + } + f(); +})(N || (N = {})); +var normalC = /** @class */ (function () { + /*@internal*/ function normalC() { + } + /*@internal*/ normalC.prototype.method = function () { }; + Object.defineProperty(normalC.prototype, "c", { + /*@internal*/ get: function () { return 10; }, + /*@internal*/ set: function (val) { }, + enumerable: true, + configurable: true + }); + return normalC; +}()); +var normalN; +(function (normalN) { + /*@internal*/ var C = /** @class */ (function () { + function C() { + } + return C; + }()); + normalN.C = C; + /*@internal*/ function foo() { } + normalN.foo = foo; + /*@internal*/ var someNamespace; + (function (someNamespace) { + var C = /** @class */ (function () { + function C() { + } + return C; + }()); + someNamespace.C = C; + })(someNamespace = normalN.someNamespace || (normalN.someNamespace = {})); + /*@internal*/ var someOther; + (function (someOther) { + var something; + (function (something) { + var someClass = /** @class */ (function () { + function someClass() { + } + return someClass; + }()); + something.someClass = someClass; + })(something = someOther.something || (someOther.something = {})); + })(someOther = normalN.someOther || (normalN.someOther = {})); + /*@internal*/ normalN.someImport = someNamespace.C; + /*@internal*/ normalN.internalConst = 10; + /*@internal*/ var internalEnum; + (function (internalEnum) { + internalEnum[internalEnum["a"] = 0] = "a"; + internalEnum[internalEnum["b"] = 1] = "b"; + internalEnum[internalEnum["c"] = 2] = "c"; + })(internalEnum = normalN.internalEnum || (normalN.internalEnum = {})); +})(normalN || (normalN = {})); +/*@internal*/ var internalC = /** @class */ (function () { + function internalC() { + } + return internalC; +}()); +/*@internal*/ function internalfoo() { } +/*@internal*/ var internalNamespace; +(function (internalNamespace) { + var someClass = /** @class */ (function () { + function someClass() { + } + return someClass; + }()); + internalNamespace.someClass = someClass; +})(internalNamespace || (internalNamespace = {})); +/*@internal*/ var internalOther; +(function (internalOther) { + var something; + (function (something) { + var someClass = /** @class */ (function () { + function someClass() { + } + return someClass; + }()); + something.someClass = someClass; + })(something = internalOther.something || (internalOther.something = {})); +})(internalOther || (internalOther = {})); +/*@internal*/ var internalImport = internalNamespace.someClass; +/*@internal*/ var internalConst = 10; +/*@internal*/ var internalEnum; +(function (internalEnum) { + internalEnum[internalEnum["a"] = 0] = "a"; + internalEnum[internalEnum["b"] = 1] = "b"; + internalEnum[internalEnum["c"] = 2] = "c"; +})(internalEnum || (internalEnum = {})); +var C = /** @class */ (function () { + function C() { + } + C.prototype.doSomething = function () { + console.log("something got done"); + }; + return C; +}()); + +>>-------------------------------------------------------------------- +sourceMapUrl: (3568-3609) +//# sourceMappingURL=second-output.js.map +---------------------------------------------------------------------- +text: (3611-3647) +var c = new C(); +c.doSomething(); + +---------------------------------------------------------------------- +sourceMapUrl: (3647-3687) +//# sourceMappingURL=third-output.js.map +====================================================================== +====================================================================== +File:: /src/third/thirdjs/output/third-output.d.ts +---------------------------------------------------------------------- +prepend: (0-404):: /src/2/second-output.d.ts texts:: 4 +>>-------------------------------------------------------------------- +text: (0-157) +interface TheFirst { + none: any; +} +declare const s = "Hello, world"; +interface NoJsForHereEither { + none: any; +} +declare function f(): string; + +>>-------------------------------------------------------------------- +sourceMapUrl: (157-199) +//# sourceMappingURL=first-output.d.ts.map +>>-------------------------------------------------------------------- +text: (201-361) +declare namespace N { +} +declare namespace N { +} +declare class normalC { +} +declare namespace normalN { +} +declare class C { + doSomething(): void; +} + +>>-------------------------------------------------------------------- +sourceMapUrl: (361-404) +//# sourceMappingURL=second-output.d.ts.map +---------------------------------------------------------------------- +text: (406-425) +declare var c: C; + +---------------------------------------------------------------------- +sourceMapUrl: (425-467) +//# sourceMappingURL=third-output.d.ts.map +====================================================================== + +//// [/src/third/thirdjs/output/third-output.d.ts] +interface TheFirst { + none: any; +} +declare const s = "Hello, world"; +interface NoJsForHereEither { + none: any; +} +declare function f(): string; +//# sourceMappingURL=first-output.d.ts.map +declare namespace N { +} +declare namespace N { +} +declare class normalC { +} +declare namespace normalN { +} +declare class C { + doSomething(): void; +} +//# sourceMappingURL=second-output.d.ts.map +declare var c: C; +//# sourceMappingURL=third-output.d.ts.map + //// [/src/third/thirdjs/output/third-output.d.ts.map] {"version":3,"file":"third-output.d.ts","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":"AAAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;CAMZ;AACD,kBAAU,OAAO,CAAC;CASjB;AC5BD,cAAM,CAAC;IACH,WAAW;CAGd;;ACJD,QAAA,IAAI,CAAC,GAAU,CAAC"} diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/buildInfo/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/buildInfo/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js index 16b3c4b0340..2858ae915ea 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/buildInfo/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/buildInfo/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js @@ -3368,45 +3368,40 @@ namespace normalN { "sections": [ { "pos": 0, - "end": 404, + "end": 363, "kind": "prepend", "data": "/src/2/second-output.d.ts", "texts": [ { "pos": 0, - "end": 39, - "kind": "internal" - }, - { - "pos": 41, - "end": 157, + "end": 116, "kind": "text" }, { - "pos": 157, - "end": 199, + "pos": 116, + "end": 158, "kind": "sourceMapUrl" }, { - "pos": 201, - "end": 361, + "pos": 160, + "end": 320, "kind": "text" }, { - "pos": 361, - "end": 404, + "pos": 320, + "end": 363, "kind": "sourceMapUrl" } ] }, { - "pos": 406, - "end": 425, + "pos": 365, + "end": 384, "kind": "text" }, { - "pos": 425, - "end": 467, + "pos": 384, + "end": 426, "kind": "sourceMapUrl" } ] @@ -3551,14 +3546,9 @@ sourceMapUrl: (3283-3323) ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-404):: /src/2/second-output.d.ts texts:: 5 +prepend: (0-363):: /src/2/second-output.d.ts texts:: 4 >>-------------------------------------------------------------------- -internal: (0-39) -interface TheFirst { - none: any; -} ->>-------------------------------------------------------------------- -text: (41-157) +text: (0-116) declare const s = "Hello, world"; interface NoJsForHereEither { none: any; @@ -3566,10 +3556,10 @@ interface NoJsForHereEither { declare function f(): string; >>-------------------------------------------------------------------- -sourceMapUrl: (157-199) +sourceMapUrl: (116-158) //# sourceMappingURL=first-output.d.ts.map >>-------------------------------------------------------------------- -text: (201-361) +text: (160-320) declare namespace N { } declare namespace N { @@ -3583,21 +3573,18 @@ declare class C { } >>-------------------------------------------------------------------- -sourceMapUrl: (361-404) +sourceMapUrl: (320-363) //# sourceMappingURL=second-output.d.ts.map ---------------------------------------------------------------------- -text: (406-425) +text: (365-384) declare var c: C; ---------------------------------------------------------------------- -sourceMapUrl: (425-467) +sourceMapUrl: (384-426) //# sourceMappingURL=third-output.d.ts.map ====================================================================== //// [/src/third/thirdjs/output/third-output.d.ts] -interface TheFirst { - none: any; -} declare const s = "Hello, world"; interface NoJsForHereEither { none: any; @@ -3620,7 +3607,7 @@ declare var c: C; //# sourceMappingURL=third-output.d.ts.map //// [/src/third/thirdjs/output/third-output.d.ts.map] -{"version":3,"file":"third-output.d.ts","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":"AAAe,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;CAMZ;AACD,kBAAU,OAAO,CAAC;CASjB;AC5BD,cAAM,CAAC;IACH,WAAW;CAGd;;ACJD,QAAA,IAAI,CAAC,GAAU,CAAC"} +{"version":3,"file":"third-output.d.ts","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":"AAIA,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;CAMZ;AACD,kBAAU,OAAO,CAAC;CASjB;AC5BD,cAAM,CAAC;IACH,WAAW;CAGd;;ACJD,QAAA,IAAI,CAAC,GAAU,CAAC"} //// [/src/third/thirdjs/output/third-output.d.ts.map.baseline.txt] =================================================================== @@ -3633,50 +3620,16 @@ sources: ../../../first/first_PART1.ts,../../../first/first_part3.ts,../../../se emittedFile:/src/third/thirdjs/output/third-output.d.ts sourceFile:../../../first/first_PART1.ts ------------------------------------------------------------------- ->>>interface TheFirst { -1 > -2 >^^^^^^^^^^ -3 > ^^^^^^^^ -1 >/**@internal*/ -2 >interface -3 > TheFirst -1 >Emitted(1, 1) Source(1, 16) + SourceIndex(0) -2 >Emitted(1, 11) Source(1, 26) + SourceIndex(0) -3 >Emitted(1, 19) Source(1, 34) + SourceIndex(0) ---- ->>> none: any; -1 >^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^ -5 > ^ -1 > { - > -2 > none -3 > : -4 > any -5 > ; -1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0) -2 >Emitted(2, 9) Source(2, 9) + SourceIndex(0) -3 >Emitted(2, 11) Source(2, 11) + SourceIndex(0) -4 >Emitted(2, 14) Source(2, 14) + SourceIndex(0) -5 >Emitted(2, 15) Source(2, 15) + SourceIndex(0) ---- ->>>} -1 >^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - >} -1 >Emitted(3, 2) Source(3, 2) + SourceIndex(0) ---- >>>declare const s = "Hello, world"; -1-> +1 > 2 >^^^^^^^^ 3 > ^^^^^^ 4 > ^ 5 > ^^^^^^^^^^^^^^^^^ 6 > ^ -1-> +1 >/**@internal*/ interface TheFirst { + > none: any; + >} > > 2 > @@ -3684,12 +3637,12 @@ sourceFile:../../../first/first_PART1.ts 4 > s 5 > = "Hello, world" 6 > ; -1->Emitted(4, 1) Source(5, 1) + SourceIndex(0) -2 >Emitted(4, 9) Source(5, 1) + SourceIndex(0) -3 >Emitted(4, 15) Source(5, 7) + SourceIndex(0) -4 >Emitted(4, 16) Source(5, 8) + SourceIndex(0) -5 >Emitted(4, 33) Source(5, 25) + SourceIndex(0) -6 >Emitted(4, 34) Source(5, 26) + SourceIndex(0) +1 >Emitted(1, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(1, 9) Source(5, 1) + SourceIndex(0) +3 >Emitted(1, 15) Source(5, 7) + SourceIndex(0) +4 >Emitted(1, 16) Source(5, 8) + SourceIndex(0) +5 >Emitted(1, 33) Source(5, 25) + SourceIndex(0) +6 >Emitted(1, 34) Source(5, 26) + SourceIndex(0) --- >>>interface NoJsForHereEither { 1 > @@ -3700,9 +3653,9 @@ sourceFile:../../../first/first_PART1.ts > 2 >interface 3 > NoJsForHereEither -1 >Emitted(5, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(5, 11) Source(7, 11) + SourceIndex(0) -3 >Emitted(5, 28) Source(7, 28) + SourceIndex(0) +1 >Emitted(2, 1) Source(7, 1) + SourceIndex(0) +2 >Emitted(2, 11) Source(7, 11) + SourceIndex(0) +3 >Emitted(2, 28) Source(7, 28) + SourceIndex(0) --- >>> none: any; 1 >^^^^ @@ -3716,18 +3669,18 @@ sourceFile:../../../first/first_PART1.ts 3 > : 4 > any 5 > ; -1 >Emitted(6, 5) Source(8, 5) + SourceIndex(0) -2 >Emitted(6, 9) Source(8, 9) + SourceIndex(0) -3 >Emitted(6, 11) Source(8, 11) + SourceIndex(0) -4 >Emitted(6, 14) Source(8, 14) + SourceIndex(0) -5 >Emitted(6, 15) Source(8, 15) + SourceIndex(0) +1 >Emitted(3, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(3, 9) Source(8, 9) + SourceIndex(0) +3 >Emitted(3, 11) Source(8, 11) + SourceIndex(0) +4 >Emitted(3, 14) Source(8, 14) + SourceIndex(0) +5 >Emitted(3, 15) Source(8, 15) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(7, 2) Source(9, 2) + SourceIndex(0) +1 >Emitted(4, 2) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3745,10 +3698,10 @@ sourceFile:../../../first/first_part3.ts 4 > () { > return "JS does hoists"; > } -1->Emitted(8, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(8, 18) Source(1, 10) + SourceIndex(1) -3 >Emitted(8, 19) Source(1, 11) + SourceIndex(1) -4 >Emitted(8, 30) Source(3, 2) + SourceIndex(1) +1->Emitted(5, 1) Source(1, 1) + SourceIndex(1) +2 >Emitted(5, 18) Source(1, 10) + SourceIndex(1) +3 >Emitted(5, 19) Source(1, 11) + SourceIndex(1) +4 >Emitted(5, 30) Source(3, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3764,10 +3717,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > N 4 > -1->Emitted(10, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(10, 19) Source(1, 11) + SourceIndex(2) -3 >Emitted(10, 20) Source(1, 12) + SourceIndex(2) -4 >Emitted(10, 21) Source(1, 13) + SourceIndex(2) +1->Emitted(7, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(7, 19) Source(1, 11) + SourceIndex(2) +3 >Emitted(7, 20) Source(1, 12) + SourceIndex(2) +4 >Emitted(7, 21) Source(1, 13) + SourceIndex(2) --- >>>} 1 >^ @@ -3775,7 +3728,7 @@ sourceFile:../../../second/second_part1.ts 1 >{ > // Comment text >} -1 >Emitted(11, 2) Source(3, 2) + SourceIndex(2) +1 >Emitted(8, 2) Source(3, 2) + SourceIndex(2) --- >>>declare namespace N { 1-> @@ -3788,10 +3741,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > N 4 > -1->Emitted(12, 1) Source(5, 1) + SourceIndex(2) -2 >Emitted(12, 19) Source(5, 11) + SourceIndex(2) -3 >Emitted(12, 20) Source(5, 12) + SourceIndex(2) -4 >Emitted(12, 21) Source(5, 13) + SourceIndex(2) +1->Emitted(9, 1) Source(5, 1) + SourceIndex(2) +2 >Emitted(9, 19) Source(5, 11) + SourceIndex(2) +3 >Emitted(9, 20) Source(5, 12) + SourceIndex(2) +4 >Emitted(9, 21) Source(5, 13) + SourceIndex(2) --- >>>} 1 >^ @@ -3803,7 +3756,7 @@ sourceFile:../../../second/second_part1.ts > > f(); >} -1 >Emitted(13, 2) Source(11, 2) + SourceIndex(2) +1 >Emitted(10, 2) Source(11, 2) + SourceIndex(2) --- >>>declare class normalC { 1-> @@ -3814,9 +3767,9 @@ sourceFile:../../../second/second_part1.ts > 2 >class 3 > normalC -1->Emitted(14, 1) Source(13, 1) + SourceIndex(2) -2 >Emitted(14, 15) Source(13, 7) + SourceIndex(2) -3 >Emitted(14, 22) Source(13, 14) + SourceIndex(2) +1->Emitted(11, 1) Source(13, 1) + SourceIndex(2) +2 >Emitted(11, 15) Source(13, 7) + SourceIndex(2) +3 >Emitted(11, 22) Source(13, 14) + SourceIndex(2) --- >>>} 1 >^ @@ -3828,7 +3781,7 @@ sourceFile:../../../second/second_part1.ts > /**@internal*/ get c() { return 10; } > /**@internal*/ set c(val: number) { } >} -1 >Emitted(15, 2) Source(19, 2) + SourceIndex(2) +1 >Emitted(12, 2) Source(19, 2) + SourceIndex(2) --- >>>declare namespace normalN { 1-> @@ -3840,10 +3793,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > normalN 4 > -1->Emitted(16, 1) Source(20, 1) + SourceIndex(2) -2 >Emitted(16, 19) Source(20, 11) + SourceIndex(2) -3 >Emitted(16, 26) Source(20, 18) + SourceIndex(2) -4 >Emitted(16, 27) Source(20, 19) + SourceIndex(2) +1->Emitted(13, 1) Source(20, 1) + SourceIndex(2) +2 >Emitted(13, 19) Source(20, 11) + SourceIndex(2) +3 >Emitted(13, 26) Source(20, 18) + SourceIndex(2) +4 >Emitted(13, 27) Source(20, 19) + SourceIndex(2) --- >>>} 1 >^ @@ -3858,7 +3811,7 @@ sourceFile:../../../second/second_part1.ts > /**@internal*/ export const internalConst = 10; > /**@internal*/ export enum internalEnum { a, b, c } >} -1 >Emitted(17, 2) Source(29, 2) + SourceIndex(2) +1 >Emitted(14, 2) Source(29, 2) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3872,9 +3825,9 @@ sourceFile:../../../second/second_part2.ts 1-> 2 >class 3 > C -1->Emitted(18, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(18, 15) Source(1, 7) + SourceIndex(3) -3 >Emitted(18, 16) Source(1, 8) + SourceIndex(3) +1->Emitted(15, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(15, 15) Source(1, 7) + SourceIndex(3) +3 >Emitted(15, 16) Source(1, 8) + SourceIndex(3) --- >>> doSomething(): void; 1->^^^^ @@ -3882,8 +3835,8 @@ sourceFile:../../../second/second_part2.ts 1-> { > 2 > doSomething -1->Emitted(19, 5) Source(2, 5) + SourceIndex(3) -2 >Emitted(19, 16) Source(2, 16) + SourceIndex(3) +1->Emitted(16, 5) Source(2, 5) + SourceIndex(3) +2 >Emitted(16, 16) Source(2, 16) + SourceIndex(3) --- >>>} 1 >^ @@ -3892,7 +3845,7 @@ sourceFile:../../../second/second_part2.ts > console.log("something got done"); > } >} -1 >Emitted(20, 2) Source(5, 2) + SourceIndex(3) +1 >Emitted(17, 2) Source(5, 2) + SourceIndex(3) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3913,12 +3866,12 @@ sourceFile:../../third_part1.ts 4 > c 5 > = new C() 6 > ; -1->Emitted(22, 1) Source(1, 1) + SourceIndex(4) -2 >Emitted(22, 9) Source(1, 1) + SourceIndex(4) -3 >Emitted(22, 13) Source(1, 5) + SourceIndex(4) -4 >Emitted(22, 14) Source(1, 6) + SourceIndex(4) -5 >Emitted(22, 17) Source(1, 16) + SourceIndex(4) -6 >Emitted(22, 18) Source(1, 17) + SourceIndex(4) +1->Emitted(19, 1) Source(1, 1) + SourceIndex(4) +2 >Emitted(19, 9) Source(1, 1) + SourceIndex(4) +3 >Emitted(19, 13) Source(1, 5) + SourceIndex(4) +4 >Emitted(19, 14) Source(1, 6) + SourceIndex(4) +5 >Emitted(19, 17) Source(1, 16) + SourceIndex(4) +6 >Emitted(19, 18) Source(1, 17) + SourceIndex(4) --- >>>//# sourceMappingURL=third-output.d.ts.map diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/buildInfo/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/buildInfo/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index 9f79c4dbbff..6b3b3a5f24a 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/buildInfo/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/buildInfo/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -3626,45 +3626,40 @@ namespace normalN { "sections": [ { "pos": 0, - "end": 419, + "end": 363, "kind": "prepend", "data": "/src/2/second-output.d.ts", "texts": [ { "pos": 0, - "end": 54, - "kind": "internal" - }, - { - "pos": 56, - "end": 172, + "end": 116, "kind": "text" }, { - "pos": 172, - "end": 214, + "pos": 116, + "end": 158, "kind": "sourceMapUrl" }, { - "pos": 216, - "end": 376, + "pos": 160, + "end": 320, "kind": "text" }, { - "pos": 376, - "end": 419, + "pos": 320, + "end": 363, "kind": "sourceMapUrl" } ] }, { - "pos": 421, - "end": 440, + "pos": 365, + "end": 384, "kind": "text" }, { - "pos": 440, - "end": 482, + "pos": 384, + "end": 426, "kind": "sourceMapUrl" } ] @@ -3809,14 +3804,9 @@ sourceMapUrl: (3665-3705) ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-419):: /src/2/second-output.d.ts texts:: 5 +prepend: (0-363):: /src/2/second-output.d.ts texts:: 4 >>-------------------------------------------------------------------- -internal: (0-54) -/**@internal*/ interface TheFirst { - none: any; -} ->>-------------------------------------------------------------------- -text: (56-172) +text: (0-116) declare const s = "Hello, world"; interface NoJsForHereEither { none: any; @@ -3824,10 +3814,10 @@ interface NoJsForHereEither { declare function f(): string; >>-------------------------------------------------------------------- -sourceMapUrl: (172-214) +sourceMapUrl: (116-158) //# sourceMappingURL=first-output.d.ts.map >>-------------------------------------------------------------------- -text: (216-376) +text: (160-320) declare namespace N { } declare namespace N { @@ -3841,21 +3831,18 @@ declare class C { } >>-------------------------------------------------------------------- -sourceMapUrl: (376-419) +sourceMapUrl: (320-363) //# sourceMappingURL=second-output.d.ts.map ---------------------------------------------------------------------- -text: (421-440) +text: (365-384) declare var c: C; ---------------------------------------------------------------------- -sourceMapUrl: (440-482) +sourceMapUrl: (384-426) //# sourceMappingURL=third-output.d.ts.map ====================================================================== //// [/src/third/thirdjs/output/third-output.d.ts] -/**@internal*/ interface TheFirst { - none: any; -} declare const s = "Hello, world"; interface NoJsForHereEither { none: any; @@ -3878,7 +3865,7 @@ declare var c: C; //# sourceMappingURL=third-output.d.ts.map //// [/src/third/thirdjs/output/third-output.d.ts.map] -{"version":3,"file":"third-output.d.ts","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":"AAAA,cAAc,CAAC,UAAU,QAAQ;IAC7B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;CAMZ;AACD,kBAAU,OAAO,CAAC;CASjB;AC5BD,cAAM,CAAC;IACH,WAAW;CAGd;;ACJD,QAAA,IAAI,CAAC,GAAU,CAAC"} +{"version":3,"file":"third-output.d.ts","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":"AAIA,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;CAMZ;AACD,kBAAU,OAAO,CAAC;CASjB;AC5BD,cAAM,CAAC;IACH,WAAW;CAGd;;ACJD,QAAA,IAAI,CAAC,GAAU,CAAC"} //// [/src/third/thirdjs/output/third-output.d.ts.map.baseline.txt] =================================================================== @@ -3891,56 +3878,16 @@ sources: ../../../first/first_PART1.ts,../../../first/first_part3.ts,../../../se emittedFile:/src/third/thirdjs/output/third-output.d.ts sourceFile:../../../first/first_PART1.ts ------------------------------------------------------------------- ->>>/**@internal*/ interface TheFirst { -1 > -2 >^^^^^^^^^^^^^^ -3 > ^ -4 > ^^^^^^^^^^ -5 > ^^^^^^^^ -1 > -2 >/**@internal*/ -3 > -4 > interface -5 > TheFirst -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(1, 15) Source(1, 15) + SourceIndex(0) -3 >Emitted(1, 16) Source(1, 16) + SourceIndex(0) -4 >Emitted(1, 26) Source(1, 26) + SourceIndex(0) -5 >Emitted(1, 34) Source(1, 34) + SourceIndex(0) ---- ->>> none: any; -1 >^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^ -5 > ^ -1 > { - > -2 > none -3 > : -4 > any -5 > ; -1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0) -2 >Emitted(2, 9) Source(2, 9) + SourceIndex(0) -3 >Emitted(2, 11) Source(2, 11) + SourceIndex(0) -4 >Emitted(2, 14) Source(2, 14) + SourceIndex(0) -5 >Emitted(2, 15) Source(2, 15) + SourceIndex(0) ---- ->>>} -1 >^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - >} -1 >Emitted(3, 2) Source(3, 2) + SourceIndex(0) ---- >>>declare const s = "Hello, world"; -1-> +1 > 2 >^^^^^^^^ 3 > ^^^^^^ 4 > ^ 5 > ^^^^^^^^^^^^^^^^^ 6 > ^ -1-> +1 >/**@internal*/ interface TheFirst { + > none: any; + >} > > 2 > @@ -3948,12 +3895,12 @@ sourceFile:../../../first/first_PART1.ts 4 > s 5 > = "Hello, world" 6 > ; -1->Emitted(4, 1) Source(5, 1) + SourceIndex(0) -2 >Emitted(4, 9) Source(5, 1) + SourceIndex(0) -3 >Emitted(4, 15) Source(5, 7) + SourceIndex(0) -4 >Emitted(4, 16) Source(5, 8) + SourceIndex(0) -5 >Emitted(4, 33) Source(5, 25) + SourceIndex(0) -6 >Emitted(4, 34) Source(5, 26) + SourceIndex(0) +1 >Emitted(1, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(1, 9) Source(5, 1) + SourceIndex(0) +3 >Emitted(1, 15) Source(5, 7) + SourceIndex(0) +4 >Emitted(1, 16) Source(5, 8) + SourceIndex(0) +5 >Emitted(1, 33) Source(5, 25) + SourceIndex(0) +6 >Emitted(1, 34) Source(5, 26) + SourceIndex(0) --- >>>interface NoJsForHereEither { 1 > @@ -3964,9 +3911,9 @@ sourceFile:../../../first/first_PART1.ts > 2 >interface 3 > NoJsForHereEither -1 >Emitted(5, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(5, 11) Source(7, 11) + SourceIndex(0) -3 >Emitted(5, 28) Source(7, 28) + SourceIndex(0) +1 >Emitted(2, 1) Source(7, 1) + SourceIndex(0) +2 >Emitted(2, 11) Source(7, 11) + SourceIndex(0) +3 >Emitted(2, 28) Source(7, 28) + SourceIndex(0) --- >>> none: any; 1 >^^^^ @@ -3980,18 +3927,18 @@ sourceFile:../../../first/first_PART1.ts 3 > : 4 > any 5 > ; -1 >Emitted(6, 5) Source(8, 5) + SourceIndex(0) -2 >Emitted(6, 9) Source(8, 9) + SourceIndex(0) -3 >Emitted(6, 11) Source(8, 11) + SourceIndex(0) -4 >Emitted(6, 14) Source(8, 14) + SourceIndex(0) -5 >Emitted(6, 15) Source(8, 15) + SourceIndex(0) +1 >Emitted(3, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(3, 9) Source(8, 9) + SourceIndex(0) +3 >Emitted(3, 11) Source(8, 11) + SourceIndex(0) +4 >Emitted(3, 14) Source(8, 14) + SourceIndex(0) +5 >Emitted(3, 15) Source(8, 15) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(7, 2) Source(9, 2) + SourceIndex(0) +1 >Emitted(4, 2) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -4009,10 +3956,10 @@ sourceFile:../../../first/first_part3.ts 4 > () { > return "JS does hoists"; > } -1->Emitted(8, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(8, 18) Source(1, 10) + SourceIndex(1) -3 >Emitted(8, 19) Source(1, 11) + SourceIndex(1) -4 >Emitted(8, 30) Source(3, 2) + SourceIndex(1) +1->Emitted(5, 1) Source(1, 1) + SourceIndex(1) +2 >Emitted(5, 18) Source(1, 10) + SourceIndex(1) +3 >Emitted(5, 19) Source(1, 11) + SourceIndex(1) +4 >Emitted(5, 30) Source(3, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -4028,10 +3975,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > N 4 > -1->Emitted(10, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(10, 19) Source(1, 11) + SourceIndex(2) -3 >Emitted(10, 20) Source(1, 12) + SourceIndex(2) -4 >Emitted(10, 21) Source(1, 13) + SourceIndex(2) +1->Emitted(7, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(7, 19) Source(1, 11) + SourceIndex(2) +3 >Emitted(7, 20) Source(1, 12) + SourceIndex(2) +4 >Emitted(7, 21) Source(1, 13) + SourceIndex(2) --- >>>} 1 >^ @@ -4039,7 +3986,7 @@ sourceFile:../../../second/second_part1.ts 1 >{ > // Comment text >} -1 >Emitted(11, 2) Source(3, 2) + SourceIndex(2) +1 >Emitted(8, 2) Source(3, 2) + SourceIndex(2) --- >>>declare namespace N { 1-> @@ -4052,10 +3999,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > N 4 > -1->Emitted(12, 1) Source(5, 1) + SourceIndex(2) -2 >Emitted(12, 19) Source(5, 11) + SourceIndex(2) -3 >Emitted(12, 20) Source(5, 12) + SourceIndex(2) -4 >Emitted(12, 21) Source(5, 13) + SourceIndex(2) +1->Emitted(9, 1) Source(5, 1) + SourceIndex(2) +2 >Emitted(9, 19) Source(5, 11) + SourceIndex(2) +3 >Emitted(9, 20) Source(5, 12) + SourceIndex(2) +4 >Emitted(9, 21) Source(5, 13) + SourceIndex(2) --- >>>} 1 >^ @@ -4067,7 +4014,7 @@ sourceFile:../../../second/second_part1.ts > > f(); >} -1 >Emitted(13, 2) Source(11, 2) + SourceIndex(2) +1 >Emitted(10, 2) Source(11, 2) + SourceIndex(2) --- >>>declare class normalC { 1-> @@ -4078,9 +4025,9 @@ sourceFile:../../../second/second_part1.ts > 2 >class 3 > normalC -1->Emitted(14, 1) Source(13, 1) + SourceIndex(2) -2 >Emitted(14, 15) Source(13, 7) + SourceIndex(2) -3 >Emitted(14, 22) Source(13, 14) + SourceIndex(2) +1->Emitted(11, 1) Source(13, 1) + SourceIndex(2) +2 >Emitted(11, 15) Source(13, 7) + SourceIndex(2) +3 >Emitted(11, 22) Source(13, 14) + SourceIndex(2) --- >>>} 1 >^ @@ -4092,7 +4039,7 @@ sourceFile:../../../second/second_part1.ts > /**@internal*/ get c() { return 10; } > /**@internal*/ set c(val: number) { } >} -1 >Emitted(15, 2) Source(19, 2) + SourceIndex(2) +1 >Emitted(12, 2) Source(19, 2) + SourceIndex(2) --- >>>declare namespace normalN { 1-> @@ -4104,10 +4051,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > normalN 4 > -1->Emitted(16, 1) Source(20, 1) + SourceIndex(2) -2 >Emitted(16, 19) Source(20, 11) + SourceIndex(2) -3 >Emitted(16, 26) Source(20, 18) + SourceIndex(2) -4 >Emitted(16, 27) Source(20, 19) + SourceIndex(2) +1->Emitted(13, 1) Source(20, 1) + SourceIndex(2) +2 >Emitted(13, 19) Source(20, 11) + SourceIndex(2) +3 >Emitted(13, 26) Source(20, 18) + SourceIndex(2) +4 >Emitted(13, 27) Source(20, 19) + SourceIndex(2) --- >>>} 1 >^ @@ -4122,7 +4069,7 @@ sourceFile:../../../second/second_part1.ts > /**@internal*/ export const internalConst = 10; > /**@internal*/ export enum internalEnum { a, b, c } >} -1 >Emitted(17, 2) Source(29, 2) + SourceIndex(2) +1 >Emitted(14, 2) Source(29, 2) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -4136,9 +4083,9 @@ sourceFile:../../../second/second_part2.ts 1-> 2 >class 3 > C -1->Emitted(18, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(18, 15) Source(1, 7) + SourceIndex(3) -3 >Emitted(18, 16) Source(1, 8) + SourceIndex(3) +1->Emitted(15, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(15, 15) Source(1, 7) + SourceIndex(3) +3 >Emitted(15, 16) Source(1, 8) + SourceIndex(3) --- >>> doSomething(): void; 1->^^^^ @@ -4146,8 +4093,8 @@ sourceFile:../../../second/second_part2.ts 1-> { > 2 > doSomething -1->Emitted(19, 5) Source(2, 5) + SourceIndex(3) -2 >Emitted(19, 16) Source(2, 16) + SourceIndex(3) +1->Emitted(16, 5) Source(2, 5) + SourceIndex(3) +2 >Emitted(16, 16) Source(2, 16) + SourceIndex(3) --- >>>} 1 >^ @@ -4156,7 +4103,7 @@ sourceFile:../../../second/second_part2.ts > console.log("something got done"); > } >} -1 >Emitted(20, 2) Source(5, 2) + SourceIndex(3) +1 >Emitted(17, 2) Source(5, 2) + SourceIndex(3) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -4177,12 +4124,12 @@ sourceFile:../../third_part1.ts 4 > c 5 > = new C() 6 > ; -1->Emitted(22, 1) Source(1, 1) + SourceIndex(4) -2 >Emitted(22, 9) Source(1, 1) + SourceIndex(4) -3 >Emitted(22, 13) Source(1, 5) + SourceIndex(4) -4 >Emitted(22, 14) Source(1, 6) + SourceIndex(4) -5 >Emitted(22, 17) Source(1, 16) + SourceIndex(4) -6 >Emitted(22, 18) Source(1, 17) + SourceIndex(4) +1->Emitted(19, 1) Source(1, 1) + SourceIndex(4) +2 >Emitted(19, 9) Source(1, 1) + SourceIndex(4) +3 >Emitted(19, 13) Source(1, 5) + SourceIndex(4) +4 >Emitted(19, 14) Source(1, 6) + SourceIndex(4) +5 >Emitted(19, 17) Source(1, 16) + SourceIndex(4) +6 >Emitted(19, 18) Source(1, 17) + SourceIndex(4) --- >>>//# sourceMappingURL=third-output.d.ts.map diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/buildInfo/stripInternal-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/buildInfo/stripInternal-when-one-two-three-are-prepended-in-order.js index 3e8bf568166..58ba91a801c 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/buildInfo/stripInternal-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/buildInfo/stripInternal-when-one-two-three-are-prepended-in-order.js @@ -3368,45 +3368,40 @@ namespace normalN { "sections": [ { "pos": 0, - "end": 404, + "end": 363, "kind": "prepend", "data": "/src/2/second-output.d.ts", "texts": [ { "pos": 0, - "end": 39, - "kind": "internal" - }, - { - "pos": 41, - "end": 157, + "end": 116, "kind": "text" }, { - "pos": 157, - "end": 199, + "pos": 116, + "end": 158, "kind": "sourceMapUrl" }, { - "pos": 201, - "end": 361, + "pos": 160, + "end": 320, "kind": "text" }, { - "pos": 361, - "end": 404, + "pos": 320, + "end": 363, "kind": "sourceMapUrl" } ] }, { - "pos": 406, - "end": 425, + "pos": 365, + "end": 384, "kind": "text" }, { - "pos": 425, - "end": 467, + "pos": 384, + "end": 426, "kind": "sourceMapUrl" } ] @@ -3551,14 +3546,9 @@ sourceMapUrl: (3283-3323) ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-404):: /src/2/second-output.d.ts texts:: 5 +prepend: (0-363):: /src/2/second-output.d.ts texts:: 4 >>-------------------------------------------------------------------- -internal: (0-39) -interface TheFirst { - none: any; -} ->>-------------------------------------------------------------------- -text: (41-157) +text: (0-116) declare const s = "Hello, world"; interface NoJsForHereEither { none: any; @@ -3566,10 +3556,10 @@ interface NoJsForHereEither { declare function f(): string; >>-------------------------------------------------------------------- -sourceMapUrl: (157-199) +sourceMapUrl: (116-158) //# sourceMappingURL=first-output.d.ts.map >>-------------------------------------------------------------------- -text: (201-361) +text: (160-320) declare namespace N { } declare namespace N { @@ -3583,21 +3573,18 @@ declare class C { } >>-------------------------------------------------------------------- -sourceMapUrl: (361-404) +sourceMapUrl: (320-363) //# sourceMappingURL=second-output.d.ts.map ---------------------------------------------------------------------- -text: (406-425) +text: (365-384) declare var c: C; ---------------------------------------------------------------------- -sourceMapUrl: (425-467) +sourceMapUrl: (384-426) //# sourceMappingURL=third-output.d.ts.map ====================================================================== //// [/src/third/thirdjs/output/third-output.d.ts] -interface TheFirst { - none: any; -} declare const s = "Hello, world"; interface NoJsForHereEither { none: any; @@ -3620,7 +3607,7 @@ declare var c: C; //# sourceMappingURL=third-output.d.ts.map //// [/src/third/thirdjs/output/third-output.d.ts.map] -{"version":3,"file":"third-output.d.ts","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;CAMZ;AACD,kBAAU,OAAO,CAAC;CASjB;AC5BD,cAAM,CAAC;IACH,WAAW;CAGd;;ACJD,QAAA,IAAI,CAAC,GAAU,CAAC"} +{"version":3,"file":"third-output.d.ts","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":"AAIA,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;CAMZ;AACD,kBAAU,OAAO,CAAC;CASjB;AC5BD,cAAM,CAAC;IACH,WAAW;CAGd;;ACJD,QAAA,IAAI,CAAC,GAAU,CAAC"} //// [/src/third/thirdjs/output/third-output.d.ts.map.baseline.txt] =================================================================== @@ -3633,50 +3620,16 @@ sources: ../../../first/first_PART1.ts,../../../first/first_part3.ts,../../../se emittedFile:/src/third/thirdjs/output/third-output.d.ts sourceFile:../../../first/first_PART1.ts ------------------------------------------------------------------- ->>>interface TheFirst { -1 > -2 >^^^^^^^^^^ -3 > ^^^^^^^^ -1 >/*@internal*/ -2 >interface -3 > TheFirst -1 >Emitted(1, 1) Source(1, 15) + SourceIndex(0) -2 >Emitted(1, 11) Source(1, 25) + SourceIndex(0) -3 >Emitted(1, 19) Source(1, 33) + SourceIndex(0) ---- ->>> none: any; -1 >^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^ -5 > ^ -1 > { - > -2 > none -3 > : -4 > any -5 > ; -1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0) -2 >Emitted(2, 9) Source(2, 9) + SourceIndex(0) -3 >Emitted(2, 11) Source(2, 11) + SourceIndex(0) -4 >Emitted(2, 14) Source(2, 14) + SourceIndex(0) -5 >Emitted(2, 15) Source(2, 15) + SourceIndex(0) ---- ->>>} -1 >^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - >} -1 >Emitted(3, 2) Source(3, 2) + SourceIndex(0) ---- >>>declare const s = "Hello, world"; -1-> +1 > 2 >^^^^^^^^ 3 > ^^^^^^ 4 > ^ 5 > ^^^^^^^^^^^^^^^^^ 6 > ^ -1-> +1 >/*@internal*/ interface TheFirst { + > none: any; + >} > > 2 > @@ -3684,12 +3637,12 @@ sourceFile:../../../first/first_PART1.ts 4 > s 5 > = "Hello, world" 6 > ; -1->Emitted(4, 1) Source(5, 1) + SourceIndex(0) -2 >Emitted(4, 9) Source(5, 1) + SourceIndex(0) -3 >Emitted(4, 15) Source(5, 7) + SourceIndex(0) -4 >Emitted(4, 16) Source(5, 8) + SourceIndex(0) -5 >Emitted(4, 33) Source(5, 25) + SourceIndex(0) -6 >Emitted(4, 34) Source(5, 26) + SourceIndex(0) +1 >Emitted(1, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(1, 9) Source(5, 1) + SourceIndex(0) +3 >Emitted(1, 15) Source(5, 7) + SourceIndex(0) +4 >Emitted(1, 16) Source(5, 8) + SourceIndex(0) +5 >Emitted(1, 33) Source(5, 25) + SourceIndex(0) +6 >Emitted(1, 34) Source(5, 26) + SourceIndex(0) --- >>>interface NoJsForHereEither { 1 > @@ -3700,9 +3653,9 @@ sourceFile:../../../first/first_PART1.ts > 2 >interface 3 > NoJsForHereEither -1 >Emitted(5, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(5, 11) Source(7, 11) + SourceIndex(0) -3 >Emitted(5, 28) Source(7, 28) + SourceIndex(0) +1 >Emitted(2, 1) Source(7, 1) + SourceIndex(0) +2 >Emitted(2, 11) Source(7, 11) + SourceIndex(0) +3 >Emitted(2, 28) Source(7, 28) + SourceIndex(0) --- >>> none: any; 1 >^^^^ @@ -3716,18 +3669,18 @@ sourceFile:../../../first/first_PART1.ts 3 > : 4 > any 5 > ; -1 >Emitted(6, 5) Source(8, 5) + SourceIndex(0) -2 >Emitted(6, 9) Source(8, 9) + SourceIndex(0) -3 >Emitted(6, 11) Source(8, 11) + SourceIndex(0) -4 >Emitted(6, 14) Source(8, 14) + SourceIndex(0) -5 >Emitted(6, 15) Source(8, 15) + SourceIndex(0) +1 >Emitted(3, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(3, 9) Source(8, 9) + SourceIndex(0) +3 >Emitted(3, 11) Source(8, 11) + SourceIndex(0) +4 >Emitted(3, 14) Source(8, 14) + SourceIndex(0) +5 >Emitted(3, 15) Source(8, 15) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(7, 2) Source(9, 2) + SourceIndex(0) +1 >Emitted(4, 2) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3745,10 +3698,10 @@ sourceFile:../../../first/first_part3.ts 4 > () { > return "JS does hoists"; > } -1->Emitted(8, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(8, 18) Source(1, 10) + SourceIndex(1) -3 >Emitted(8, 19) Source(1, 11) + SourceIndex(1) -4 >Emitted(8, 30) Source(3, 2) + SourceIndex(1) +1->Emitted(5, 1) Source(1, 1) + SourceIndex(1) +2 >Emitted(5, 18) Source(1, 10) + SourceIndex(1) +3 >Emitted(5, 19) Source(1, 11) + SourceIndex(1) +4 >Emitted(5, 30) Source(3, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3764,10 +3717,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > N 4 > -1->Emitted(10, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(10, 19) Source(1, 11) + SourceIndex(2) -3 >Emitted(10, 20) Source(1, 12) + SourceIndex(2) -4 >Emitted(10, 21) Source(1, 13) + SourceIndex(2) +1->Emitted(7, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(7, 19) Source(1, 11) + SourceIndex(2) +3 >Emitted(7, 20) Source(1, 12) + SourceIndex(2) +4 >Emitted(7, 21) Source(1, 13) + SourceIndex(2) --- >>>} 1 >^ @@ -3775,7 +3728,7 @@ sourceFile:../../../second/second_part1.ts 1 >{ > // Comment text >} -1 >Emitted(11, 2) Source(3, 2) + SourceIndex(2) +1 >Emitted(8, 2) Source(3, 2) + SourceIndex(2) --- >>>declare namespace N { 1-> @@ -3788,10 +3741,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > N 4 > -1->Emitted(12, 1) Source(5, 1) + SourceIndex(2) -2 >Emitted(12, 19) Source(5, 11) + SourceIndex(2) -3 >Emitted(12, 20) Source(5, 12) + SourceIndex(2) -4 >Emitted(12, 21) Source(5, 13) + SourceIndex(2) +1->Emitted(9, 1) Source(5, 1) + SourceIndex(2) +2 >Emitted(9, 19) Source(5, 11) + SourceIndex(2) +3 >Emitted(9, 20) Source(5, 12) + SourceIndex(2) +4 >Emitted(9, 21) Source(5, 13) + SourceIndex(2) --- >>>} 1 >^ @@ -3803,7 +3756,7 @@ sourceFile:../../../second/second_part1.ts > > f(); >} -1 >Emitted(13, 2) Source(11, 2) + SourceIndex(2) +1 >Emitted(10, 2) Source(11, 2) + SourceIndex(2) --- >>>declare class normalC { 1-> @@ -3814,9 +3767,9 @@ sourceFile:../../../second/second_part1.ts > 2 >class 3 > normalC -1->Emitted(14, 1) Source(13, 1) + SourceIndex(2) -2 >Emitted(14, 15) Source(13, 7) + SourceIndex(2) -3 >Emitted(14, 22) Source(13, 14) + SourceIndex(2) +1->Emitted(11, 1) Source(13, 1) + SourceIndex(2) +2 >Emitted(11, 15) Source(13, 7) + SourceIndex(2) +3 >Emitted(11, 22) Source(13, 14) + SourceIndex(2) --- >>>} 1 >^ @@ -3828,7 +3781,7 @@ sourceFile:../../../second/second_part1.ts > /*@internal*/ get c() { return 10; } > /*@internal*/ set c(val: number) { } >} -1 >Emitted(15, 2) Source(19, 2) + SourceIndex(2) +1 >Emitted(12, 2) Source(19, 2) + SourceIndex(2) --- >>>declare namespace normalN { 1-> @@ -3840,10 +3793,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > normalN 4 > -1->Emitted(16, 1) Source(20, 1) + SourceIndex(2) -2 >Emitted(16, 19) Source(20, 11) + SourceIndex(2) -3 >Emitted(16, 26) Source(20, 18) + SourceIndex(2) -4 >Emitted(16, 27) Source(20, 19) + SourceIndex(2) +1->Emitted(13, 1) Source(20, 1) + SourceIndex(2) +2 >Emitted(13, 19) Source(20, 11) + SourceIndex(2) +3 >Emitted(13, 26) Source(20, 18) + SourceIndex(2) +4 >Emitted(13, 27) Source(20, 19) + SourceIndex(2) --- >>>} 1 >^ @@ -3858,7 +3811,7 @@ sourceFile:../../../second/second_part1.ts > /*@internal*/ export const internalConst = 10; > /*@internal*/ export enum internalEnum { a, b, c } >} -1 >Emitted(17, 2) Source(29, 2) + SourceIndex(2) +1 >Emitted(14, 2) Source(29, 2) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3872,9 +3825,9 @@ sourceFile:../../../second/second_part2.ts 1-> 2 >class 3 > C -1->Emitted(18, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(18, 15) Source(1, 7) + SourceIndex(3) -3 >Emitted(18, 16) Source(1, 8) + SourceIndex(3) +1->Emitted(15, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(15, 15) Source(1, 7) + SourceIndex(3) +3 >Emitted(15, 16) Source(1, 8) + SourceIndex(3) --- >>> doSomething(): void; 1->^^^^ @@ -3882,8 +3835,8 @@ sourceFile:../../../second/second_part2.ts 1-> { > 2 > doSomething -1->Emitted(19, 5) Source(2, 5) + SourceIndex(3) -2 >Emitted(19, 16) Source(2, 16) + SourceIndex(3) +1->Emitted(16, 5) Source(2, 5) + SourceIndex(3) +2 >Emitted(16, 16) Source(2, 16) + SourceIndex(3) --- >>>} 1 >^ @@ -3892,7 +3845,7 @@ sourceFile:../../../second/second_part2.ts > console.log("something got done"); > } >} -1 >Emitted(20, 2) Source(5, 2) + SourceIndex(3) +1 >Emitted(17, 2) Source(5, 2) + SourceIndex(3) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3913,12 +3866,12 @@ sourceFile:../../third_part1.ts 4 > c 5 > = new C() 6 > ; -1->Emitted(22, 1) Source(1, 1) + SourceIndex(4) -2 >Emitted(22, 9) Source(1, 1) + SourceIndex(4) -3 >Emitted(22, 13) Source(1, 5) + SourceIndex(4) -4 >Emitted(22, 14) Source(1, 6) + SourceIndex(4) -5 >Emitted(22, 17) Source(1, 16) + SourceIndex(4) -6 >Emitted(22, 18) Source(1, 17) + SourceIndex(4) +1->Emitted(19, 1) Source(1, 1) + SourceIndex(4) +2 >Emitted(19, 9) Source(1, 1) + SourceIndex(4) +3 >Emitted(19, 13) Source(1, 5) + SourceIndex(4) +4 >Emitted(19, 14) Source(1, 6) + SourceIndex(4) +5 >Emitted(19, 17) Source(1, 16) + SourceIndex(4) +6 >Emitted(19, 18) Source(1, 17) + SourceIndex(4) --- >>>//# sourceMappingURL=third-output.d.ts.map diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/buildInfo/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/buildInfo/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index 679951f0d81..57de8bd8ab0 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/buildInfo/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/buildInfo/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -3490,45 +3490,40 @@ namespace normalN { "sections": [ { "pos": 0, - "end": 404, + "end": 363, "kind": "prepend", "data": "/src/2/second-output.d.ts", "texts": [ { "pos": 0, - "end": 39, - "kind": "internal" - }, - { - "pos": 41, - "end": 157, + "end": 116, "kind": "text" }, { - "pos": 157, - "end": 199, + "pos": 116, + "end": 158, "kind": "sourceMapUrl" }, { - "pos": 201, - "end": 361, + "pos": 160, + "end": 320, "kind": "text" }, { - "pos": 361, - "end": 404, + "pos": 320, + "end": 363, "kind": "sourceMapUrl" } ] }, { - "pos": 406, - "end": 425, + "pos": 365, + "end": 384, "kind": "text" }, { - "pos": 425, - "end": 467, + "pos": 384, + "end": 426, "kind": "sourceMapUrl" } ] @@ -3673,14 +3668,9 @@ sourceMapUrl: (3647-3687) ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-404):: /src/2/second-output.d.ts texts:: 5 +prepend: (0-363):: /src/2/second-output.d.ts texts:: 4 >>-------------------------------------------------------------------- -internal: (0-39) -interface TheFirst { - none: any; -} ->>-------------------------------------------------------------------- -text: (41-157) +text: (0-116) declare const s = "Hello, world"; interface NoJsForHereEither { none: any; @@ -3688,10 +3678,10 @@ interface NoJsForHereEither { declare function f(): string; >>-------------------------------------------------------------------- -sourceMapUrl: (157-199) +sourceMapUrl: (116-158) //# sourceMappingURL=first-output.d.ts.map >>-------------------------------------------------------------------- -text: (201-361) +text: (160-320) declare namespace N { } declare namespace N { @@ -3705,21 +3695,18 @@ declare class C { } >>-------------------------------------------------------------------- -sourceMapUrl: (361-404) +sourceMapUrl: (320-363) //# sourceMappingURL=second-output.d.ts.map ---------------------------------------------------------------------- -text: (406-425) +text: (365-384) declare var c: C; ---------------------------------------------------------------------- -sourceMapUrl: (425-467) +sourceMapUrl: (384-426) //# sourceMappingURL=third-output.d.ts.map ====================================================================== //// [/src/third/thirdjs/output/third-output.d.ts] -interface TheFirst { - none: any; -} declare const s = "Hello, world"; interface NoJsForHereEither { none: any; @@ -3742,7 +3729,7 @@ declare var c: C; //# sourceMappingURL=third-output.d.ts.map //// [/src/third/thirdjs/output/third-output.d.ts.map] -{"version":3,"file":"third-output.d.ts","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":"AAAc,UAAU,QAAQ;IAC5B,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;CAMZ;AACD,kBAAU,OAAO,CAAC;CASjB;AC5BD,cAAM,CAAC;IACH,WAAW;CAGd;;ACJD,QAAA,IAAI,CAAC,GAAU,CAAC"} +{"version":3,"file":"third-output.d.ts","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts"],"names":[],"mappings":"AAIA,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACRD,iBAAS,CAAC,WAET;;ACFD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;AAED,cAAM,OAAO;CAMZ;AACD,kBAAU,OAAO,CAAC;CASjB;AC5BD,cAAM,CAAC;IACH,WAAW;CAGd;;ACJD,QAAA,IAAI,CAAC,GAAU,CAAC"} //// [/src/third/thirdjs/output/third-output.d.ts.map.baseline.txt] =================================================================== @@ -3755,50 +3742,16 @@ sources: ../../../first/first_PART1.ts,../../../first/first_part3.ts,../../../se emittedFile:/src/third/thirdjs/output/third-output.d.ts sourceFile:../../../first/first_PART1.ts ------------------------------------------------------------------- ->>>interface TheFirst { -1 > -2 >^^^^^^^^^^ -3 > ^^^^^^^^ -1 >/*@internal*/ -2 >interface -3 > TheFirst -1 >Emitted(1, 1) Source(1, 15) + SourceIndex(0) -2 >Emitted(1, 11) Source(1, 25) + SourceIndex(0) -3 >Emitted(1, 19) Source(1, 33) + SourceIndex(0) ---- ->>> none: any; -1 >^^^^ -2 > ^^^^ -3 > ^^ -4 > ^^^ -5 > ^ -1 > { - > -2 > none -3 > : -4 > any -5 > ; -1 >Emitted(2, 5) Source(2, 5) + SourceIndex(0) -2 >Emitted(2, 9) Source(2, 9) + SourceIndex(0) -3 >Emitted(2, 11) Source(2, 11) + SourceIndex(0) -4 >Emitted(2, 14) Source(2, 14) + SourceIndex(0) -5 >Emitted(2, 15) Source(2, 15) + SourceIndex(0) ---- ->>>} -1 >^ -2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> -1 > - >} -1 >Emitted(3, 2) Source(3, 2) + SourceIndex(0) ---- >>>declare const s = "Hello, world"; -1-> +1 > 2 >^^^^^^^^ 3 > ^^^^^^ 4 > ^ 5 > ^^^^^^^^^^^^^^^^^ 6 > ^ -1-> +1 >/*@internal*/ interface TheFirst { + > none: any; + >} > > 2 > @@ -3806,12 +3759,12 @@ sourceFile:../../../first/first_PART1.ts 4 > s 5 > = "Hello, world" 6 > ; -1->Emitted(4, 1) Source(5, 1) + SourceIndex(0) -2 >Emitted(4, 9) Source(5, 1) + SourceIndex(0) -3 >Emitted(4, 15) Source(5, 7) + SourceIndex(0) -4 >Emitted(4, 16) Source(5, 8) + SourceIndex(0) -5 >Emitted(4, 33) Source(5, 25) + SourceIndex(0) -6 >Emitted(4, 34) Source(5, 26) + SourceIndex(0) +1 >Emitted(1, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(1, 9) Source(5, 1) + SourceIndex(0) +3 >Emitted(1, 15) Source(5, 7) + SourceIndex(0) +4 >Emitted(1, 16) Source(5, 8) + SourceIndex(0) +5 >Emitted(1, 33) Source(5, 25) + SourceIndex(0) +6 >Emitted(1, 34) Source(5, 26) + SourceIndex(0) --- >>>interface NoJsForHereEither { 1 > @@ -3822,9 +3775,9 @@ sourceFile:../../../first/first_PART1.ts > 2 >interface 3 > NoJsForHereEither -1 >Emitted(5, 1) Source(7, 1) + SourceIndex(0) -2 >Emitted(5, 11) Source(7, 11) + SourceIndex(0) -3 >Emitted(5, 28) Source(7, 28) + SourceIndex(0) +1 >Emitted(2, 1) Source(7, 1) + SourceIndex(0) +2 >Emitted(2, 11) Source(7, 11) + SourceIndex(0) +3 >Emitted(2, 28) Source(7, 28) + SourceIndex(0) --- >>> none: any; 1 >^^^^ @@ -3838,18 +3791,18 @@ sourceFile:../../../first/first_PART1.ts 3 > : 4 > any 5 > ; -1 >Emitted(6, 5) Source(8, 5) + SourceIndex(0) -2 >Emitted(6, 9) Source(8, 9) + SourceIndex(0) -3 >Emitted(6, 11) Source(8, 11) + SourceIndex(0) -4 >Emitted(6, 14) Source(8, 14) + SourceIndex(0) -5 >Emitted(6, 15) Source(8, 15) + SourceIndex(0) +1 >Emitted(3, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(3, 9) Source(8, 9) + SourceIndex(0) +3 >Emitted(3, 11) Source(8, 11) + SourceIndex(0) +4 >Emitted(3, 14) Source(8, 14) + SourceIndex(0) +5 >Emitted(3, 15) Source(8, 15) + SourceIndex(0) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(7, 2) Source(9, 2) + SourceIndex(0) +1 >Emitted(4, 2) Source(9, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3867,10 +3820,10 @@ sourceFile:../../../first/first_part3.ts 4 > () { > return "JS does hoists"; > } -1->Emitted(8, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(8, 18) Source(1, 10) + SourceIndex(1) -3 >Emitted(8, 19) Source(1, 11) + SourceIndex(1) -4 >Emitted(8, 30) Source(3, 2) + SourceIndex(1) +1->Emitted(5, 1) Source(1, 1) + SourceIndex(1) +2 >Emitted(5, 18) Source(1, 10) + SourceIndex(1) +3 >Emitted(5, 19) Source(1, 11) + SourceIndex(1) +4 >Emitted(5, 30) Source(3, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3886,10 +3839,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > N 4 > -1->Emitted(10, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(10, 19) Source(1, 11) + SourceIndex(2) -3 >Emitted(10, 20) Source(1, 12) + SourceIndex(2) -4 >Emitted(10, 21) Source(1, 13) + SourceIndex(2) +1->Emitted(7, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(7, 19) Source(1, 11) + SourceIndex(2) +3 >Emitted(7, 20) Source(1, 12) + SourceIndex(2) +4 >Emitted(7, 21) Source(1, 13) + SourceIndex(2) --- >>>} 1 >^ @@ -3897,7 +3850,7 @@ sourceFile:../../../second/second_part1.ts 1 >{ > // Comment text >} -1 >Emitted(11, 2) Source(3, 2) + SourceIndex(2) +1 >Emitted(8, 2) Source(3, 2) + SourceIndex(2) --- >>>declare namespace N { 1-> @@ -3910,10 +3863,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > N 4 > -1->Emitted(12, 1) Source(5, 1) + SourceIndex(2) -2 >Emitted(12, 19) Source(5, 11) + SourceIndex(2) -3 >Emitted(12, 20) Source(5, 12) + SourceIndex(2) -4 >Emitted(12, 21) Source(5, 13) + SourceIndex(2) +1->Emitted(9, 1) Source(5, 1) + SourceIndex(2) +2 >Emitted(9, 19) Source(5, 11) + SourceIndex(2) +3 >Emitted(9, 20) Source(5, 12) + SourceIndex(2) +4 >Emitted(9, 21) Source(5, 13) + SourceIndex(2) --- >>>} 1 >^ @@ -3925,7 +3878,7 @@ sourceFile:../../../second/second_part1.ts > > f(); >} -1 >Emitted(13, 2) Source(11, 2) + SourceIndex(2) +1 >Emitted(10, 2) Source(11, 2) + SourceIndex(2) --- >>>declare class normalC { 1-> @@ -3936,9 +3889,9 @@ sourceFile:../../../second/second_part1.ts > 2 >class 3 > normalC -1->Emitted(14, 1) Source(13, 1) + SourceIndex(2) -2 >Emitted(14, 15) Source(13, 7) + SourceIndex(2) -3 >Emitted(14, 22) Source(13, 14) + SourceIndex(2) +1->Emitted(11, 1) Source(13, 1) + SourceIndex(2) +2 >Emitted(11, 15) Source(13, 7) + SourceIndex(2) +3 >Emitted(11, 22) Source(13, 14) + SourceIndex(2) --- >>>} 1 >^ @@ -3950,7 +3903,7 @@ sourceFile:../../../second/second_part1.ts > /*@internal*/ get c() { return 10; } > /*@internal*/ set c(val: number) { } >} -1 >Emitted(15, 2) Source(19, 2) + SourceIndex(2) +1 >Emitted(12, 2) Source(19, 2) + SourceIndex(2) --- >>>declare namespace normalN { 1-> @@ -3962,10 +3915,10 @@ sourceFile:../../../second/second_part1.ts 2 >namespace 3 > normalN 4 > -1->Emitted(16, 1) Source(20, 1) + SourceIndex(2) -2 >Emitted(16, 19) Source(20, 11) + SourceIndex(2) -3 >Emitted(16, 26) Source(20, 18) + SourceIndex(2) -4 >Emitted(16, 27) Source(20, 19) + SourceIndex(2) +1->Emitted(13, 1) Source(20, 1) + SourceIndex(2) +2 >Emitted(13, 19) Source(20, 11) + SourceIndex(2) +3 >Emitted(13, 26) Source(20, 18) + SourceIndex(2) +4 >Emitted(13, 27) Source(20, 19) + SourceIndex(2) --- >>>} 1 >^ @@ -3980,7 +3933,7 @@ sourceFile:../../../second/second_part1.ts > /*@internal*/ export const internalConst = 10; > /*@internal*/ export enum internalEnum { a, b, c } >} -1 >Emitted(17, 2) Source(29, 2) + SourceIndex(2) +1 >Emitted(14, 2) Source(29, 2) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -3994,9 +3947,9 @@ sourceFile:../../../second/second_part2.ts 1-> 2 >class 3 > C -1->Emitted(18, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(18, 15) Source(1, 7) + SourceIndex(3) -3 >Emitted(18, 16) Source(1, 8) + SourceIndex(3) +1->Emitted(15, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(15, 15) Source(1, 7) + SourceIndex(3) +3 >Emitted(15, 16) Source(1, 8) + SourceIndex(3) --- >>> doSomething(): void; 1->^^^^ @@ -4004,8 +3957,8 @@ sourceFile:../../../second/second_part2.ts 1-> { > 2 > doSomething -1->Emitted(19, 5) Source(2, 5) + SourceIndex(3) -2 >Emitted(19, 16) Source(2, 16) + SourceIndex(3) +1->Emitted(16, 5) Source(2, 5) + SourceIndex(3) +2 >Emitted(16, 16) Source(2, 16) + SourceIndex(3) --- >>>} 1 >^ @@ -4014,7 +3967,7 @@ sourceFile:../../../second/second_part2.ts > console.log("something got done"); > } >} -1 >Emitted(20, 2) Source(5, 2) + SourceIndex(3) +1 >Emitted(17, 2) Source(5, 2) + SourceIndex(3) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -4035,12 +3988,12 @@ sourceFile:../../third_part1.ts 4 > c 5 > = new C() 6 > ; -1->Emitted(22, 1) Source(1, 1) + SourceIndex(4) -2 >Emitted(22, 9) Source(1, 1) + SourceIndex(4) -3 >Emitted(22, 13) Source(1, 5) + SourceIndex(4) -4 >Emitted(22, 14) Source(1, 6) + SourceIndex(4) -5 >Emitted(22, 17) Source(1, 16) + SourceIndex(4) -6 >Emitted(22, 18) Source(1, 17) + SourceIndex(4) +1->Emitted(19, 1) Source(1, 1) + SourceIndex(4) +2 >Emitted(19, 9) Source(1, 1) + SourceIndex(4) +3 >Emitted(19, 13) Source(1, 5) + SourceIndex(4) +4 >Emitted(19, 14) Source(1, 6) + SourceIndex(4) +5 >Emitted(19, 17) Source(1, 16) + SourceIndex(4) +6 >Emitted(19, 18) Source(1, 17) + SourceIndex(4) --- >>>//# sourceMappingURL=third-output.d.ts.map