From c739defe25f2dca1412f65667e1fa572ccb97ca7 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 17 Jan 2019 12:11:51 -0800 Subject: [PATCH] Handle prologues in prepend outputs --- src/compiler/emitter.ts | 49 ++- src/compiler/factory.ts | 17 +- src/compiler/sourcemap.ts | 17 +- src/compiler/types.ts | 11 +- src/compiler/utilities.ts | 4 + .../reference/api/tsserverlibrary.d.ts | 84 +++-- tests/baselines/reference/api/typescript.d.ts | 84 +++-- ...File-multiple-prologues-in-all-projects.js | 327 ++++++++---------- ...ultiple-prologues-in-different-projects.js | 283 ++++++++------- .../outFile-strict-in-all-projects.js | 208 ++++++----- .../outFile-strict-in-one-dependency.js | 162 ++++----- 11 files changed, 654 insertions(+), 592 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 25bfa40153d..2885f3274d2 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -727,6 +727,9 @@ namespace ts { case SyntaxKind.UnparsedSource: return emitUnparsedSource(node); + case SyntaxKind.UnparsedPrologue: + return emitUnparsedPrologue(node); + // Identifiers case SyntaxKind.Identifier: return emitIdentifier(node); @@ -1211,6 +1214,11 @@ namespace ts { writer.rawWrite(unparsed.text.substr(unparsed.pos)); } + // SyntaxKind.UnparsedPrologue + function emitUnparsedPrologue(unparsed: UnparsedPrologue) { + writer.rawWrite(unparsed.parent.text.substring(unparsed.pos, unparsed.end)); + } + // // Identifiers // @@ -3005,6 +3013,17 @@ namespace ts { return statements.length; } + function emitUnparsedPrologues(prologues: ReadonlyArray, seenPrologueDirectives: Map) { + for (const prologue of prologues) { + if (!seenPrologueDirectives.has(prologue.text)) { + emit(prologue); + if (seenPrologueDirectives) { + seenPrologueDirectives.set(prologue.text, true); + } + } + } + } + function emitPrologueDirectivesIfNeeded(sourceFileOrBundle: Bundle | SourceFile) { if (isSourceFile(sourceFileOrBundle)) { setSourceFile(sourceFileOrBundle); @@ -3012,6 +3031,9 @@ namespace ts { } else { const seenPrologueDirectives = createMap(); + for (const prepend of sourceFileOrBundle.prepends) { + emitUnparsedPrologues((prepend as UnparsedSource).prologues, seenPrologueDirectives); + } for (const sourceFile of sourceFileOrBundle.sourceFiles) { setSourceFile(sourceFile); emitPrologueDirectives(sourceFile.statements, /*startWithNewLine*/ true, seenPrologueDirectives); @@ -4343,17 +4365,38 @@ namespace ts { // Source Maps + function getParsedSourceMap(node: UnparsedSource) { + if (node.parsedSourceMap === undefined && node.sourceMapText !== undefined) { + node.parsedSourceMap = tryParseRawSourceMap(node.sourceMapText) || false; + } + return node.parsedSourceMap || undefined; + } + function pipelineEmitWithSourceMap(hint: EmitHint, node: Node) { const pipelinePhase = getNextPipelinePhase(PipelinePhase.SourceMaps, node); - if (isUnparsedSource(node) && node.sourceMapText !== undefined) { - const parsed = tryParseRawSourceMap(node.sourceMapText); + if (isUnparsedSource(node)) { + const parsed = getParsedSourceMap(node); if (parsed) { sourceMapGenerator!.appendSourceMap( writer.getLine(), writer.getColumn(), parsed, node.sourceMapPath!, - node.pos && node.getLineAndCharacterOfPosition(node.pos).line); + node.pos ? node.getLineAndCharacterOfPosition(node.pos) : undefined); + } + pipelinePhase(hint, node); + } + else if (isUnparsedPrologue(node)) { + const parsed = getParsedSourceMap(node.parent); + if (parsed) { + sourceMapGenerator!.appendSourceMap( + writer.getLine(), + writer.getColumn(), + parsed, + node.parent.sourceMapPath!, + node.parent.getLineAndCharacterOfPosition(node.pos), + node.parent.getLineAndCharacterOfPosition(node.end) + ); } pipelinePhase(hint, node); } diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts index 960cb2e7281..3528b96afdf 100644 --- a/src/compiler/factory.ts +++ b/src/compiler/factory.ts @@ -2649,7 +2649,22 @@ namespace ts { node.sourceMapText = map; } const text = node.text; - node.pos = isShebangTrivia(text, 0) ? skipTrivia(text, 0, /*stopAfterLineBreak*/ true) : 0; + let pos = isShebangTrivia(text, 0) ? skipTrivia(text, 0, /*stopAfterLineBreak*/ true) : 0; + const scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true, /*languageVariant*/ undefined, text, /*onError*/ undefined, pos); + let prologues: UnparsedPrologue[] | undefined; + while (scanner.scan() === SyntaxKind.StringLiteral) { + const start = pos; + const prologueText = scanner.getTokenValue(); + scanner.tryScan(() => scanner.scan() === SyntaxKind.SemicolonToken); + pos = skipTrivia(text, scanner.getTextPos(), /*stopAfterLineBreak*/ true); + + const prologue = createNode(SyntaxKind.UnparsedPrologue, start, pos); + prologue.parent = node; + prologue.text = prologueText; + (prologues || (prologues = [])).push(prologue); + } + node.pos = pos; + node.prologues = prologues || emptyArray; node.getLineAndCharacterOfPosition = pos => getLineAndCharacterOfPosition(node, pos); return node; } diff --git a/src/compiler/sourcemap.ts b/src/compiler/sourcemap.ts index 2799847852d..b33536bab2a 100644 --- a/src/compiler/sourcemap.ts +++ b/src/compiler/sourcemap.ts @@ -140,7 +140,7 @@ namespace ts { exit(); } - function appendSourceMap(generatedLine: number, generatedCharacter: number, map: RawSourceMap, sourceMapPath: string, startLine: number) { + function appendSourceMap(generatedLine: number, generatedCharacter: number, map: RawSourceMap, sourceMapPath: string, start?: LineAndCharacter, end?: LineAndCharacter) { Debug.assert(generatedLine >= pendingGeneratedLine, "generatedLine cannot backtrack"); Debug.assert(generatedCharacter >= 0, "generatedCharacter cannot be negative"); enter(); @@ -149,7 +149,15 @@ namespace ts { let nameIndexToNewNameIndexMap: number[] | undefined; const mappingIterator = decodeMappings(map.mappings); for (let { value: raw, done } = mappingIterator.next(); !done; { value: raw, done } = mappingIterator.next()) { - if (raw.generatedLine < startLine) { + if (end && ( + raw.generatedLine > end.line || + (raw.generatedLine === end.line && raw.generatedCharacter > end.character))) { + break; + } + + if (start && ( + raw.generatedLine < start.line || + (start.line === raw.generatedLine && raw.generatedCharacter < start.character))) { continue; } // Then reencode all the updated mappings into the overall map @@ -181,9 +189,10 @@ namespace ts { } } - const rawGeneratedLine = raw.generatedLine - startLine; + const rawGeneratedLine = raw.generatedLine - (start ? start.line : 0); const newGeneratedLine = rawGeneratedLine + generatedLine; - const newGeneratedCharacter = rawGeneratedLine === 0 ? raw.generatedCharacter + generatedCharacter : raw.generatedCharacter; + const rawGeneratedCharacter = start && start.line === raw.generatedLine ? raw.generatedCharacter - start.character : raw.generatedCharacter; + const newGeneratedCharacter = rawGeneratedLine === 0 ? rawGeneratedCharacter + generatedCharacter : rawGeneratedCharacter; addMapping(newGeneratedLine, newGeneratedCharacter, newSourceIndex, newSourceLine, newSourceCharacter, newNameIndex); } exit(); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index bd4c2c86748..f8a51ecf12f 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -428,6 +428,7 @@ namespace ts { // Enum EnumMember, + UnparsedPrologue, // Top-level nodes SourceFile, Bundle, @@ -2775,13 +2776,21 @@ namespace ts { kind: SyntaxKind.UnparsedSource; fileName?: string; text: string; + prologues: ReadonlyArray; sourceMapPath?: string; sourceMapText?: string; + /*@internal*/ parsedSourceMap?: RawSourceMap | false | undefined; // Adding this to satisfy services, fix later /*@internal*/ getLineAndCharacterOfPosition(pos: number): LineAndCharacter; } + export interface UnparsedPrologue extends Node { + kind: SyntaxKind.UnparsedSource; + text: string; + parent: UnparsedSource; + } + export interface JsonSourceFile extends SourceFile { statements: NodeArray; } @@ -5531,7 +5540,7 @@ namespace ts { /** * Appends a source map. */ - appendSourceMap(generatedLine: number, generatedCharacter: number, sourceMap: RawSourceMap, sourceMapPath: string, startLine: number): void; + appendSourceMap(generatedLine: number, generatedCharacter: number, sourceMap: RawSourceMap, sourceMapPath: string, start?: LineAndCharacter, end?: LineAndCharacter): void; /** * Gets the source map as a `RawSourceMap` object. */ diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 33a902b8035..75aa53e7115 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -5979,6 +5979,10 @@ namespace ts { return node.kind === SyntaxKind.UnparsedSource; } + export function isUnparsedPrologue(node: Node): node is UnparsedPrologue { + return node.kind === SyntaxKind.UnparsedPrologue; + } + // JSDoc export function isJSDocTypeExpression(node: Node): node is JSDocTypeExpression { diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index a384375b248..a244dc1c327 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -355,40 +355,41 @@ declare namespace ts { ShorthandPropertyAssignment = 276, SpreadAssignment = 277, EnumMember = 278, - SourceFile = 279, - Bundle = 280, - UnparsedSource = 281, - InputFiles = 282, - JSDocTypeExpression = 283, - JSDocAllType = 284, - JSDocUnknownType = 285, - JSDocNullableType = 286, - JSDocNonNullableType = 287, - JSDocOptionalType = 288, - JSDocFunctionType = 289, - JSDocVariadicType = 290, - JSDocComment = 291, - JSDocTypeLiteral = 292, - JSDocSignature = 293, - JSDocTag = 294, - JSDocAugmentsTag = 295, - JSDocClassTag = 296, - JSDocCallbackTag = 297, - JSDocEnumTag = 298, - JSDocParameterTag = 299, - JSDocReturnTag = 300, - JSDocThisTag = 301, - JSDocTypeTag = 302, - JSDocTemplateTag = 303, - JSDocTypedefTag = 304, - JSDocPropertyTag = 305, - SyntaxList = 306, - NotEmittedStatement = 307, - PartiallyEmittedExpression = 308, - CommaListExpression = 309, - MergeDeclarationMarker = 310, - EndOfDeclarationMarker = 311, - Count = 312, + UnparsedPrologue = 279, + SourceFile = 280, + Bundle = 281, + UnparsedSource = 282, + InputFiles = 283, + JSDocTypeExpression = 284, + JSDocAllType = 285, + JSDocUnknownType = 286, + JSDocNullableType = 287, + JSDocNonNullableType = 288, + JSDocOptionalType = 289, + JSDocFunctionType = 290, + JSDocVariadicType = 291, + JSDocComment = 292, + JSDocTypeLiteral = 293, + JSDocSignature = 294, + JSDocTag = 295, + JSDocAugmentsTag = 296, + JSDocClassTag = 297, + JSDocCallbackTag = 298, + JSDocEnumTag = 299, + JSDocParameterTag = 300, + JSDocReturnTag = 301, + JSDocThisTag = 302, + JSDocTypeTag = 303, + JSDocTemplateTag = 304, + JSDocTypedefTag = 305, + JSDocPropertyTag = 306, + SyntaxList = 307, + NotEmittedStatement = 308, + PartiallyEmittedExpression = 309, + CommaListExpression = 310, + MergeDeclarationMarker = 311, + EndOfDeclarationMarker = 312, + Count = 313, FirstAssignment = 59, LastAssignment = 71, FirstCompoundAssignment = 60, @@ -414,10 +415,10 @@ declare namespace ts { FirstBinaryOperator = 28, LastBinaryOperator = 71, FirstNode = 148, - FirstJSDocNode = 283, - LastJSDocNode = 305, - FirstJSDocTagNode = 294, - LastJSDocTagNode = 305 + FirstJSDocNode = 284, + LastJSDocNode = 306, + FirstJSDocTagNode = 295, + LastJSDocTagNode = 306 } enum NodeFlags { None = 0, @@ -1739,9 +1740,15 @@ declare namespace ts { kind: SyntaxKind.UnparsedSource; fileName?: string; text: string; + prologues: ReadonlyArray; sourceMapPath?: string; sourceMapText?: string; } + interface UnparsedPrologue extends Node { + kind: SyntaxKind.UnparsedSource; + text: string; + parent: UnparsedSource; + } interface JsonSourceFile extends SourceFile { statements: NodeArray; } @@ -3447,6 +3454,7 @@ declare namespace ts { function isSourceFile(node: Node): node is SourceFile; function isBundle(node: Node): node is Bundle; function isUnparsedSource(node: Node): node is UnparsedSource; + function isUnparsedPrologue(node: Node): node is UnparsedPrologue; function isJSDocTypeExpression(node: Node): node is JSDocTypeExpression; function isJSDocAllType(node: JSDocAllType): node is JSDocAllType; function isJSDocUnknownType(node: Node): node is JSDocUnknownType; diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index 5ae49608353..68bab98b113 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -355,40 +355,41 @@ declare namespace ts { ShorthandPropertyAssignment = 276, SpreadAssignment = 277, EnumMember = 278, - SourceFile = 279, - Bundle = 280, - UnparsedSource = 281, - InputFiles = 282, - JSDocTypeExpression = 283, - JSDocAllType = 284, - JSDocUnknownType = 285, - JSDocNullableType = 286, - JSDocNonNullableType = 287, - JSDocOptionalType = 288, - JSDocFunctionType = 289, - JSDocVariadicType = 290, - JSDocComment = 291, - JSDocTypeLiteral = 292, - JSDocSignature = 293, - JSDocTag = 294, - JSDocAugmentsTag = 295, - JSDocClassTag = 296, - JSDocCallbackTag = 297, - JSDocEnumTag = 298, - JSDocParameterTag = 299, - JSDocReturnTag = 300, - JSDocThisTag = 301, - JSDocTypeTag = 302, - JSDocTemplateTag = 303, - JSDocTypedefTag = 304, - JSDocPropertyTag = 305, - SyntaxList = 306, - NotEmittedStatement = 307, - PartiallyEmittedExpression = 308, - CommaListExpression = 309, - MergeDeclarationMarker = 310, - EndOfDeclarationMarker = 311, - Count = 312, + UnparsedPrologue = 279, + SourceFile = 280, + Bundle = 281, + UnparsedSource = 282, + InputFiles = 283, + JSDocTypeExpression = 284, + JSDocAllType = 285, + JSDocUnknownType = 286, + JSDocNullableType = 287, + JSDocNonNullableType = 288, + JSDocOptionalType = 289, + JSDocFunctionType = 290, + JSDocVariadicType = 291, + JSDocComment = 292, + JSDocTypeLiteral = 293, + JSDocSignature = 294, + JSDocTag = 295, + JSDocAugmentsTag = 296, + JSDocClassTag = 297, + JSDocCallbackTag = 298, + JSDocEnumTag = 299, + JSDocParameterTag = 300, + JSDocReturnTag = 301, + JSDocThisTag = 302, + JSDocTypeTag = 303, + JSDocTemplateTag = 304, + JSDocTypedefTag = 305, + JSDocPropertyTag = 306, + SyntaxList = 307, + NotEmittedStatement = 308, + PartiallyEmittedExpression = 309, + CommaListExpression = 310, + MergeDeclarationMarker = 311, + EndOfDeclarationMarker = 312, + Count = 313, FirstAssignment = 59, LastAssignment = 71, FirstCompoundAssignment = 60, @@ -414,10 +415,10 @@ declare namespace ts { FirstBinaryOperator = 28, LastBinaryOperator = 71, FirstNode = 148, - FirstJSDocNode = 283, - LastJSDocNode = 305, - FirstJSDocTagNode = 294, - LastJSDocTagNode = 305 + FirstJSDocNode = 284, + LastJSDocNode = 306, + FirstJSDocTagNode = 295, + LastJSDocTagNode = 306 } enum NodeFlags { None = 0, @@ -1739,9 +1740,15 @@ declare namespace ts { kind: SyntaxKind.UnparsedSource; fileName?: string; text: string; + prologues: ReadonlyArray; sourceMapPath?: string; sourceMapText?: string; } + interface UnparsedPrologue extends Node { + kind: SyntaxKind.UnparsedSource; + text: string; + parent: UnparsedSource; + } interface JsonSourceFile extends SourceFile { statements: NodeArray; } @@ -3447,6 +3454,7 @@ declare namespace ts { function isSourceFile(node: Node): node is SourceFile; function isBundle(node: Node): node is Bundle; function isUnparsedSource(node: Node): node is UnparsedSource; + function isUnparsedPrologue(node: Node): node is UnparsedPrologue; function isJSDocTypeExpression(node: Node): node is JSDocTypeExpression; function isJSDocAllType(node: JSDocAllType): node is JSDocAllType; function isJSDocUnknownType(node: Node): node is JSDocUnknownType; diff --git a/tests/baselines/reference/outFile-multiple-prologues-in-all-projects.js b/tests/baselines/reference/outFile-multiple-prologues-in-all-projects.js index ca0e106ad3e..41d14decf15 100644 --- a/tests/baselines/reference/outFile-multiple-prologues-in-all-projects.js +++ b/tests/baselines/reference/outFile-multiple-prologues-in-all-projects.js @@ -1094,10 +1094,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.js] "use strict"; +"myPrologue"; +"myPrologue2"; "myPrologue3"; -"myPrologue"; -"use strict"; -"myPrologue"; var s = "Hello, world"; console.log(s); console.log(f()); @@ -1105,9 +1104,6 @@ function f() { return "JS does hoists"; } //# sourceMappingURL=first-output.js.map -"use strict"; -"myPrologue"; -"myPrologue2"; var N; (function (N) { function f() { @@ -1129,61 +1125,68 @@ c.doSomething(); //# sourceMappingURL=third-output.js.map //// [/src/third/thirdjs/output/third-output.js.map] -{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../third_part1.ts","../../../first/first_PART1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts"],"names":[],"mappings":";AAAA,aAAa,CAAC;AACd,YAAY,CAAC;;ACDb,YAAY,CAAA;AAKZ,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;ACXf,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;;;ACFD,YAAY,CAAA;ACAZ,aAAa,CAAC;ADKd,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;;ALHD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC"} +{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../second/second_part2.ts","../../../second/second_part1.ts","../../third_part1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts"],"names":[],"mappings":";AAAA,YAAY,CAAA;ACAZ,aAAa,CAAC;AEAd,aAAa,CAAC;AHKd,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AIXf,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;;AHGD,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ADVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;;AEHD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC"} //// [/src/third/thirdjs/output/third-output.js.map.baseline.txt] =================================================================== JsFile: third-output.js mapUrl: third-output.js.map sourceRoot: -sources: ../../third_part1.ts,../../../first/first_PART1.ts,../../../first/first_part2.ts,../../../first/first_part3.ts,../../../second/second_part1.ts,../../../second/second_part2.ts +sources: ../../../first/first_PART1.ts,../../../second/second_part2.ts,../../../second/second_part1.ts,../../third_part1.ts,../../../first/first_part2.ts,../../../first/first_part3.ts =================================================================== ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../third_part1.ts -------------------------------------------------------------------- ->>>"use strict"; ->>>"myPrologue3"; -1 > -2 >^^^^^^^^^^^^^ -3 > ^ -1 > -2 >"myPrologue3" -3 > ; -1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(2, 14) Source(1, 14) + SourceIndex(0) -3 >Emitted(2, 15) Source(1, 15) + SourceIndex(0) ---- ->>>"myPrologue"; -1 > -2 >^^^^^^^^^^^^ -3 > ^ -4 > ^-> -1 > - > -2 >"myPrologue" -3 > ; -1 >Emitted(3, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(3, 13) Source(2, 13) + SourceIndex(0) -3 >Emitted(3, 14) Source(2, 14) + SourceIndex(0) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js sourceFile:../../../first/first_PART1.ts ------------------------------------------------------------------- >>>"use strict"; >>>"myPrologue"; -1-> +1 > 2 >^^^^^^^^^^^^ 3 > ^ -4 > ^^^^^^^^^^^-> -1-> +4 > ^^-> +1 > 2 >"myPrologue" 3 > -1->Emitted(5, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(5, 13) Source(1, 13) + SourceIndex(1) -3 >Emitted(5, 14) Source(1, 13) + SourceIndex(1) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(0) +2 >Emitted(2, 13) Source(1, 13) + SourceIndex(0) +3 >Emitted(2, 14) Source(1, 13) + SourceIndex(0) --- +------------------------------------------------------------------- +emittedFile:/src/third/thirdjs/output/third-output.js +sourceFile:../../../second/second_part2.ts +------------------------------------------------------------------- +>>>"myPrologue2"; +1-> +2 >^^^^^^^^^^^^^ +3 > ^ +4 > ^-> +1-> +2 >"myPrologue2" +3 > ; +1->Emitted(3, 1) Source(1, 1) + SourceIndex(1) +2 >Emitted(3, 14) Source(1, 14) + SourceIndex(1) +3 >Emitted(3, 15) Source(1, 15) + SourceIndex(1) +--- +------------------------------------------------------------------- +emittedFile:/src/third/thirdjs/output/third-output.js +sourceFile:../../third_part1.ts +------------------------------------------------------------------- +>>>"myPrologue3"; +1-> +2 >^^^^^^^^^^^^^ +3 > ^ +4 > ^^^^^^^^^^-> +1-> +2 >"myPrologue3" +3 > ; +1->Emitted(4, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(4, 14) Source(1, 14) + SourceIndex(3) +3 >Emitted(4, 15) Source(1, 15) + SourceIndex(3) +--- +------------------------------------------------------------------- +emittedFile:/src/third/thirdjs/output/third-output.js +sourceFile:../../../first/first_PART1.ts +------------------------------------------------------------------- >>>var s = "Hello, world"; 1-> 2 >^^^^ @@ -1191,7 +1194,7 @@ sourceFile:../../../first/first_PART1.ts 4 > ^^^ 5 > ^^^^^^^^^^^^^^ 6 > ^ -1-> +1->"myPrologue" >interface TheFirst { > none: any; >} @@ -1202,12 +1205,12 @@ sourceFile:../../../first/first_PART1.ts 4 > = 5 > "Hello, world" 6 > ; -1->Emitted(6, 1) Source(6, 1) + SourceIndex(1) -2 >Emitted(6, 5) Source(6, 7) + SourceIndex(1) -3 >Emitted(6, 6) Source(6, 8) + SourceIndex(1) -4 >Emitted(6, 9) Source(6, 11) + SourceIndex(1) -5 >Emitted(6, 23) Source(6, 25) + SourceIndex(1) -6 >Emitted(6, 24) Source(6, 26) + SourceIndex(1) +1->Emitted(5, 1) Source(6, 1) + SourceIndex(0) +2 >Emitted(5, 5) Source(6, 7) + SourceIndex(0) +3 >Emitted(5, 6) Source(6, 8) + SourceIndex(0) +4 >Emitted(5, 9) Source(6, 11) + SourceIndex(0) +5 >Emitted(5, 23) Source(6, 25) + SourceIndex(0) +6 >Emitted(5, 24) Source(6, 26) + SourceIndex(0) --- >>>console.log(s); 1 > @@ -1233,14 +1236,14 @@ sourceFile:../../../first/first_PART1.ts 6 > s 7 > ) 8 > ; -1 >Emitted(7, 1) Source(12, 1) + SourceIndex(1) -2 >Emitted(7, 8) Source(12, 8) + SourceIndex(1) -3 >Emitted(7, 9) Source(12, 9) + SourceIndex(1) -4 >Emitted(7, 12) Source(12, 12) + SourceIndex(1) -5 >Emitted(7, 13) Source(12, 13) + SourceIndex(1) -6 >Emitted(7, 14) Source(12, 14) + SourceIndex(1) -7 >Emitted(7, 15) Source(12, 15) + SourceIndex(1) -8 >Emitted(7, 16) Source(12, 16) + SourceIndex(1) +1 >Emitted(6, 1) Source(12, 1) + SourceIndex(0) +2 >Emitted(6, 8) Source(12, 8) + SourceIndex(0) +3 >Emitted(6, 9) Source(12, 9) + SourceIndex(0) +4 >Emitted(6, 12) Source(12, 12) + SourceIndex(0) +5 >Emitted(6, 13) Source(12, 13) + SourceIndex(0) +6 >Emitted(6, 14) Source(12, 14) + SourceIndex(0) +7 >Emitted(6, 15) Source(12, 15) + SourceIndex(0) +8 >Emitted(6, 16) Source(12, 16) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -1265,15 +1268,15 @@ sourceFile:../../../first/first_part2.ts 7 > () 8 > ) 9 > ; -1->Emitted(8, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(8, 8) Source(1, 8) + SourceIndex(2) -3 >Emitted(8, 9) Source(1, 9) + SourceIndex(2) -4 >Emitted(8, 12) Source(1, 12) + SourceIndex(2) -5 >Emitted(8, 13) Source(1, 13) + SourceIndex(2) -6 >Emitted(8, 14) Source(1, 14) + SourceIndex(2) -7 >Emitted(8, 16) Source(1, 16) + SourceIndex(2) -8 >Emitted(8, 17) Source(1, 17) + SourceIndex(2) -9 >Emitted(8, 18) Source(1, 18) + SourceIndex(2) +1->Emitted(7, 1) Source(1, 1) + SourceIndex(4) +2 >Emitted(7, 8) Source(1, 8) + SourceIndex(4) +3 >Emitted(7, 9) Source(1, 9) + SourceIndex(4) +4 >Emitted(7, 12) Source(1, 12) + SourceIndex(4) +5 >Emitted(7, 13) Source(1, 13) + SourceIndex(4) +6 >Emitted(7, 14) Source(1, 14) + SourceIndex(4) +7 >Emitted(7, 16) Source(1, 16) + SourceIndex(4) +8 >Emitted(7, 17) Source(1, 17) + SourceIndex(4) +9 >Emitted(7, 18) Source(1, 18) + SourceIndex(4) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -1287,9 +1290,9 @@ sourceFile:../../../first/first_part3.ts 1 > 2 >function 3 > f -1 >Emitted(9, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(9, 10) Source(1, 10) + SourceIndex(3) -3 >Emitted(9, 11) Source(1, 11) + SourceIndex(3) +1 >Emitted(8, 1) Source(1, 1) + SourceIndex(5) +2 >Emitted(8, 10) Source(1, 10) + SourceIndex(5) +3 >Emitted(8, 11) Source(1, 11) + SourceIndex(5) --- >>> return "JS does hoists"; 1->^^^^ @@ -1301,10 +1304,10 @@ sourceFile:../../../first/first_part3.ts 2 > return 3 > "JS does hoists" 4 > ; -1->Emitted(10, 5) Source(2, 5) + SourceIndex(3) -2 >Emitted(10, 12) Source(2, 12) + SourceIndex(3) -3 >Emitted(10, 28) Source(2, 28) + SourceIndex(3) -4 >Emitted(10, 29) Source(2, 29) + SourceIndex(3) +1->Emitted(9, 5) Source(2, 5) + SourceIndex(5) +2 >Emitted(9, 12) Source(2, 12) + SourceIndex(5) +3 >Emitted(9, 28) Source(2, 28) + SourceIndex(5) +4 >Emitted(9, 29) Source(2, 29) + SourceIndex(5) --- >>>} 1 > @@ -1313,53 +1316,21 @@ sourceFile:../../../first/first_part3.ts 1 > > 2 >} -1 >Emitted(11, 1) Source(3, 1) + SourceIndex(3) -2 >Emitted(11, 2) Source(3, 2) + SourceIndex(3) +1 >Emitted(10, 1) Source(3, 1) + SourceIndex(5) +2 >Emitted(10, 2) Source(3, 2) + SourceIndex(5) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js sourceFile:../../../second/second_part1.ts ------------------------------------------------------------------- >>>//# sourceMappingURL=first-output.js.map ->>>"use strict"; ->>>"myPrologue"; -1-> -2 >^^^^^^^^^^^^ -3 > ^ -4 > ^^-> -1-> -2 >"myPrologue" -3 > -1->Emitted(14, 1) Source(1, 1) + SourceIndex(4) -2 >Emitted(14, 13) Source(1, 13) + SourceIndex(4) -3 >Emitted(14, 14) Source(1, 13) + SourceIndex(4) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../second/second_part2.ts -------------------------------------------------------------------- ->>>"myPrologue2"; -1-> -2 >^^^^^^^^^^^^^ -3 > ^ -1-> -2 >"myPrologue2" -3 > ; -1->Emitted(15, 1) Source(1, 1) + SourceIndex(5) -2 >Emitted(15, 14) Source(1, 14) + SourceIndex(5) -3 >Emitted(15, 15) Source(1, 15) + SourceIndex(5) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../second/second_part1.ts -------------------------------------------------------------------- >>>var N; -1 > +1-> 2 >^^^^ 3 > ^ 4 > ^ 5 > ^^^^^^^^^^-> -1 >"myPrologue" +1->"myPrologue" >namespace N { > // Comment text >} @@ -1374,10 +1345,10 @@ sourceFile:../../../second/second_part1.ts > > f(); > } -1 >Emitted(16, 1) Source(6, 1) + SourceIndex(4) -2 >Emitted(16, 5) Source(6, 11) + SourceIndex(4) -3 >Emitted(16, 6) Source(6, 12) + SourceIndex(4) -4 >Emitted(16, 7) Source(12, 2) + SourceIndex(4) +1->Emitted(12, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(12, 5) Source(6, 11) + SourceIndex(2) +3 >Emitted(12, 6) Source(6, 12) + SourceIndex(2) +4 >Emitted(12, 7) Source(12, 2) + SourceIndex(2) --- >>>(function (N) { 1-> @@ -1387,9 +1358,9 @@ sourceFile:../../../second/second_part1.ts 1-> 2 >namespace 3 > N -1->Emitted(17, 1) Source(6, 1) + SourceIndex(4) -2 >Emitted(17, 12) Source(6, 11) + SourceIndex(4) -3 >Emitted(17, 13) Source(6, 12) + SourceIndex(4) +1->Emitted(13, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(13, 12) Source(6, 11) + SourceIndex(2) +3 >Emitted(13, 13) Source(6, 12) + SourceIndex(2) --- >>> function f() { 1->^^^^ @@ -1400,9 +1371,9 @@ sourceFile:../../../second/second_part1.ts > 2 > function 3 > f -1->Emitted(18, 5) Source(7, 5) + SourceIndex(4) -2 >Emitted(18, 14) Source(7, 14) + SourceIndex(4) -3 >Emitted(18, 15) Source(7, 15) + SourceIndex(4) +1->Emitted(14, 5) Source(7, 5) + SourceIndex(2) +2 >Emitted(14, 14) Source(7, 14) + SourceIndex(2) +3 >Emitted(14, 15) Source(7, 15) + SourceIndex(2) --- >>> console.log('testing'); 1->^^^^^^^^ @@ -1422,14 +1393,14 @@ sourceFile:../../../second/second_part1.ts 6 > 'testing' 7 > ) 8 > ; -1->Emitted(19, 9) Source(8, 9) + SourceIndex(4) -2 >Emitted(19, 16) Source(8, 16) + SourceIndex(4) -3 >Emitted(19, 17) Source(8, 17) + SourceIndex(4) -4 >Emitted(19, 20) Source(8, 20) + SourceIndex(4) -5 >Emitted(19, 21) Source(8, 21) + SourceIndex(4) -6 >Emitted(19, 30) Source(8, 30) + SourceIndex(4) -7 >Emitted(19, 31) Source(8, 31) + SourceIndex(4) -8 >Emitted(19, 32) Source(8, 32) + SourceIndex(4) +1->Emitted(15, 9) Source(8, 9) + SourceIndex(2) +2 >Emitted(15, 16) Source(8, 16) + SourceIndex(2) +3 >Emitted(15, 17) Source(8, 17) + SourceIndex(2) +4 >Emitted(15, 20) Source(8, 20) + SourceIndex(2) +5 >Emitted(15, 21) Source(8, 21) + SourceIndex(2) +6 >Emitted(15, 30) Source(8, 30) + SourceIndex(2) +7 >Emitted(15, 31) Source(8, 31) + SourceIndex(2) +8 >Emitted(15, 32) Source(8, 32) + SourceIndex(2) --- >>> } 1 >^^^^ @@ -1438,8 +1409,8 @@ sourceFile:../../../second/second_part1.ts 1 > > 2 > } -1 >Emitted(20, 5) Source(9, 5) + SourceIndex(4) -2 >Emitted(20, 6) Source(9, 6) + SourceIndex(4) +1 >Emitted(16, 5) Source(9, 5) + SourceIndex(2) +2 >Emitted(16, 6) Source(9, 6) + SourceIndex(2) --- >>> f(); 1->^^^^ @@ -1453,10 +1424,10 @@ sourceFile:../../../second/second_part1.ts 2 > f 3 > () 4 > ; -1->Emitted(21, 5) Source(11, 5) + SourceIndex(4) -2 >Emitted(21, 6) Source(11, 6) + SourceIndex(4) -3 >Emitted(21, 8) Source(11, 8) + SourceIndex(4) -4 >Emitted(21, 9) Source(11, 9) + SourceIndex(4) +1->Emitted(17, 5) Source(11, 5) + SourceIndex(2) +2 >Emitted(17, 6) Source(11, 6) + SourceIndex(2) +3 >Emitted(17, 8) Source(11, 8) + SourceIndex(2) +4 >Emitted(17, 9) Source(11, 9) + SourceIndex(2) --- >>>})(N || (N = {})); 1-> @@ -1481,13 +1452,13 @@ sourceFile:../../../second/second_part1.ts > > f(); > } -1->Emitted(22, 1) Source(12, 1) + SourceIndex(4) -2 >Emitted(22, 2) Source(12, 2) + SourceIndex(4) -3 >Emitted(22, 4) Source(6, 11) + SourceIndex(4) -4 >Emitted(22, 5) Source(6, 12) + SourceIndex(4) -5 >Emitted(22, 10) Source(6, 11) + SourceIndex(4) -6 >Emitted(22, 11) Source(6, 12) + SourceIndex(4) -7 >Emitted(22, 19) Source(12, 2) + SourceIndex(4) +1->Emitted(18, 1) Source(12, 1) + SourceIndex(2) +2 >Emitted(18, 2) Source(12, 2) + SourceIndex(2) +3 >Emitted(18, 4) Source(6, 11) + SourceIndex(2) +4 >Emitted(18, 5) Source(6, 12) + SourceIndex(2) +5 >Emitted(18, 10) Source(6, 11) + SourceIndex(2) +6 >Emitted(18, 11) Source(6, 12) + SourceIndex(2) +7 >Emitted(18, 19) Source(12, 2) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -1498,13 +1469,13 @@ sourceFile:../../../second/second_part2.ts 2 >^^^^^^^^^^^^^^^^^^^-> 1->"myPrologue2"; > -1->Emitted(23, 1) Source(2, 1) + SourceIndex(5) +1->Emitted(19, 1) Source(2, 1) + SourceIndex(1) --- >>> function C() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(24, 5) Source(2, 1) + SourceIndex(5) +1->Emitted(20, 5) Source(2, 1) + SourceIndex(1) --- >>> } 1->^^^^ @@ -1516,8 +1487,8 @@ sourceFile:../../../second/second_part2.ts > } > 2 > } -1->Emitted(25, 5) Source(6, 1) + SourceIndex(5) -2 >Emitted(25, 6) Source(6, 2) + SourceIndex(5) +1->Emitted(21, 5) Source(6, 1) + SourceIndex(1) +2 >Emitted(21, 6) Source(6, 2) + SourceIndex(1) --- >>> C.prototype.doSomething = function () { 1->^^^^ @@ -1527,9 +1498,9 @@ sourceFile:../../../second/second_part2.ts 1-> 2 > doSomething 3 > -1->Emitted(26, 5) Source(3, 5) + SourceIndex(5) -2 >Emitted(26, 28) Source(3, 16) + SourceIndex(5) -3 >Emitted(26, 31) Source(3, 5) + SourceIndex(5) +1->Emitted(22, 5) Source(3, 5) + SourceIndex(1) +2 >Emitted(22, 28) Source(3, 16) + SourceIndex(1) +3 >Emitted(22, 31) Source(3, 5) + SourceIndex(1) --- >>> console.log("something got done"); 1->^^^^^^^^ @@ -1549,14 +1520,14 @@ sourceFile:../../../second/second_part2.ts 6 > "something got done" 7 > ) 8 > ; -1->Emitted(27, 9) Source(4, 9) + SourceIndex(5) -2 >Emitted(27, 16) Source(4, 16) + SourceIndex(5) -3 >Emitted(27, 17) Source(4, 17) + SourceIndex(5) -4 >Emitted(27, 20) Source(4, 20) + SourceIndex(5) -5 >Emitted(27, 21) Source(4, 21) + SourceIndex(5) -6 >Emitted(27, 41) Source(4, 41) + SourceIndex(5) -7 >Emitted(27, 42) Source(4, 42) + SourceIndex(5) -8 >Emitted(27, 43) Source(4, 43) + SourceIndex(5) +1->Emitted(23, 9) Source(4, 9) + SourceIndex(1) +2 >Emitted(23, 16) Source(4, 16) + SourceIndex(1) +3 >Emitted(23, 17) Source(4, 17) + SourceIndex(1) +4 >Emitted(23, 20) Source(4, 20) + SourceIndex(1) +5 >Emitted(23, 21) Source(4, 21) + SourceIndex(1) +6 >Emitted(23, 41) Source(4, 41) + SourceIndex(1) +7 >Emitted(23, 42) Source(4, 42) + SourceIndex(1) +8 >Emitted(23, 43) Source(4, 43) + SourceIndex(1) --- >>> }; 1 >^^^^ @@ -1565,8 +1536,8 @@ sourceFile:../../../second/second_part2.ts 1 > > 2 > } -1 >Emitted(28, 5) Source(5, 5) + SourceIndex(5) -2 >Emitted(28, 6) Source(5, 6) + SourceIndex(5) +1 >Emitted(24, 5) Source(5, 5) + SourceIndex(1) +2 >Emitted(24, 6) Source(5, 6) + SourceIndex(1) --- >>> return C; 1->^^^^ @@ -1574,8 +1545,8 @@ sourceFile:../../../second/second_part2.ts 1-> > 2 > } -1->Emitted(29, 5) Source(6, 1) + SourceIndex(5) -2 >Emitted(29, 13) Source(6, 2) + SourceIndex(5) +1->Emitted(25, 5) Source(6, 1) + SourceIndex(1) +2 >Emitted(25, 13) Source(6, 2) + SourceIndex(1) --- >>>}()); 1 > @@ -1591,10 +1562,10 @@ sourceFile:../../../second/second_part2.ts > console.log("something got done"); > } > } -1 >Emitted(30, 1) Source(6, 1) + SourceIndex(5) -2 >Emitted(30, 2) Source(6, 2) + SourceIndex(5) -3 >Emitted(30, 2) Source(2, 1) + SourceIndex(5) -4 >Emitted(30, 6) Source(6, 2) + SourceIndex(5) +1 >Emitted(26, 1) Source(6, 1) + SourceIndex(1) +2 >Emitted(26, 2) Source(6, 2) + SourceIndex(1) +3 >Emitted(26, 2) Source(2, 1) + SourceIndex(1) +4 >Emitted(26, 6) Source(6, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -1621,14 +1592,14 @@ sourceFile:../../third_part1.ts 6 > C 7 > () 8 > ; -1->Emitted(32, 1) Source(3, 1) + SourceIndex(0) -2 >Emitted(32, 5) Source(3, 5) + SourceIndex(0) -3 >Emitted(32, 6) Source(3, 6) + SourceIndex(0) -4 >Emitted(32, 9) Source(3, 9) + SourceIndex(0) -5 >Emitted(32, 13) Source(3, 13) + SourceIndex(0) -6 >Emitted(32, 14) Source(3, 14) + SourceIndex(0) -7 >Emitted(32, 16) Source(3, 16) + SourceIndex(0) -8 >Emitted(32, 17) Source(3, 17) + SourceIndex(0) +1->Emitted(28, 1) Source(3, 1) + SourceIndex(3) +2 >Emitted(28, 5) Source(3, 5) + SourceIndex(3) +3 >Emitted(28, 6) Source(3, 6) + SourceIndex(3) +4 >Emitted(28, 9) Source(3, 9) + SourceIndex(3) +5 >Emitted(28, 13) Source(3, 13) + SourceIndex(3) +6 >Emitted(28, 14) Source(3, 14) + SourceIndex(3) +7 >Emitted(28, 16) Source(3, 16) + SourceIndex(3) +8 >Emitted(28, 17) Source(3, 17) + SourceIndex(3) --- >>>c.doSomething(); 1-> @@ -1645,12 +1616,12 @@ sourceFile:../../third_part1.ts 4 > doSomething 5 > () 6 > ; -1->Emitted(33, 1) Source(4, 1) + SourceIndex(0) -2 >Emitted(33, 2) Source(4, 2) + SourceIndex(0) -3 >Emitted(33, 3) Source(4, 3) + SourceIndex(0) -4 >Emitted(33, 14) Source(4, 14) + SourceIndex(0) -5 >Emitted(33, 16) Source(4, 16) + SourceIndex(0) -6 >Emitted(33, 17) Source(4, 17) + SourceIndex(0) +1->Emitted(29, 1) Source(4, 1) + SourceIndex(3) +2 >Emitted(29, 2) Source(4, 2) + SourceIndex(3) +3 >Emitted(29, 3) Source(4, 3) + SourceIndex(3) +4 >Emitted(29, 14) Source(4, 14) + SourceIndex(3) +5 >Emitted(29, 16) Source(4, 16) + SourceIndex(3) +6 >Emitted(29, 17) Source(4, 17) + SourceIndex(3) --- >>>//# sourceMappingURL=third-output.js.map diff --git a/tests/baselines/reference/outFile-multiple-prologues-in-different-projects.js b/tests/baselines/reference/outFile-multiple-prologues-in-different-projects.js index 0744f263935..fd187f16c2e 100644 --- a/tests/baselines/reference/outFile-multiple-prologues-in-different-projects.js +++ b/tests/baselines/reference/outFile-multiple-prologues-in-different-projects.js @@ -1041,7 +1041,8 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.js] "use strict"; -"use strict"; +"myPrologue"; +"myPrologue2"; var s = "Hello, world"; console.log(s); console.log(f()); @@ -1049,8 +1050,6 @@ function f() { return "JS does hoists"; } //# sourceMappingURL=first-output.js.map -"myPrologue"; -"myPrologue2"; var N; (function (N) { function f() { @@ -1072,29 +1071,60 @@ c.doSomething(); //# sourceMappingURL=third-output.js.map //// [/src/third/thirdjs/output/third-output.js.map] -{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../third_part1.ts","../../../first/first_PART1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts"],"names":[],"mappings":";;ACIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;ACVf,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;;ACFD,YAAY,CAAA;ACAZ,aAAa,CAAC;ADKd,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;;ALLD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC"} +{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../../second/second_part1.ts","../../../second/second_part2.ts","../../third_part1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts"],"names":[],"mappings":";ACAA,YAAY,CAAA;ACAZ,aAAa,CAAC;AFId,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AIVf,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;;AJGD,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;;ACLD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC"} //// [/src/third/thirdjs/output/third-output.js.map.baseline.txt] =================================================================== JsFile: third-output.js mapUrl: third-output.js.map sourceRoot: -sources: ../../third_part1.ts,../../../first/first_PART1.ts,../../../first/first_part2.ts,../../../first/first_part3.ts,../../../second/second_part1.ts,../../../second/second_part2.ts +sources: ../../../first/first_PART1.ts,../../../second/second_part1.ts,../../../second/second_part2.ts,../../third_part1.ts,../../../first/first_part2.ts,../../../first/first_part3.ts =================================================================== ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js +sourceFile:../../../second/second_part1.ts +------------------------------------------------------------------- +>>>"use strict"; +>>>"myPrologue"; +1 > +2 >^^^^^^^^^^^^ +3 > ^ +4 > ^^-> +1 > +2 >"myPrologue" +3 > +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(1) +2 >Emitted(2, 13) Source(1, 13) + SourceIndex(1) +3 >Emitted(2, 14) Source(1, 13) + SourceIndex(1) +--- +------------------------------------------------------------------- +emittedFile:/src/third/thirdjs/output/third-output.js +sourceFile:../../../second/second_part2.ts +------------------------------------------------------------------- +>>>"myPrologue2"; +1-> +2 >^^^^^^^^^^^^^ +3 > ^ +4 > ^^^^^^^^^^-> +1-> +2 >"myPrologue2" +3 > ; +1->Emitted(3, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(3, 14) Source(1, 14) + SourceIndex(2) +3 >Emitted(3, 15) Source(1, 15) + SourceIndex(2) +--- +------------------------------------------------------------------- +emittedFile:/src/third/thirdjs/output/third-output.js sourceFile:../../../first/first_PART1.ts ------------------------------------------------------------------- ->>>"use strict"; ->>>"use strict"; >>>var s = "Hello, world"; -1 > +1-> 2 >^^^^ 3 > ^ 4 > ^^^ 5 > ^^^^^^^^^^^^^^ 6 > ^ -1 >interface TheFirst { +1->interface TheFirst { > none: any; >} > @@ -1104,12 +1134,12 @@ sourceFile:../../../first/first_PART1.ts 4 > = 5 > "Hello, world" 6 > ; -1 >Emitted(3, 1) Source(5, 1) + SourceIndex(1) -2 >Emitted(3, 5) Source(5, 7) + SourceIndex(1) -3 >Emitted(3, 6) Source(5, 8) + SourceIndex(1) -4 >Emitted(3, 9) Source(5, 11) + SourceIndex(1) -5 >Emitted(3, 23) Source(5, 25) + SourceIndex(1) -6 >Emitted(3, 24) Source(5, 26) + SourceIndex(1) +1->Emitted(4, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(4, 5) Source(5, 7) + SourceIndex(0) +3 >Emitted(4, 6) Source(5, 8) + SourceIndex(0) +4 >Emitted(4, 9) Source(5, 11) + SourceIndex(0) +5 >Emitted(4, 23) Source(5, 25) + SourceIndex(0) +6 >Emitted(4, 24) Source(5, 26) + SourceIndex(0) --- >>>console.log(s); 1 > @@ -1135,14 +1165,14 @@ sourceFile:../../../first/first_PART1.ts 6 > s 7 > ) 8 > ; -1 >Emitted(4, 1) Source(11, 1) + SourceIndex(1) -2 >Emitted(4, 8) Source(11, 8) + SourceIndex(1) -3 >Emitted(4, 9) Source(11, 9) + SourceIndex(1) -4 >Emitted(4, 12) Source(11, 12) + SourceIndex(1) -5 >Emitted(4, 13) Source(11, 13) + SourceIndex(1) -6 >Emitted(4, 14) Source(11, 14) + SourceIndex(1) -7 >Emitted(4, 15) Source(11, 15) + SourceIndex(1) -8 >Emitted(4, 16) Source(11, 16) + SourceIndex(1) +1 >Emitted(5, 1) Source(11, 1) + SourceIndex(0) +2 >Emitted(5, 8) Source(11, 8) + SourceIndex(0) +3 >Emitted(5, 9) Source(11, 9) + SourceIndex(0) +4 >Emitted(5, 12) Source(11, 12) + SourceIndex(0) +5 >Emitted(5, 13) Source(11, 13) + SourceIndex(0) +6 >Emitted(5, 14) Source(11, 14) + SourceIndex(0) +7 >Emitted(5, 15) Source(11, 15) + SourceIndex(0) +8 >Emitted(5, 16) Source(11, 16) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -1167,15 +1197,15 @@ sourceFile:../../../first/first_part2.ts 7 > () 8 > ) 9 > ; -1->Emitted(5, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(5, 8) Source(1, 8) + SourceIndex(2) -3 >Emitted(5, 9) Source(1, 9) + SourceIndex(2) -4 >Emitted(5, 12) Source(1, 12) + SourceIndex(2) -5 >Emitted(5, 13) Source(1, 13) + SourceIndex(2) -6 >Emitted(5, 14) Source(1, 14) + SourceIndex(2) -7 >Emitted(5, 16) Source(1, 16) + SourceIndex(2) -8 >Emitted(5, 17) Source(1, 17) + SourceIndex(2) -9 >Emitted(5, 18) Source(1, 18) + SourceIndex(2) +1->Emitted(6, 1) Source(1, 1) + SourceIndex(4) +2 >Emitted(6, 8) Source(1, 8) + SourceIndex(4) +3 >Emitted(6, 9) Source(1, 9) + SourceIndex(4) +4 >Emitted(6, 12) Source(1, 12) + SourceIndex(4) +5 >Emitted(6, 13) Source(1, 13) + SourceIndex(4) +6 >Emitted(6, 14) Source(1, 14) + SourceIndex(4) +7 >Emitted(6, 16) Source(1, 16) + SourceIndex(4) +8 >Emitted(6, 17) Source(1, 17) + SourceIndex(4) +9 >Emitted(6, 18) Source(1, 18) + SourceIndex(4) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -1189,9 +1219,9 @@ sourceFile:../../../first/first_part3.ts 1 > 2 >function 3 > f -1 >Emitted(6, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(6, 10) Source(1, 10) + SourceIndex(3) -3 >Emitted(6, 11) Source(1, 11) + SourceIndex(3) +1 >Emitted(7, 1) Source(1, 1) + SourceIndex(5) +2 >Emitted(7, 10) Source(1, 10) + SourceIndex(5) +3 >Emitted(7, 11) Source(1, 11) + SourceIndex(5) --- >>> return "JS does hoists"; 1->^^^^ @@ -1203,10 +1233,10 @@ sourceFile:../../../first/first_part3.ts 2 > return 3 > "JS does hoists" 4 > ; -1->Emitted(7, 5) Source(2, 5) + SourceIndex(3) -2 >Emitted(7, 12) Source(2, 12) + SourceIndex(3) -3 >Emitted(7, 28) Source(2, 28) + SourceIndex(3) -4 >Emitted(7, 29) Source(2, 29) + SourceIndex(3) +1->Emitted(8, 5) Source(2, 5) + SourceIndex(5) +2 >Emitted(8, 12) Source(2, 12) + SourceIndex(5) +3 >Emitted(8, 28) Source(2, 28) + SourceIndex(5) +4 >Emitted(8, 29) Source(2, 29) + SourceIndex(5) --- >>>} 1 > @@ -1215,52 +1245,21 @@ sourceFile:../../../first/first_part3.ts 1 > > 2 >} -1 >Emitted(8, 1) Source(3, 1) + SourceIndex(3) -2 >Emitted(8, 2) Source(3, 2) + SourceIndex(3) +1 >Emitted(9, 1) Source(3, 1) + SourceIndex(5) +2 >Emitted(9, 2) Source(3, 2) + SourceIndex(5) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js sourceFile:../../../second/second_part1.ts ------------------------------------------------------------------- >>>//# sourceMappingURL=first-output.js.map ->>>"myPrologue"; -1-> -2 >^^^^^^^^^^^^ -3 > ^ -4 > ^^-> -1-> -2 >"myPrologue" -3 > -1->Emitted(10, 1) Source(1, 1) + SourceIndex(4) -2 >Emitted(10, 13) Source(1, 13) + SourceIndex(4) -3 >Emitted(10, 14) Source(1, 13) + SourceIndex(4) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../second/second_part2.ts -------------------------------------------------------------------- ->>>"myPrologue2"; -1-> -2 >^^^^^^^^^^^^^ -3 > ^ -1-> -2 >"myPrologue2" -3 > ; -1->Emitted(11, 1) Source(1, 1) + SourceIndex(5) -2 >Emitted(11, 14) Source(1, 14) + SourceIndex(5) -3 >Emitted(11, 15) Source(1, 15) + SourceIndex(5) ---- -------------------------------------------------------------------- -emittedFile:/src/third/thirdjs/output/third-output.js -sourceFile:../../../second/second_part1.ts -------------------------------------------------------------------- >>>var N; -1 > +1-> 2 >^^^^ 3 > ^ 4 > ^ 5 > ^^^^^^^^^^-> -1 >"myPrologue" +1->"myPrologue" >namespace N { > // Comment text >} @@ -1275,10 +1274,10 @@ sourceFile:../../../second/second_part1.ts > > f(); > } -1 >Emitted(12, 1) Source(6, 1) + SourceIndex(4) -2 >Emitted(12, 5) Source(6, 11) + SourceIndex(4) -3 >Emitted(12, 6) Source(6, 12) + SourceIndex(4) -4 >Emitted(12, 7) Source(12, 2) + SourceIndex(4) +1->Emitted(11, 1) Source(6, 1) + SourceIndex(1) +2 >Emitted(11, 5) Source(6, 11) + SourceIndex(1) +3 >Emitted(11, 6) Source(6, 12) + SourceIndex(1) +4 >Emitted(11, 7) Source(12, 2) + SourceIndex(1) --- >>>(function (N) { 1-> @@ -1288,9 +1287,9 @@ sourceFile:../../../second/second_part1.ts 1-> 2 >namespace 3 > N -1->Emitted(13, 1) Source(6, 1) + SourceIndex(4) -2 >Emitted(13, 12) Source(6, 11) + SourceIndex(4) -3 >Emitted(13, 13) Source(6, 12) + SourceIndex(4) +1->Emitted(12, 1) Source(6, 1) + SourceIndex(1) +2 >Emitted(12, 12) Source(6, 11) + SourceIndex(1) +3 >Emitted(12, 13) Source(6, 12) + SourceIndex(1) --- >>> function f() { 1->^^^^ @@ -1301,9 +1300,9 @@ sourceFile:../../../second/second_part1.ts > 2 > function 3 > f -1->Emitted(14, 5) Source(7, 5) + SourceIndex(4) -2 >Emitted(14, 14) Source(7, 14) + SourceIndex(4) -3 >Emitted(14, 15) Source(7, 15) + SourceIndex(4) +1->Emitted(13, 5) Source(7, 5) + SourceIndex(1) +2 >Emitted(13, 14) Source(7, 14) + SourceIndex(1) +3 >Emitted(13, 15) Source(7, 15) + SourceIndex(1) --- >>> console.log('testing'); 1->^^^^^^^^ @@ -1323,14 +1322,14 @@ sourceFile:../../../second/second_part1.ts 6 > 'testing' 7 > ) 8 > ; -1->Emitted(15, 9) Source(8, 9) + SourceIndex(4) -2 >Emitted(15, 16) Source(8, 16) + SourceIndex(4) -3 >Emitted(15, 17) Source(8, 17) + SourceIndex(4) -4 >Emitted(15, 20) Source(8, 20) + SourceIndex(4) -5 >Emitted(15, 21) Source(8, 21) + SourceIndex(4) -6 >Emitted(15, 30) Source(8, 30) + SourceIndex(4) -7 >Emitted(15, 31) Source(8, 31) + SourceIndex(4) -8 >Emitted(15, 32) Source(8, 32) + SourceIndex(4) +1->Emitted(14, 9) Source(8, 9) + SourceIndex(1) +2 >Emitted(14, 16) Source(8, 16) + SourceIndex(1) +3 >Emitted(14, 17) Source(8, 17) + SourceIndex(1) +4 >Emitted(14, 20) Source(8, 20) + SourceIndex(1) +5 >Emitted(14, 21) Source(8, 21) + SourceIndex(1) +6 >Emitted(14, 30) Source(8, 30) + SourceIndex(1) +7 >Emitted(14, 31) Source(8, 31) + SourceIndex(1) +8 >Emitted(14, 32) Source(8, 32) + SourceIndex(1) --- >>> } 1 >^^^^ @@ -1339,8 +1338,8 @@ sourceFile:../../../second/second_part1.ts 1 > > 2 > } -1 >Emitted(16, 5) Source(9, 5) + SourceIndex(4) -2 >Emitted(16, 6) Source(9, 6) + SourceIndex(4) +1 >Emitted(15, 5) Source(9, 5) + SourceIndex(1) +2 >Emitted(15, 6) Source(9, 6) + SourceIndex(1) --- >>> f(); 1->^^^^ @@ -1354,10 +1353,10 @@ sourceFile:../../../second/second_part1.ts 2 > f 3 > () 4 > ; -1->Emitted(17, 5) Source(11, 5) + SourceIndex(4) -2 >Emitted(17, 6) Source(11, 6) + SourceIndex(4) -3 >Emitted(17, 8) Source(11, 8) + SourceIndex(4) -4 >Emitted(17, 9) Source(11, 9) + SourceIndex(4) +1->Emitted(16, 5) Source(11, 5) + SourceIndex(1) +2 >Emitted(16, 6) Source(11, 6) + SourceIndex(1) +3 >Emitted(16, 8) Source(11, 8) + SourceIndex(1) +4 >Emitted(16, 9) Source(11, 9) + SourceIndex(1) --- >>>})(N || (N = {})); 1-> @@ -1382,13 +1381,13 @@ sourceFile:../../../second/second_part1.ts > > f(); > } -1->Emitted(18, 1) Source(12, 1) + SourceIndex(4) -2 >Emitted(18, 2) Source(12, 2) + SourceIndex(4) -3 >Emitted(18, 4) Source(6, 11) + SourceIndex(4) -4 >Emitted(18, 5) Source(6, 12) + SourceIndex(4) -5 >Emitted(18, 10) Source(6, 11) + SourceIndex(4) -6 >Emitted(18, 11) Source(6, 12) + SourceIndex(4) -7 >Emitted(18, 19) Source(12, 2) + SourceIndex(4) +1->Emitted(17, 1) Source(12, 1) + SourceIndex(1) +2 >Emitted(17, 2) Source(12, 2) + SourceIndex(1) +3 >Emitted(17, 4) Source(6, 11) + SourceIndex(1) +4 >Emitted(17, 5) Source(6, 12) + SourceIndex(1) +5 >Emitted(17, 10) Source(6, 11) + SourceIndex(1) +6 >Emitted(17, 11) Source(6, 12) + SourceIndex(1) +7 >Emitted(17, 19) Source(12, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -1399,13 +1398,13 @@ sourceFile:../../../second/second_part2.ts 2 >^^^^^^^^^^^^^^^^^^^-> 1->"myPrologue2"; > -1->Emitted(19, 1) Source(2, 1) + SourceIndex(5) +1->Emitted(18, 1) Source(2, 1) + SourceIndex(2) --- >>> function C() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(20, 5) Source(2, 1) + SourceIndex(5) +1->Emitted(19, 5) Source(2, 1) + SourceIndex(2) --- >>> } 1->^^^^ @@ -1417,8 +1416,8 @@ sourceFile:../../../second/second_part2.ts > } > 2 > } -1->Emitted(21, 5) Source(6, 1) + SourceIndex(5) -2 >Emitted(21, 6) Source(6, 2) + SourceIndex(5) +1->Emitted(20, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(20, 6) Source(6, 2) + SourceIndex(2) --- >>> C.prototype.doSomething = function () { 1->^^^^ @@ -1428,9 +1427,9 @@ sourceFile:../../../second/second_part2.ts 1-> 2 > doSomething 3 > -1->Emitted(22, 5) Source(3, 5) + SourceIndex(5) -2 >Emitted(22, 28) Source(3, 16) + SourceIndex(5) -3 >Emitted(22, 31) Source(3, 5) + SourceIndex(5) +1->Emitted(21, 5) Source(3, 5) + SourceIndex(2) +2 >Emitted(21, 28) Source(3, 16) + SourceIndex(2) +3 >Emitted(21, 31) Source(3, 5) + SourceIndex(2) --- >>> console.log("something got done"); 1->^^^^^^^^ @@ -1450,14 +1449,14 @@ sourceFile:../../../second/second_part2.ts 6 > "something got done" 7 > ) 8 > ; -1->Emitted(23, 9) Source(4, 9) + SourceIndex(5) -2 >Emitted(23, 16) Source(4, 16) + SourceIndex(5) -3 >Emitted(23, 17) Source(4, 17) + SourceIndex(5) -4 >Emitted(23, 20) Source(4, 20) + SourceIndex(5) -5 >Emitted(23, 21) Source(4, 21) + SourceIndex(5) -6 >Emitted(23, 41) Source(4, 41) + SourceIndex(5) -7 >Emitted(23, 42) Source(4, 42) + SourceIndex(5) -8 >Emitted(23, 43) Source(4, 43) + SourceIndex(5) +1->Emitted(22, 9) Source(4, 9) + SourceIndex(2) +2 >Emitted(22, 16) Source(4, 16) + SourceIndex(2) +3 >Emitted(22, 17) Source(4, 17) + SourceIndex(2) +4 >Emitted(22, 20) Source(4, 20) + SourceIndex(2) +5 >Emitted(22, 21) Source(4, 21) + SourceIndex(2) +6 >Emitted(22, 41) Source(4, 41) + SourceIndex(2) +7 >Emitted(22, 42) Source(4, 42) + SourceIndex(2) +8 >Emitted(22, 43) Source(4, 43) + SourceIndex(2) --- >>> }; 1 >^^^^ @@ -1466,8 +1465,8 @@ sourceFile:../../../second/second_part2.ts 1 > > 2 > } -1 >Emitted(24, 5) Source(5, 5) + SourceIndex(5) -2 >Emitted(24, 6) Source(5, 6) + SourceIndex(5) +1 >Emitted(23, 5) Source(5, 5) + SourceIndex(2) +2 >Emitted(23, 6) Source(5, 6) + SourceIndex(2) --- >>> return C; 1->^^^^ @@ -1475,8 +1474,8 @@ sourceFile:../../../second/second_part2.ts 1-> > 2 > } -1->Emitted(25, 5) Source(6, 1) + SourceIndex(5) -2 >Emitted(25, 13) Source(6, 2) + SourceIndex(5) +1->Emitted(24, 5) Source(6, 1) + SourceIndex(2) +2 >Emitted(24, 13) Source(6, 2) + SourceIndex(2) --- >>>}()); 1 > @@ -1492,10 +1491,10 @@ sourceFile:../../../second/second_part2.ts > console.log("something got done"); > } > } -1 >Emitted(26, 1) Source(6, 1) + SourceIndex(5) -2 >Emitted(26, 2) Source(6, 2) + SourceIndex(5) -3 >Emitted(26, 2) Source(2, 1) + SourceIndex(5) -4 >Emitted(26, 6) Source(6, 2) + SourceIndex(5) +1 >Emitted(25, 1) Source(6, 1) + SourceIndex(2) +2 >Emitted(25, 2) Source(6, 2) + SourceIndex(2) +3 >Emitted(25, 2) Source(2, 1) + SourceIndex(2) +4 >Emitted(25, 6) Source(6, 2) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -1520,14 +1519,14 @@ sourceFile:../../third_part1.ts 6 > C 7 > () 8 > ; -1->Emitted(28, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(28, 5) Source(1, 5) + SourceIndex(0) -3 >Emitted(28, 6) Source(1, 6) + SourceIndex(0) -4 >Emitted(28, 9) Source(1, 9) + SourceIndex(0) -5 >Emitted(28, 13) Source(1, 13) + SourceIndex(0) -6 >Emitted(28, 14) Source(1, 14) + SourceIndex(0) -7 >Emitted(28, 16) Source(1, 16) + SourceIndex(0) -8 >Emitted(28, 17) Source(1, 17) + SourceIndex(0) +1->Emitted(27, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(27, 5) Source(1, 5) + SourceIndex(3) +3 >Emitted(27, 6) Source(1, 6) + SourceIndex(3) +4 >Emitted(27, 9) Source(1, 9) + SourceIndex(3) +5 >Emitted(27, 13) Source(1, 13) + SourceIndex(3) +6 >Emitted(27, 14) Source(1, 14) + SourceIndex(3) +7 >Emitted(27, 16) Source(1, 16) + SourceIndex(3) +8 >Emitted(27, 17) Source(1, 17) + SourceIndex(3) --- >>>c.doSomething(); 1-> @@ -1544,12 +1543,12 @@ sourceFile:../../third_part1.ts 4 > doSomething 5 > () 6 > ; -1->Emitted(29, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(29, 2) Source(2, 2) + SourceIndex(0) -3 >Emitted(29, 3) Source(2, 3) + SourceIndex(0) -4 >Emitted(29, 14) Source(2, 14) + SourceIndex(0) -5 >Emitted(29, 16) Source(2, 16) + SourceIndex(0) -6 >Emitted(29, 17) Source(2, 17) + SourceIndex(0) +1->Emitted(28, 1) Source(2, 1) + SourceIndex(3) +2 >Emitted(28, 2) Source(2, 2) + SourceIndex(3) +3 >Emitted(28, 3) Source(2, 3) + SourceIndex(3) +4 >Emitted(28, 14) Source(2, 14) + SourceIndex(3) +5 >Emitted(28, 16) Source(2, 16) + SourceIndex(3) +6 >Emitted(28, 17) Source(2, 17) + SourceIndex(3) --- >>>//# sourceMappingURL=third-output.js.map diff --git a/tests/baselines/reference/outFile-strict-in-all-projects.js b/tests/baselines/reference/outFile-strict-in-all-projects.js index 452fb3c3a90..064d026269e 100644 --- a/tests/baselines/reference/outFile-strict-in-all-projects.js +++ b/tests/baselines/reference/outFile-strict-in-all-projects.js @@ -998,7 +998,6 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.js] "use strict"; -"use strict"; var s = "Hello, world"; console.log(s); console.log(f()); @@ -1006,7 +1005,6 @@ function f() { return "JS does hoists"; } //# sourceMappingURL=first-output.js.map -"use strict"; var N; (function (N) { function f() { @@ -1028,21 +1026,20 @@ c.doSomething(); //# sourceMappingURL=third-output.js.map //// [/src/third/thirdjs/output/third-output.js.map] -{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../third_part1.ts","../../../first/first_PART1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts"],"names":[],"mappings":";;ACIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;ACVf,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;;;ACED,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;;ALJD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC"} +{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../../first/first_PART1.ts","../../third_part1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts"],"names":[],"mappings":";AAIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AEVf,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;;ACED,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;;AJJD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC"} //// [/src/third/thirdjs/output/third-output.js.map.baseline.txt] =================================================================== JsFile: third-output.js mapUrl: third-output.js.map sourceRoot: -sources: ../../third_part1.ts,../../../first/first_PART1.ts,../../../first/first_part2.ts,../../../first/first_part3.ts,../../../second/second_part1.ts,../../../second/second_part2.ts +sources: ../../../first/first_PART1.ts,../../third_part1.ts,../../../first/first_part2.ts,../../../first/first_part3.ts,../../../second/second_part1.ts,../../../second/second_part2.ts =================================================================== ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js sourceFile:../../../first/first_PART1.ts ------------------------------------------------------------------- >>>"use strict"; ->>>"use strict"; >>>var s = "Hello, world"; 1 > 2 >^^^^ @@ -1060,12 +1057,12 @@ sourceFile:../../../first/first_PART1.ts 4 > = 5 > "Hello, world" 6 > ; -1 >Emitted(3, 1) Source(5, 1) + SourceIndex(1) -2 >Emitted(3, 5) Source(5, 7) + SourceIndex(1) -3 >Emitted(3, 6) Source(5, 8) + SourceIndex(1) -4 >Emitted(3, 9) Source(5, 11) + SourceIndex(1) -5 >Emitted(3, 23) Source(5, 25) + SourceIndex(1) -6 >Emitted(3, 24) Source(5, 26) + SourceIndex(1) +1 >Emitted(2, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(2, 5) Source(5, 7) + SourceIndex(0) +3 >Emitted(2, 6) Source(5, 8) + SourceIndex(0) +4 >Emitted(2, 9) Source(5, 11) + SourceIndex(0) +5 >Emitted(2, 23) Source(5, 25) + SourceIndex(0) +6 >Emitted(2, 24) Source(5, 26) + SourceIndex(0) --- >>>console.log(s); 1 > @@ -1091,14 +1088,14 @@ sourceFile:../../../first/first_PART1.ts 6 > s 7 > ) 8 > ; -1 >Emitted(4, 1) Source(11, 1) + SourceIndex(1) -2 >Emitted(4, 8) Source(11, 8) + SourceIndex(1) -3 >Emitted(4, 9) Source(11, 9) + SourceIndex(1) -4 >Emitted(4, 12) Source(11, 12) + SourceIndex(1) -5 >Emitted(4, 13) Source(11, 13) + SourceIndex(1) -6 >Emitted(4, 14) Source(11, 14) + SourceIndex(1) -7 >Emitted(4, 15) Source(11, 15) + SourceIndex(1) -8 >Emitted(4, 16) Source(11, 16) + SourceIndex(1) +1 >Emitted(3, 1) Source(11, 1) + SourceIndex(0) +2 >Emitted(3, 8) Source(11, 8) + SourceIndex(0) +3 >Emitted(3, 9) Source(11, 9) + SourceIndex(0) +4 >Emitted(3, 12) Source(11, 12) + SourceIndex(0) +5 >Emitted(3, 13) Source(11, 13) + SourceIndex(0) +6 >Emitted(3, 14) Source(11, 14) + SourceIndex(0) +7 >Emitted(3, 15) Source(11, 15) + SourceIndex(0) +8 >Emitted(3, 16) Source(11, 16) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -1123,15 +1120,15 @@ sourceFile:../../../first/first_part2.ts 7 > () 8 > ) 9 > ; -1->Emitted(5, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(5, 8) Source(1, 8) + SourceIndex(2) -3 >Emitted(5, 9) Source(1, 9) + SourceIndex(2) -4 >Emitted(5, 12) Source(1, 12) + SourceIndex(2) -5 >Emitted(5, 13) Source(1, 13) + SourceIndex(2) -6 >Emitted(5, 14) Source(1, 14) + SourceIndex(2) -7 >Emitted(5, 16) Source(1, 16) + SourceIndex(2) -8 >Emitted(5, 17) Source(1, 17) + SourceIndex(2) -9 >Emitted(5, 18) Source(1, 18) + SourceIndex(2) +1->Emitted(4, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(4, 8) Source(1, 8) + SourceIndex(2) +3 >Emitted(4, 9) Source(1, 9) + SourceIndex(2) +4 >Emitted(4, 12) Source(1, 12) + SourceIndex(2) +5 >Emitted(4, 13) Source(1, 13) + SourceIndex(2) +6 >Emitted(4, 14) Source(1, 14) + SourceIndex(2) +7 >Emitted(4, 16) Source(1, 16) + SourceIndex(2) +8 >Emitted(4, 17) Source(1, 17) + SourceIndex(2) +9 >Emitted(4, 18) Source(1, 18) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -1145,9 +1142,9 @@ sourceFile:../../../first/first_part3.ts 1 > 2 >function 3 > f -1 >Emitted(6, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(6, 10) Source(1, 10) + SourceIndex(3) -3 >Emitted(6, 11) Source(1, 11) + SourceIndex(3) +1 >Emitted(5, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(5, 10) Source(1, 10) + SourceIndex(3) +3 >Emitted(5, 11) Source(1, 11) + SourceIndex(3) --- >>> return "JS does hoists"; 1->^^^^ @@ -1159,10 +1156,10 @@ sourceFile:../../../first/first_part3.ts 2 > return 3 > "JS does hoists" 4 > ; -1->Emitted(7, 5) Source(2, 5) + SourceIndex(3) -2 >Emitted(7, 12) Source(2, 12) + SourceIndex(3) -3 >Emitted(7, 28) Source(2, 28) + SourceIndex(3) -4 >Emitted(7, 29) Source(2, 29) + SourceIndex(3) +1->Emitted(6, 5) Source(2, 5) + SourceIndex(3) +2 >Emitted(6, 12) Source(2, 12) + SourceIndex(3) +3 >Emitted(6, 28) Source(2, 28) + SourceIndex(3) +4 >Emitted(6, 29) Source(2, 29) + SourceIndex(3) --- >>>} 1 > @@ -1171,15 +1168,14 @@ sourceFile:../../../first/first_part3.ts 1 > > 2 >} -1 >Emitted(8, 1) Source(3, 1) + SourceIndex(3) -2 >Emitted(8, 2) Source(3, 2) + SourceIndex(3) +1 >Emitted(7, 1) Source(3, 1) + SourceIndex(3) +2 >Emitted(7, 2) Source(3, 2) + SourceIndex(3) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js sourceFile:../../../second/second_part1.ts ------------------------------------------------------------------- >>>//# sourceMappingURL=first-output.js.map ->>>"use strict"; >>>var N; 1-> 2 >^^^^ @@ -1200,10 +1196,10 @@ sourceFile:../../../second/second_part1.ts > > f(); > } -1->Emitted(11, 1) Source(5, 1) + SourceIndex(4) -2 >Emitted(11, 5) Source(5, 11) + SourceIndex(4) -3 >Emitted(11, 6) Source(5, 12) + SourceIndex(4) -4 >Emitted(11, 7) Source(11, 2) + SourceIndex(4) +1->Emitted(9, 1) Source(5, 1) + SourceIndex(4) +2 >Emitted(9, 5) Source(5, 11) + SourceIndex(4) +3 >Emitted(9, 6) Source(5, 12) + SourceIndex(4) +4 >Emitted(9, 7) Source(11, 2) + SourceIndex(4) --- >>>(function (N) { 1-> @@ -1213,9 +1209,9 @@ sourceFile:../../../second/second_part1.ts 1-> 2 >namespace 3 > N -1->Emitted(12, 1) Source(5, 1) + SourceIndex(4) -2 >Emitted(12, 12) Source(5, 11) + SourceIndex(4) -3 >Emitted(12, 13) Source(5, 12) + SourceIndex(4) +1->Emitted(10, 1) Source(5, 1) + SourceIndex(4) +2 >Emitted(10, 12) Source(5, 11) + SourceIndex(4) +3 >Emitted(10, 13) Source(5, 12) + SourceIndex(4) --- >>> function f() { 1->^^^^ @@ -1226,9 +1222,9 @@ sourceFile:../../../second/second_part1.ts > 2 > function 3 > f -1->Emitted(13, 5) Source(6, 5) + SourceIndex(4) -2 >Emitted(13, 14) Source(6, 14) + SourceIndex(4) -3 >Emitted(13, 15) Source(6, 15) + SourceIndex(4) +1->Emitted(11, 5) Source(6, 5) + SourceIndex(4) +2 >Emitted(11, 14) Source(6, 14) + SourceIndex(4) +3 >Emitted(11, 15) Source(6, 15) + SourceIndex(4) --- >>> console.log('testing'); 1->^^^^^^^^ @@ -1248,14 +1244,14 @@ sourceFile:../../../second/second_part1.ts 6 > 'testing' 7 > ) 8 > ; -1->Emitted(14, 9) Source(7, 9) + SourceIndex(4) -2 >Emitted(14, 16) Source(7, 16) + SourceIndex(4) -3 >Emitted(14, 17) Source(7, 17) + SourceIndex(4) -4 >Emitted(14, 20) Source(7, 20) + SourceIndex(4) -5 >Emitted(14, 21) Source(7, 21) + SourceIndex(4) -6 >Emitted(14, 30) Source(7, 30) + SourceIndex(4) -7 >Emitted(14, 31) Source(7, 31) + SourceIndex(4) -8 >Emitted(14, 32) Source(7, 32) + SourceIndex(4) +1->Emitted(12, 9) Source(7, 9) + SourceIndex(4) +2 >Emitted(12, 16) Source(7, 16) + SourceIndex(4) +3 >Emitted(12, 17) Source(7, 17) + SourceIndex(4) +4 >Emitted(12, 20) Source(7, 20) + SourceIndex(4) +5 >Emitted(12, 21) Source(7, 21) + SourceIndex(4) +6 >Emitted(12, 30) Source(7, 30) + SourceIndex(4) +7 >Emitted(12, 31) Source(7, 31) + SourceIndex(4) +8 >Emitted(12, 32) Source(7, 32) + SourceIndex(4) --- >>> } 1 >^^^^ @@ -1264,8 +1260,8 @@ sourceFile:../../../second/second_part1.ts 1 > > 2 > } -1 >Emitted(15, 5) Source(8, 5) + SourceIndex(4) -2 >Emitted(15, 6) Source(8, 6) + SourceIndex(4) +1 >Emitted(13, 5) Source(8, 5) + SourceIndex(4) +2 >Emitted(13, 6) Source(8, 6) + SourceIndex(4) --- >>> f(); 1->^^^^ @@ -1279,10 +1275,10 @@ sourceFile:../../../second/second_part1.ts 2 > f 3 > () 4 > ; -1->Emitted(16, 5) Source(10, 5) + SourceIndex(4) -2 >Emitted(16, 6) Source(10, 6) + SourceIndex(4) -3 >Emitted(16, 8) Source(10, 8) + SourceIndex(4) -4 >Emitted(16, 9) Source(10, 9) + SourceIndex(4) +1->Emitted(14, 5) Source(10, 5) + SourceIndex(4) +2 >Emitted(14, 6) Source(10, 6) + SourceIndex(4) +3 >Emitted(14, 8) Source(10, 8) + SourceIndex(4) +4 >Emitted(14, 9) Source(10, 9) + SourceIndex(4) --- >>>})(N || (N = {})); 1-> @@ -1307,13 +1303,13 @@ sourceFile:../../../second/second_part1.ts > > f(); > } -1->Emitted(17, 1) Source(11, 1) + SourceIndex(4) -2 >Emitted(17, 2) Source(11, 2) + SourceIndex(4) -3 >Emitted(17, 4) Source(5, 11) + SourceIndex(4) -4 >Emitted(17, 5) Source(5, 12) + SourceIndex(4) -5 >Emitted(17, 10) Source(5, 11) + SourceIndex(4) -6 >Emitted(17, 11) Source(5, 12) + SourceIndex(4) -7 >Emitted(17, 19) Source(11, 2) + SourceIndex(4) +1->Emitted(15, 1) Source(11, 1) + SourceIndex(4) +2 >Emitted(15, 2) Source(11, 2) + SourceIndex(4) +3 >Emitted(15, 4) Source(5, 11) + SourceIndex(4) +4 >Emitted(15, 5) Source(5, 12) + SourceIndex(4) +5 >Emitted(15, 10) Source(5, 11) + SourceIndex(4) +6 >Emitted(15, 11) Source(5, 12) + SourceIndex(4) +7 >Emitted(15, 19) Source(11, 2) + SourceIndex(4) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -1323,13 +1319,13 @@ sourceFile:../../../second/second_part2.ts 1-> 2 >^^^^^^^^^^^^^^^^^^^-> 1-> -1->Emitted(18, 1) Source(1, 1) + SourceIndex(5) +1->Emitted(16, 1) Source(1, 1) + SourceIndex(5) --- >>> function C() { 1->^^^^ 2 > ^^-> 1-> -1->Emitted(19, 5) Source(1, 1) + SourceIndex(5) +1->Emitted(17, 5) Source(1, 1) + SourceIndex(5) --- >>> } 1->^^^^ @@ -1341,8 +1337,8 @@ sourceFile:../../../second/second_part2.ts > } > 2 > } -1->Emitted(20, 5) Source(5, 1) + SourceIndex(5) -2 >Emitted(20, 6) Source(5, 2) + SourceIndex(5) +1->Emitted(18, 5) Source(5, 1) + SourceIndex(5) +2 >Emitted(18, 6) Source(5, 2) + SourceIndex(5) --- >>> C.prototype.doSomething = function () { 1->^^^^ @@ -1352,9 +1348,9 @@ sourceFile:../../../second/second_part2.ts 1-> 2 > doSomething 3 > -1->Emitted(21, 5) Source(2, 5) + SourceIndex(5) -2 >Emitted(21, 28) Source(2, 16) + SourceIndex(5) -3 >Emitted(21, 31) Source(2, 5) + SourceIndex(5) +1->Emitted(19, 5) Source(2, 5) + SourceIndex(5) +2 >Emitted(19, 28) Source(2, 16) + SourceIndex(5) +3 >Emitted(19, 31) Source(2, 5) + SourceIndex(5) --- >>> console.log("something got done"); 1->^^^^^^^^ @@ -1374,14 +1370,14 @@ sourceFile:../../../second/second_part2.ts 6 > "something got done" 7 > ) 8 > ; -1->Emitted(22, 9) Source(3, 9) + SourceIndex(5) -2 >Emitted(22, 16) Source(3, 16) + SourceIndex(5) -3 >Emitted(22, 17) Source(3, 17) + SourceIndex(5) -4 >Emitted(22, 20) Source(3, 20) + SourceIndex(5) -5 >Emitted(22, 21) Source(3, 21) + SourceIndex(5) -6 >Emitted(22, 41) Source(3, 41) + SourceIndex(5) -7 >Emitted(22, 42) Source(3, 42) + SourceIndex(5) -8 >Emitted(22, 43) Source(3, 43) + SourceIndex(5) +1->Emitted(20, 9) Source(3, 9) + SourceIndex(5) +2 >Emitted(20, 16) Source(3, 16) + SourceIndex(5) +3 >Emitted(20, 17) Source(3, 17) + SourceIndex(5) +4 >Emitted(20, 20) Source(3, 20) + SourceIndex(5) +5 >Emitted(20, 21) Source(3, 21) + SourceIndex(5) +6 >Emitted(20, 41) Source(3, 41) + SourceIndex(5) +7 >Emitted(20, 42) Source(3, 42) + SourceIndex(5) +8 >Emitted(20, 43) Source(3, 43) + SourceIndex(5) --- >>> }; 1 >^^^^ @@ -1390,8 +1386,8 @@ sourceFile:../../../second/second_part2.ts 1 > > 2 > } -1 >Emitted(23, 5) Source(4, 5) + SourceIndex(5) -2 >Emitted(23, 6) Source(4, 6) + SourceIndex(5) +1 >Emitted(21, 5) Source(4, 5) + SourceIndex(5) +2 >Emitted(21, 6) Source(4, 6) + SourceIndex(5) --- >>> return C; 1->^^^^ @@ -1399,8 +1395,8 @@ sourceFile:../../../second/second_part2.ts 1-> > 2 > } -1->Emitted(24, 5) Source(5, 1) + SourceIndex(5) -2 >Emitted(24, 13) Source(5, 2) + SourceIndex(5) +1->Emitted(22, 5) Source(5, 1) + SourceIndex(5) +2 >Emitted(22, 13) Source(5, 2) + SourceIndex(5) --- >>>}()); 1 > @@ -1416,10 +1412,10 @@ sourceFile:../../../second/second_part2.ts > console.log("something got done"); > } > } -1 >Emitted(25, 1) Source(5, 1) + SourceIndex(5) -2 >Emitted(25, 2) Source(5, 2) + SourceIndex(5) -3 >Emitted(25, 2) Source(1, 1) + SourceIndex(5) -4 >Emitted(25, 6) Source(5, 2) + SourceIndex(5) +1 >Emitted(23, 1) Source(5, 1) + SourceIndex(5) +2 >Emitted(23, 2) Source(5, 2) + SourceIndex(5) +3 >Emitted(23, 2) Source(1, 1) + SourceIndex(5) +4 >Emitted(23, 6) Source(5, 2) + SourceIndex(5) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -1444,14 +1440,14 @@ sourceFile:../../third_part1.ts 6 > C 7 > () 8 > ; -1->Emitted(27, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(27, 5) Source(1, 5) + SourceIndex(0) -3 >Emitted(27, 6) Source(1, 6) + SourceIndex(0) -4 >Emitted(27, 9) Source(1, 9) + SourceIndex(0) -5 >Emitted(27, 13) Source(1, 13) + SourceIndex(0) -6 >Emitted(27, 14) Source(1, 14) + SourceIndex(0) -7 >Emitted(27, 16) Source(1, 16) + SourceIndex(0) -8 >Emitted(27, 17) Source(1, 17) + SourceIndex(0) +1->Emitted(25, 1) Source(1, 1) + SourceIndex(1) +2 >Emitted(25, 5) Source(1, 5) + SourceIndex(1) +3 >Emitted(25, 6) Source(1, 6) + SourceIndex(1) +4 >Emitted(25, 9) Source(1, 9) + SourceIndex(1) +5 >Emitted(25, 13) Source(1, 13) + SourceIndex(1) +6 >Emitted(25, 14) Source(1, 14) + SourceIndex(1) +7 >Emitted(25, 16) Source(1, 16) + SourceIndex(1) +8 >Emitted(25, 17) Source(1, 17) + SourceIndex(1) --- >>>c.doSomething(); 1-> @@ -1468,12 +1464,12 @@ sourceFile:../../third_part1.ts 4 > doSomething 5 > () 6 > ; -1->Emitted(28, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(28, 2) Source(2, 2) + SourceIndex(0) -3 >Emitted(28, 3) Source(2, 3) + SourceIndex(0) -4 >Emitted(28, 14) Source(2, 14) + SourceIndex(0) -5 >Emitted(28, 16) Source(2, 16) + SourceIndex(0) -6 >Emitted(28, 17) Source(2, 17) + SourceIndex(0) +1->Emitted(26, 1) Source(2, 1) + SourceIndex(1) +2 >Emitted(26, 2) Source(2, 2) + SourceIndex(1) +3 >Emitted(26, 3) Source(2, 3) + SourceIndex(1) +4 >Emitted(26, 14) Source(2, 14) + SourceIndex(1) +5 >Emitted(26, 16) Source(2, 16) + SourceIndex(1) +6 >Emitted(26, 17) Source(2, 17) + SourceIndex(1) --- >>>//# sourceMappingURL=third-output.js.map diff --git a/tests/baselines/reference/outFile-strict-in-one-dependency.js b/tests/baselines/reference/outFile-strict-in-one-dependency.js index 83fa287d64b..cd880759da2 100644 --- a/tests/baselines/reference/outFile-strict-in-one-dependency.js +++ b/tests/baselines/reference/outFile-strict-in-one-dependency.js @@ -973,6 +973,7 @@ sourceFile:../../third_part1.ts >>>//# sourceMappingURL=third-output.d.ts.map //// [/src/third/thirdjs/output/third-output.js] +"use strict"; var s = "Hello, world"; console.log(s); console.log(f()); @@ -980,7 +981,6 @@ function f() { return "JS does hoists"; } //# sourceMappingURL=first-output.js.map -"use strict"; var N; (function (N) { function f() { @@ -1002,19 +1002,20 @@ c.doSomething(); //# sourceMappingURL=third-output.js.map //// [/src/third/thirdjs/output/third-output.js.map] -{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../third_part1.ts","../../../first/first_PART1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts"],"names":[],"mappings":"ACIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;ACVf,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;;;ACED,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;ACVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;;ALJD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC"} +{"version":3,"file":"third-output.js","sourceRoot":"","sources":["../../../second/second_part1.ts","../../third_part1.ts","../../../first/first_PART1.ts","../../../first/first_part2.ts","../../../first/first_part3.ts","../../../second/second_part2.ts"],"names":[],"mappings":";AEIA,IAAM,CAAC,GAAG,cAAc,CAAC;AAMzB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;ACVf,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;ACAjB,SAAS,CAAC;IACN,OAAO,gBAAgB,CAAC;AAC5B,CAAC;;AJED,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACP,SAAS,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,CAAC,EAAE,CAAC;AACR,CAAC,EANS,CAAC,KAAD,CAAC,QAMV;AKVD;IAAA;IAIA,CAAC;IAHG,uBAAW,GAAX;QACI,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IACtC,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC;;AJJD,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AAChB,CAAC,CAAC,WAAW,EAAE,CAAC"} //// [/src/third/thirdjs/output/third-output.js.map.baseline.txt] =================================================================== JsFile: third-output.js mapUrl: third-output.js.map sourceRoot: -sources: ../../third_part1.ts,../../../first/first_PART1.ts,../../../first/first_part2.ts,../../../first/first_part3.ts,../../../second/second_part1.ts,../../../second/second_part2.ts +sources: ../../../second/second_part1.ts,../../third_part1.ts,../../../first/first_PART1.ts,../../../first/first_part2.ts,../../../first/first_part3.ts,../../../second/second_part2.ts =================================================================== ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js sourceFile:../../../first/first_PART1.ts ------------------------------------------------------------------- +>>>"use strict"; >>>var s = "Hello, world"; 1 > 2 >^^^^ @@ -1032,12 +1033,12 @@ sourceFile:../../../first/first_PART1.ts 4 > = 5 > "Hello, world" 6 > ; -1 >Emitted(1, 1) Source(5, 1) + SourceIndex(1) -2 >Emitted(1, 5) Source(5, 7) + SourceIndex(1) -3 >Emitted(1, 6) Source(5, 8) + SourceIndex(1) -4 >Emitted(1, 9) Source(5, 11) + SourceIndex(1) -5 >Emitted(1, 23) Source(5, 25) + SourceIndex(1) -6 >Emitted(1, 24) Source(5, 26) + SourceIndex(1) +1 >Emitted(2, 1) Source(5, 1) + SourceIndex(2) +2 >Emitted(2, 5) Source(5, 7) + SourceIndex(2) +3 >Emitted(2, 6) Source(5, 8) + SourceIndex(2) +4 >Emitted(2, 9) Source(5, 11) + SourceIndex(2) +5 >Emitted(2, 23) Source(5, 25) + SourceIndex(2) +6 >Emitted(2, 24) Source(5, 26) + SourceIndex(2) --- >>>console.log(s); 1 > @@ -1063,14 +1064,14 @@ sourceFile:../../../first/first_PART1.ts 6 > s 7 > ) 8 > ; -1 >Emitted(2, 1) Source(11, 1) + SourceIndex(1) -2 >Emitted(2, 8) Source(11, 8) + SourceIndex(1) -3 >Emitted(2, 9) Source(11, 9) + SourceIndex(1) -4 >Emitted(2, 12) Source(11, 12) + SourceIndex(1) -5 >Emitted(2, 13) Source(11, 13) + SourceIndex(1) -6 >Emitted(2, 14) Source(11, 14) + SourceIndex(1) -7 >Emitted(2, 15) Source(11, 15) + SourceIndex(1) -8 >Emitted(2, 16) Source(11, 16) + SourceIndex(1) +1 >Emitted(3, 1) Source(11, 1) + SourceIndex(2) +2 >Emitted(3, 8) Source(11, 8) + SourceIndex(2) +3 >Emitted(3, 9) Source(11, 9) + SourceIndex(2) +4 >Emitted(3, 12) Source(11, 12) + SourceIndex(2) +5 >Emitted(3, 13) Source(11, 13) + SourceIndex(2) +6 >Emitted(3, 14) Source(11, 14) + SourceIndex(2) +7 >Emitted(3, 15) Source(11, 15) + SourceIndex(2) +8 >Emitted(3, 16) Source(11, 16) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -1095,15 +1096,15 @@ sourceFile:../../../first/first_part2.ts 7 > () 8 > ) 9 > ; -1->Emitted(3, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(3, 8) Source(1, 8) + SourceIndex(2) -3 >Emitted(3, 9) Source(1, 9) + SourceIndex(2) -4 >Emitted(3, 12) Source(1, 12) + SourceIndex(2) -5 >Emitted(3, 13) Source(1, 13) + SourceIndex(2) -6 >Emitted(3, 14) Source(1, 14) + SourceIndex(2) -7 >Emitted(3, 16) Source(1, 16) + SourceIndex(2) -8 >Emitted(3, 17) Source(1, 17) + SourceIndex(2) -9 >Emitted(3, 18) Source(1, 18) + SourceIndex(2) +1->Emitted(4, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(4, 8) Source(1, 8) + SourceIndex(3) +3 >Emitted(4, 9) Source(1, 9) + SourceIndex(3) +4 >Emitted(4, 12) Source(1, 12) + SourceIndex(3) +5 >Emitted(4, 13) Source(1, 13) + SourceIndex(3) +6 >Emitted(4, 14) Source(1, 14) + SourceIndex(3) +7 >Emitted(4, 16) Source(1, 16) + SourceIndex(3) +8 >Emitted(4, 17) Source(1, 17) + SourceIndex(3) +9 >Emitted(4, 18) Source(1, 18) + SourceIndex(3) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -1117,9 +1118,9 @@ sourceFile:../../../first/first_part3.ts 1 > 2 >function 3 > f -1 >Emitted(4, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(4, 10) Source(1, 10) + SourceIndex(3) -3 >Emitted(4, 11) Source(1, 11) + SourceIndex(3) +1 >Emitted(5, 1) Source(1, 1) + SourceIndex(4) +2 >Emitted(5, 10) Source(1, 10) + SourceIndex(4) +3 >Emitted(5, 11) Source(1, 11) + SourceIndex(4) --- >>> return "JS does hoists"; 1->^^^^ @@ -1131,10 +1132,10 @@ sourceFile:../../../first/first_part3.ts 2 > return 3 > "JS does hoists" 4 > ; -1->Emitted(5, 5) Source(2, 5) + SourceIndex(3) -2 >Emitted(5, 12) Source(2, 12) + SourceIndex(3) -3 >Emitted(5, 28) Source(2, 28) + SourceIndex(3) -4 >Emitted(5, 29) Source(2, 29) + SourceIndex(3) +1->Emitted(6, 5) Source(2, 5) + SourceIndex(4) +2 >Emitted(6, 12) Source(2, 12) + SourceIndex(4) +3 >Emitted(6, 28) Source(2, 28) + SourceIndex(4) +4 >Emitted(6, 29) Source(2, 29) + SourceIndex(4) --- >>>} 1 > @@ -1143,15 +1144,14 @@ sourceFile:../../../first/first_part3.ts 1 > > 2 >} -1 >Emitted(6, 1) Source(3, 1) + SourceIndex(3) -2 >Emitted(6, 2) Source(3, 2) + SourceIndex(3) +1 >Emitted(7, 1) Source(3, 1) + SourceIndex(4) +2 >Emitted(7, 2) Source(3, 2) + SourceIndex(4) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js sourceFile:../../../second/second_part1.ts ------------------------------------------------------------------- >>>//# sourceMappingURL=first-output.js.map ->>>"use strict"; >>>var N; 1-> 2 >^^^^ @@ -1172,10 +1172,10 @@ sourceFile:../../../second/second_part1.ts > > f(); > } -1->Emitted(9, 1) Source(5, 1) + SourceIndex(4) -2 >Emitted(9, 5) Source(5, 11) + SourceIndex(4) -3 >Emitted(9, 6) Source(5, 12) + SourceIndex(4) -4 >Emitted(9, 7) Source(11, 2) + SourceIndex(4) +1->Emitted(9, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(9, 5) Source(5, 11) + SourceIndex(0) +3 >Emitted(9, 6) Source(5, 12) + SourceIndex(0) +4 >Emitted(9, 7) Source(11, 2) + SourceIndex(0) --- >>>(function (N) { 1-> @@ -1185,9 +1185,9 @@ sourceFile:../../../second/second_part1.ts 1-> 2 >namespace 3 > N -1->Emitted(10, 1) Source(5, 1) + SourceIndex(4) -2 >Emitted(10, 12) Source(5, 11) + SourceIndex(4) -3 >Emitted(10, 13) Source(5, 12) + SourceIndex(4) +1->Emitted(10, 1) Source(5, 1) + SourceIndex(0) +2 >Emitted(10, 12) Source(5, 11) + SourceIndex(0) +3 >Emitted(10, 13) Source(5, 12) + SourceIndex(0) --- >>> function f() { 1->^^^^ @@ -1198,9 +1198,9 @@ sourceFile:../../../second/second_part1.ts > 2 > function 3 > f -1->Emitted(11, 5) Source(6, 5) + SourceIndex(4) -2 >Emitted(11, 14) Source(6, 14) + SourceIndex(4) -3 >Emitted(11, 15) Source(6, 15) + SourceIndex(4) +1->Emitted(11, 5) Source(6, 5) + SourceIndex(0) +2 >Emitted(11, 14) Source(6, 14) + SourceIndex(0) +3 >Emitted(11, 15) Source(6, 15) + SourceIndex(0) --- >>> console.log('testing'); 1->^^^^^^^^ @@ -1220,14 +1220,14 @@ sourceFile:../../../second/second_part1.ts 6 > 'testing' 7 > ) 8 > ; -1->Emitted(12, 9) Source(7, 9) + SourceIndex(4) -2 >Emitted(12, 16) Source(7, 16) + SourceIndex(4) -3 >Emitted(12, 17) Source(7, 17) + SourceIndex(4) -4 >Emitted(12, 20) Source(7, 20) + SourceIndex(4) -5 >Emitted(12, 21) Source(7, 21) + SourceIndex(4) -6 >Emitted(12, 30) Source(7, 30) + SourceIndex(4) -7 >Emitted(12, 31) Source(7, 31) + SourceIndex(4) -8 >Emitted(12, 32) Source(7, 32) + SourceIndex(4) +1->Emitted(12, 9) Source(7, 9) + SourceIndex(0) +2 >Emitted(12, 16) Source(7, 16) + SourceIndex(0) +3 >Emitted(12, 17) Source(7, 17) + SourceIndex(0) +4 >Emitted(12, 20) Source(7, 20) + SourceIndex(0) +5 >Emitted(12, 21) Source(7, 21) + SourceIndex(0) +6 >Emitted(12, 30) Source(7, 30) + SourceIndex(0) +7 >Emitted(12, 31) Source(7, 31) + SourceIndex(0) +8 >Emitted(12, 32) Source(7, 32) + SourceIndex(0) --- >>> } 1 >^^^^ @@ -1236,8 +1236,8 @@ sourceFile:../../../second/second_part1.ts 1 > > 2 > } -1 >Emitted(13, 5) Source(8, 5) + SourceIndex(4) -2 >Emitted(13, 6) Source(8, 6) + SourceIndex(4) +1 >Emitted(13, 5) Source(8, 5) + SourceIndex(0) +2 >Emitted(13, 6) Source(8, 6) + SourceIndex(0) --- >>> f(); 1->^^^^ @@ -1251,10 +1251,10 @@ sourceFile:../../../second/second_part1.ts 2 > f 3 > () 4 > ; -1->Emitted(14, 5) Source(10, 5) + SourceIndex(4) -2 >Emitted(14, 6) Source(10, 6) + SourceIndex(4) -3 >Emitted(14, 8) Source(10, 8) + SourceIndex(4) -4 >Emitted(14, 9) Source(10, 9) + SourceIndex(4) +1->Emitted(14, 5) Source(10, 5) + SourceIndex(0) +2 >Emitted(14, 6) Source(10, 6) + SourceIndex(0) +3 >Emitted(14, 8) Source(10, 8) + SourceIndex(0) +4 >Emitted(14, 9) Source(10, 9) + SourceIndex(0) --- >>>})(N || (N = {})); 1-> @@ -1279,13 +1279,13 @@ sourceFile:../../../second/second_part1.ts > > f(); > } -1->Emitted(15, 1) Source(11, 1) + SourceIndex(4) -2 >Emitted(15, 2) Source(11, 2) + SourceIndex(4) -3 >Emitted(15, 4) Source(5, 11) + SourceIndex(4) -4 >Emitted(15, 5) Source(5, 12) + SourceIndex(4) -5 >Emitted(15, 10) Source(5, 11) + SourceIndex(4) -6 >Emitted(15, 11) Source(5, 12) + SourceIndex(4) -7 >Emitted(15, 19) Source(11, 2) + SourceIndex(4) +1->Emitted(15, 1) Source(11, 1) + SourceIndex(0) +2 >Emitted(15, 2) Source(11, 2) + SourceIndex(0) +3 >Emitted(15, 4) Source(5, 11) + SourceIndex(0) +4 >Emitted(15, 5) Source(5, 12) + SourceIndex(0) +5 >Emitted(15, 10) Source(5, 11) + SourceIndex(0) +6 >Emitted(15, 11) Source(5, 12) + SourceIndex(0) +7 >Emitted(15, 19) Source(11, 2) + SourceIndex(0) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.js @@ -1416,14 +1416,14 @@ sourceFile:../../third_part1.ts 6 > C 7 > () 8 > ; -1->Emitted(25, 1) Source(1, 1) + SourceIndex(0) -2 >Emitted(25, 5) Source(1, 5) + SourceIndex(0) -3 >Emitted(25, 6) Source(1, 6) + SourceIndex(0) -4 >Emitted(25, 9) Source(1, 9) + SourceIndex(0) -5 >Emitted(25, 13) Source(1, 13) + SourceIndex(0) -6 >Emitted(25, 14) Source(1, 14) + SourceIndex(0) -7 >Emitted(25, 16) Source(1, 16) + SourceIndex(0) -8 >Emitted(25, 17) Source(1, 17) + SourceIndex(0) +1->Emitted(25, 1) Source(1, 1) + SourceIndex(1) +2 >Emitted(25, 5) Source(1, 5) + SourceIndex(1) +3 >Emitted(25, 6) Source(1, 6) + SourceIndex(1) +4 >Emitted(25, 9) Source(1, 9) + SourceIndex(1) +5 >Emitted(25, 13) Source(1, 13) + SourceIndex(1) +6 >Emitted(25, 14) Source(1, 14) + SourceIndex(1) +7 >Emitted(25, 16) Source(1, 16) + SourceIndex(1) +8 >Emitted(25, 17) Source(1, 17) + SourceIndex(1) --- >>>c.doSomething(); 1-> @@ -1440,12 +1440,12 @@ sourceFile:../../third_part1.ts 4 > doSomething 5 > () 6 > ; -1->Emitted(26, 1) Source(2, 1) + SourceIndex(0) -2 >Emitted(26, 2) Source(2, 2) + SourceIndex(0) -3 >Emitted(26, 3) Source(2, 3) + SourceIndex(0) -4 >Emitted(26, 14) Source(2, 14) + SourceIndex(0) -5 >Emitted(26, 16) Source(2, 16) + SourceIndex(0) -6 >Emitted(26, 17) Source(2, 17) + SourceIndex(0) +1->Emitted(26, 1) Source(2, 1) + SourceIndex(1) +2 >Emitted(26, 2) Source(2, 2) + SourceIndex(1) +3 >Emitted(26, 3) Source(2, 3) + SourceIndex(1) +4 >Emitted(26, 14) Source(2, 14) + SourceIndex(1) +5 >Emitted(26, 16) Source(2, 16) + SourceIndex(1) +6 >Emitted(26, 17) Source(2, 17) + SourceIndex(1) --- >>>//# sourceMappingURL=third-output.js.map