diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts index d5c4ac0fc2f..14406d528fc 100644 --- a/src/compiler/factory.ts +++ b/src/compiler/factory.ts @@ -2701,7 +2701,7 @@ namespace ts { const node = createNode(SyntaxKind.UnparsedSource); if (!isString(textOrInputFiles)) { Debug.assert(mapPathOrType === "js" || mapPathOrType === "dts"); - node.fileName = mapPathOrType === "js" ? textOrInputFiles.javascriptPath : textOrInputFiles.declarationPath; + node.fileName = (mapPathOrType === "js" ? textOrInputFiles.javascriptPath : textOrInputFiles.declarationPath) || ""; node.sourceMapPath = mapPathOrType === "js" ? textOrInputFiles.javascriptMapPath : textOrInputFiles.declarationMapPath; Object.defineProperties(node, { text: { get() { return mapPathOrType === "js" ? textOrInputFiles.javascriptText : textOrInputFiles.declarationText; } }, @@ -2709,11 +2709,13 @@ namespace ts { }); } else { + node.fileName = ""; node.text = textOrInputFiles; node.sourceMapPath = mapPathOrType; node.sourceMapText = map; } const text = node.text; + node.languageVersion = ScriptTarget.Latest; // Shebang let pos = isShebangTrivia(text, 0) ? skipTrivia(text, 0, /*stopAfterLineBreak*/ true) : 0; @@ -2742,8 +2744,12 @@ namespace ts { (helpers || (helpers = [])).push(helperInfo.helper); } + // triple slash directives + const newPos = processCommentPragmas(node as {} as PragmaContext, text); + processPragmasIntoFields(node as {} as PragmaContext, noop); + // Rest of the text - node.pos = pos; + node.pos = newPos > pos ? newPos : pos; node.prologues = prologues || emptyArray; node.helpers = helpers; node.getLineAndCharacterOfPosition = pos => getLineAndCharacterOfPosition(node, pos); diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 92792c7a1a2..0f0727a6a93 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -7721,7 +7721,7 @@ namespace ts { } /*@internal*/ - export function processCommentPragmas(context: PragmaContext, sourceText: string): void { + export function processCommentPragmas(context: PragmaContext, sourceText: string) { const triviaScanner = createScanner(context.languageVersion, /*skipTrivia*/ false, LanguageVariant.Standard, sourceText); const pragmas: PragmaPseudoMapEntry[] = []; @@ -7758,6 +7758,7 @@ namespace ts { } context.pragmas.set(pragma!.name, pragma!.args); } + return triviaScanner.getStartPos(); } type PragmaDiagnosticReporter = (pos: number, length: number, message: DiagnosticMessage) => void; diff --git a/src/compiler/transformers/declarations.ts b/src/compiler/transformers/declarations.ts index 42bb5d77931..d2769114841 100644 --- a/src/compiler/transformers/declarations.ts +++ b/src/compiler/transformers/declarations.ts @@ -207,7 +207,11 @@ namespace ts { } ), mapDefined(node.prepends, prepend => { if (prepend.kind === SyntaxKind.InputFiles) { - return createUnparsedSourceFile(prepend, "dts"); + const sourceFile = createUnparsedSourceFile(prepend, "dts"); + hasNoDefaultLib = hasNoDefaultLib || !!sourceFile.hasNoDefaultLib; + collectReferences(sourceFile, refs); + collectLibs(sourceFile, libs); + return sourceFile; } })); bundle.syntheticFileReferences = []; @@ -311,8 +315,8 @@ namespace ts { } } - function collectReferences(sourceFile: SourceFile, ret: Map) { - if (noResolve || isSourceFileJS(sourceFile)) return ret; + function collectReferences(sourceFile: SourceFile | UnparsedSource, ret: Map) { + if (noResolve || (!isUnparsedSource(sourceFile) && isSourceFileJS(sourceFile))) return ret; forEach(sourceFile.referencedFiles, f => { const elem = tryResolveScriptReference(host, sourceFile, f); if (elem) { @@ -322,7 +326,7 @@ namespace ts { return ret; } - function collectLibs(sourceFile: SourceFile, ret: Map) { + function collectLibs(sourceFile: SourceFile | UnparsedSource, ret: Map) { forEach(sourceFile.libReferenceDirectives, ref => { const lib = host.getLibFileFromReference(ref); if (lib) { diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 86f6fa6b3d6..ccabee7b0da 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -2774,10 +2774,15 @@ namespace ts { export interface UnparsedSource extends Node { kind: SyntaxKind.UnparsedSource; - fileName?: string; + fileName: string; text: string; + languageVersion: ScriptTarget; prologues: ReadonlyArray; helpers: ReadonlyArray | undefined; + referencedFiles: FileReference[]; + typeReferenceDirectives: FileReference[]; + libReferenceDirectives: FileReference[]; + hasNoDefaultLib?: boolean; sourceMapPath?: string; sourceMapText?: string; /*@internal*/ parsedSourceMap?: RawSourceMap | false | undefined; diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 75aa53e7115..5a66f687afd 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -2557,7 +2557,7 @@ namespace ts { return undefined; } - export function tryResolveScriptReference(host: ScriptReferenceHost, sourceFile: SourceFile, reference: FileReference) { + export function tryResolveScriptReference(host: ScriptReferenceHost, sourceFile: SourceFile | UnparsedSource, reference: FileReference) { if (!host.getCompilerOptions().noResolve) { const referenceFileName = isRootedDiskPath(reference.fileName) ? reference.fileName : combinePaths(getDirectoryPath(sourceFile.fileName), reference.fileName); return host.getSourceFile(referenceFileName); diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index 7cf90bb22f7..375a566f9a0 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -1738,10 +1738,15 @@ declare namespace ts { } interface UnparsedSource extends Node { kind: SyntaxKind.UnparsedSource; - fileName?: string; + fileName: string; text: string; + languageVersion: ScriptTarget; prologues: ReadonlyArray; helpers: ReadonlyArray | undefined; + referencedFiles: FileReference[]; + typeReferenceDirectives: FileReference[]; + libReferenceDirectives: FileReference[]; + hasNoDefaultLib?: boolean; sourceMapPath?: string; sourceMapText?: string; } diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index ca719655473..3ed51b00991 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -1738,10 +1738,15 @@ declare namespace ts { } interface UnparsedSource extends Node { kind: SyntaxKind.UnparsedSource; - fileName?: string; + fileName: string; text: string; + languageVersion: ScriptTarget; prologues: ReadonlyArray; helpers: ReadonlyArray | undefined; + referencedFiles: FileReference[]; + typeReferenceDirectives: FileReference[]; + libReferenceDirectives: FileReference[]; + hasNoDefaultLib?: boolean; sourceMapPath?: string; sourceMapText?: string; } diff --git a/tests/baselines/reference/outFile-triple-slash-refs-in-all-projects.js b/tests/baselines/reference/outFile-triple-slash-refs-in-all-projects.js index 8620fabdeb4..562f0d19346 100644 --- a/tests/baselines/reference/outFile-triple-slash-refs-in-all-projects.js +++ b/tests/baselines/reference/outFile-triple-slash-refs-in-all-projects.js @@ -824,7 +824,8 @@ declare class secondsecond_part1 { } //// [/src/third/thirdjs/output/third-output.d.ts] /// -/// +/// +/// interface TheFirst { none: any; } @@ -835,7 +836,6 @@ interface NoJsForHereEither { declare const first_part2Const: firstfirst_part2; declare function f(): string; //# sourceMappingURL=first-output.d.ts.map -/// declare const second_part1Const: secondsecond_part1; declare namespace N { } @@ -850,7 +850,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":["../../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":";;ACAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACPD,QAAA,MAAM,gBAAgB,kBAAyB,CAAC;ACDhD,iBAAS,CAAC,WAET;;;ACDD,QAAA,MAAM,iBAAiB,oBAA2B,CAAC;AACnD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;ACZD,cAAM,CAAC;IACH,WAAW;CAGd;;ALHD,QAAA,MAAM,gBAAgB,kBAAyB,CAAC;AAChD,QAAA,IAAI,CAAC,GAAU,CAAC"} +{"version":3,"file":"third-output.d.ts","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":";;;ACAA,UAAU,QAAQ;IACd,IAAI,EAAE,GAAG,CAAC;CACb;AAED,QAAA,MAAM,CAAC,iBAAiB,CAAC;AAEzB,UAAU,iBAAiB;IACvB,IAAI,EAAE,GAAG,CAAC;CACb;ACPD,QAAA,MAAM,gBAAgB,kBAAyB,CAAC;ACDhD,iBAAS,CAAC,WAET;;ACDD,QAAA,MAAM,iBAAiB,oBAA2B,CAAC;AACnD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;ACZD,cAAM,CAAC;IACH,WAAW;CAGd;;ALHD,QAAA,MAAM,gBAAgB,kBAAyB,CAAC;AAChD,QAAA,IAAI,CAAC,GAAU,CAAC"} //// [/src/third/thirdjs/output/third-output.d.ts.map.baseline.txt] =================================================================== @@ -864,7 +864,8 @@ emittedFile:/src/third/thirdjs/output/third-output.d.ts sourceFile:../../../first/first_PART1.ts ------------------------------------------------------------------- >>>/// ->>>/// +>>>/// +>>>/// >>>interface TheFirst { 1 > 2 >^^^^^^^^^^ @@ -872,9 +873,9 @@ sourceFile:../../../first/first_PART1.ts 1 > 2 >interface 3 > TheFirst -1 >Emitted(3, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(3, 11) Source(1, 11) + SourceIndex(1) -3 >Emitted(3, 19) Source(1, 19) + SourceIndex(1) +1 >Emitted(4, 1) Source(1, 1) + SourceIndex(1) +2 >Emitted(4, 11) Source(1, 11) + SourceIndex(1) +3 >Emitted(4, 19) Source(1, 19) + SourceIndex(1) --- >>> none: any; 1 >^^^^ @@ -888,18 +889,18 @@ sourceFile:../../../first/first_PART1.ts 3 > : 4 > any 5 > ; -1 >Emitted(4, 5) Source(2, 5) + SourceIndex(1) -2 >Emitted(4, 9) Source(2, 9) + SourceIndex(1) -3 >Emitted(4, 11) Source(2, 11) + SourceIndex(1) -4 >Emitted(4, 14) Source(2, 14) + SourceIndex(1) -5 >Emitted(4, 15) Source(2, 15) + SourceIndex(1) +1 >Emitted(5, 5) Source(2, 5) + SourceIndex(1) +2 >Emitted(5, 9) Source(2, 9) + SourceIndex(1) +3 >Emitted(5, 11) Source(2, 11) + SourceIndex(1) +4 >Emitted(5, 14) Source(2, 14) + SourceIndex(1) +5 >Emitted(5, 15) Source(2, 15) + SourceIndex(1) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(5, 2) Source(3, 2) + SourceIndex(1) +1 >Emitted(6, 2) Source(3, 2) + SourceIndex(1) --- >>>declare const s = "Hello, world"; 1-> @@ -916,12 +917,12 @@ sourceFile:../../../first/first_PART1.ts 4 > s 5 > = "Hello, world" 6 > ; -1->Emitted(6, 1) Source(5, 1) + SourceIndex(1) -2 >Emitted(6, 9) Source(5, 1) + SourceIndex(1) -3 >Emitted(6, 15) Source(5, 7) + SourceIndex(1) -4 >Emitted(6, 16) Source(5, 8) + SourceIndex(1) -5 >Emitted(6, 33) Source(5, 25) + SourceIndex(1) -6 >Emitted(6, 34) Source(5, 26) + SourceIndex(1) +1->Emitted(7, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(7, 9) Source(5, 1) + SourceIndex(1) +3 >Emitted(7, 15) Source(5, 7) + SourceIndex(1) +4 >Emitted(7, 16) Source(5, 8) + SourceIndex(1) +5 >Emitted(7, 33) Source(5, 25) + SourceIndex(1) +6 >Emitted(7, 34) Source(5, 26) + SourceIndex(1) --- >>>interface NoJsForHereEither { 1 > @@ -932,9 +933,9 @@ sourceFile:../../../first/first_PART1.ts > 2 >interface 3 > NoJsForHereEither -1 >Emitted(7, 1) Source(7, 1) + SourceIndex(1) -2 >Emitted(7, 11) Source(7, 11) + SourceIndex(1) -3 >Emitted(7, 28) Source(7, 28) + SourceIndex(1) +1 >Emitted(8, 1) Source(7, 1) + SourceIndex(1) +2 >Emitted(8, 11) Source(7, 11) + SourceIndex(1) +3 >Emitted(8, 28) Source(7, 28) + SourceIndex(1) --- >>> none: any; 1 >^^^^ @@ -948,18 +949,18 @@ sourceFile:../../../first/first_PART1.ts 3 > : 4 > any 5 > ; -1 >Emitted(8, 5) Source(8, 5) + SourceIndex(1) -2 >Emitted(8, 9) Source(8, 9) + SourceIndex(1) -3 >Emitted(8, 11) Source(8, 11) + SourceIndex(1) -4 >Emitted(8, 14) Source(8, 14) + SourceIndex(1) -5 >Emitted(8, 15) Source(8, 15) + SourceIndex(1) +1 >Emitted(9, 5) Source(8, 5) + SourceIndex(1) +2 >Emitted(9, 9) Source(8, 9) + SourceIndex(1) +3 >Emitted(9, 11) Source(8, 11) + SourceIndex(1) +4 >Emitted(9, 14) Source(8, 14) + SourceIndex(1) +5 >Emitted(9, 15) Source(8, 15) + SourceIndex(1) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(9, 2) Source(9, 2) + SourceIndex(1) +1 >Emitted(10, 2) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -979,12 +980,12 @@ sourceFile:../../../first/first_part2.ts 4 > first_part2Const 5 > = new firstfirst_part2() 6 > ; -1->Emitted(10, 1) Source(2, 1) + SourceIndex(2) -2 >Emitted(10, 9) Source(2, 1) + SourceIndex(2) -3 >Emitted(10, 15) Source(2, 7) + SourceIndex(2) -4 >Emitted(10, 31) Source(2, 23) + SourceIndex(2) -5 >Emitted(10, 49) Source(2, 48) + SourceIndex(2) -6 >Emitted(10, 50) Source(2, 49) + SourceIndex(2) +1->Emitted(11, 1) Source(2, 1) + SourceIndex(2) +2 >Emitted(11, 9) Source(2, 1) + SourceIndex(2) +3 >Emitted(11, 15) Source(2, 7) + SourceIndex(2) +4 >Emitted(11, 31) Source(2, 23) + SourceIndex(2) +5 >Emitted(11, 49) Source(2, 48) + SourceIndex(2) +6 >Emitted(11, 50) Source(2, 49) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -1002,17 +1003,16 @@ sourceFile:../../../first/first_part3.ts 4 > () { > return "JS does hoists"; > } -1 >Emitted(11, 1) Source(1, 1) + SourceIndex(3) -2 >Emitted(11, 18) Source(1, 10) + SourceIndex(3) -3 >Emitted(11, 19) Source(1, 11) + SourceIndex(3) -4 >Emitted(11, 30) Source(3, 2) + SourceIndex(3) +1 >Emitted(12, 1) Source(1, 1) + SourceIndex(3) +2 >Emitted(12, 18) Source(1, 10) + SourceIndex(3) +3 >Emitted(12, 19) Source(1, 11) + SourceIndex(3) +4 >Emitted(12, 30) Source(3, 2) + SourceIndex(3) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts sourceFile:../../../second/second_part1.ts ------------------------------------------------------------------- >>>//# sourceMappingURL=first-output.d.ts.map ->>>/// >>>declare const second_part1Const: secondsecond_part1; 1-> 2 >^^^^^^^^ diff --git a/tests/baselines/reference/outFile-triple-slash-refs-in-one-project.js b/tests/baselines/reference/outFile-triple-slash-refs-in-one-project.js index 5527edb2118..6cab168e42b 100644 --- a/tests/baselines/reference/outFile-triple-slash-refs-in-one-project.js +++ b/tests/baselines/reference/outFile-triple-slash-refs-in-one-project.js @@ -757,6 +757,7 @@ namespace N { declare class secondsecond_part1 { } //// [/src/third/thirdjs/output/third-output.d.ts] +/// interface TheFirst { none: any; } @@ -766,7 +767,6 @@ interface NoJsForHereEither { } declare function f(): string; //# sourceMappingURL=first-output.d.ts.map -/// declare const second_part1Const: secondsecond_part1; declare namespace N { } @@ -780,7 +780,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":["../../third_part1.ts","../../../first/first_PART1.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts"],"names":[],"mappings":"ACAA,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;;;ACDD,QAAA,MAAM,iBAAiB,oBAA2B,CAAC;AACnD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;ACZD,cAAM,CAAC;IACH,WAAW;CAGd;;AJJD,QAAA,IAAI,CAAC,GAAU,CAAC"} +{"version":3,"file":"third-output.d.ts","sourceRoot":"","sources":["../../third_part1.ts","../../../first/first_PART1.ts","../../../first/first_part3.ts","../../../second/second_part1.ts","../../../second/second_part2.ts"],"names":[],"mappings":";ACAA,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;;ACDD,QAAA,MAAM,iBAAiB,oBAA2B,CAAC;AACnD,kBAAU,CAAC,CAAC;CAEX;AAED,kBAAU,CAAC,CAAC;CAMX;ACZD,cAAM,CAAC;IACH,WAAW;CAGd;;AJJD,QAAA,IAAI,CAAC,GAAU,CAAC"} //// [/src/third/thirdjs/output/third-output.d.ts.map.baseline.txt] =================================================================== @@ -793,6 +793,7 @@ sources: ../../third_part1.ts,../../../first/first_PART1.ts,../../../first/first emittedFile:/src/third/thirdjs/output/third-output.d.ts sourceFile:../../../first/first_PART1.ts ------------------------------------------------------------------- +>>>/// >>>interface TheFirst { 1 > 2 >^^^^^^^^^^ @@ -800,9 +801,9 @@ sourceFile:../../../first/first_PART1.ts 1 > 2 >interface 3 > TheFirst -1 >Emitted(1, 1) Source(1, 1) + SourceIndex(1) -2 >Emitted(1, 11) Source(1, 11) + SourceIndex(1) -3 >Emitted(1, 19) Source(1, 19) + SourceIndex(1) +1 >Emitted(2, 1) Source(1, 1) + SourceIndex(1) +2 >Emitted(2, 11) Source(1, 11) + SourceIndex(1) +3 >Emitted(2, 19) Source(1, 19) + SourceIndex(1) --- >>> none: any; 1 >^^^^ @@ -816,18 +817,18 @@ sourceFile:../../../first/first_PART1.ts 3 > : 4 > any 5 > ; -1 >Emitted(2, 5) Source(2, 5) + SourceIndex(1) -2 >Emitted(2, 9) Source(2, 9) + SourceIndex(1) -3 >Emitted(2, 11) Source(2, 11) + SourceIndex(1) -4 >Emitted(2, 14) Source(2, 14) + SourceIndex(1) -5 >Emitted(2, 15) Source(2, 15) + SourceIndex(1) +1 >Emitted(3, 5) Source(2, 5) + SourceIndex(1) +2 >Emitted(3, 9) Source(2, 9) + SourceIndex(1) +3 >Emitted(3, 11) Source(2, 11) + SourceIndex(1) +4 >Emitted(3, 14) Source(2, 14) + SourceIndex(1) +5 >Emitted(3, 15) Source(2, 15) + SourceIndex(1) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(3, 2) Source(3, 2) + SourceIndex(1) +1 >Emitted(4, 2) Source(3, 2) + SourceIndex(1) --- >>>declare const s = "Hello, world"; 1-> @@ -844,12 +845,12 @@ sourceFile:../../../first/first_PART1.ts 4 > s 5 > = "Hello, world" 6 > ; -1->Emitted(4, 1) Source(5, 1) + SourceIndex(1) -2 >Emitted(4, 9) Source(5, 1) + SourceIndex(1) -3 >Emitted(4, 15) Source(5, 7) + SourceIndex(1) -4 >Emitted(4, 16) Source(5, 8) + SourceIndex(1) -5 >Emitted(4, 33) Source(5, 25) + SourceIndex(1) -6 >Emitted(4, 34) Source(5, 26) + SourceIndex(1) +1->Emitted(5, 1) Source(5, 1) + SourceIndex(1) +2 >Emitted(5, 9) Source(5, 1) + SourceIndex(1) +3 >Emitted(5, 15) Source(5, 7) + SourceIndex(1) +4 >Emitted(5, 16) Source(5, 8) + SourceIndex(1) +5 >Emitted(5, 33) Source(5, 25) + SourceIndex(1) +6 >Emitted(5, 34) Source(5, 26) + SourceIndex(1) --- >>>interface NoJsForHereEither { 1 > @@ -860,9 +861,9 @@ sourceFile:../../../first/first_PART1.ts > 2 >interface 3 > NoJsForHereEither -1 >Emitted(5, 1) Source(7, 1) + SourceIndex(1) -2 >Emitted(5, 11) Source(7, 11) + SourceIndex(1) -3 >Emitted(5, 28) Source(7, 28) + SourceIndex(1) +1 >Emitted(6, 1) Source(7, 1) + SourceIndex(1) +2 >Emitted(6, 11) Source(7, 11) + SourceIndex(1) +3 >Emitted(6, 28) Source(7, 28) + SourceIndex(1) --- >>> none: any; 1 >^^^^ @@ -876,18 +877,18 @@ sourceFile:../../../first/first_PART1.ts 3 > : 4 > any 5 > ; -1 >Emitted(6, 5) Source(8, 5) + SourceIndex(1) -2 >Emitted(6, 9) Source(8, 9) + SourceIndex(1) -3 >Emitted(6, 11) Source(8, 11) + SourceIndex(1) -4 >Emitted(6, 14) Source(8, 14) + SourceIndex(1) -5 >Emitted(6, 15) Source(8, 15) + SourceIndex(1) +1 >Emitted(7, 5) Source(8, 5) + SourceIndex(1) +2 >Emitted(7, 9) Source(8, 9) + SourceIndex(1) +3 >Emitted(7, 11) Source(8, 11) + SourceIndex(1) +4 >Emitted(7, 14) Source(8, 14) + SourceIndex(1) +5 >Emitted(7, 15) Source(8, 15) + SourceIndex(1) --- >>>} 1 >^ 2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-> 1 > >} -1 >Emitted(7, 2) Source(9, 2) + SourceIndex(1) +1 >Emitted(8, 2) Source(9, 2) + SourceIndex(1) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts @@ -905,17 +906,16 @@ sourceFile:../../../first/first_part3.ts 4 > () { > return "JS does hoists"; > } -1->Emitted(8, 1) Source(1, 1) + SourceIndex(2) -2 >Emitted(8, 18) Source(1, 10) + SourceIndex(2) -3 >Emitted(8, 19) Source(1, 11) + SourceIndex(2) -4 >Emitted(8, 30) Source(3, 2) + SourceIndex(2) +1->Emitted(9, 1) Source(1, 1) + SourceIndex(2) +2 >Emitted(9, 18) Source(1, 10) + SourceIndex(2) +3 >Emitted(9, 19) Source(1, 11) + SourceIndex(2) +4 >Emitted(9, 30) Source(3, 2) + SourceIndex(2) --- ------------------------------------------------------------------- emittedFile:/src/third/thirdjs/output/third-output.d.ts sourceFile:../../../second/second_part1.ts ------------------------------------------------------------------- >>>//# sourceMappingURL=first-output.d.ts.map ->>>/// >>>declare const second_part1Const: secondsecond_part1; 1-> 2 >^^^^^^^^