From 422b5414f1961be252fc7f705b6e2be8143c313f Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Mon, 20 May 2019 12:02:52 -0700 Subject: [PATCH 01/27] Allow synthetic identifiers to exist and give them escapedText --- src/services/services.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/services/services.ts b/src/services/services.ts index 9637b3c5321..6e4889e330e 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -172,10 +172,11 @@ namespace ts { const token = scanner.scan(); const textPos = scanner.getTextPos(); if (textPos <= end) { - if (token === SyntaxKind.Identifier) { - Debug.fail(`Did not expect ${Debug.showSyntaxKind(parent)} to have an Identifier in its trivia`); + const node = createNode(token, pos, textPos, parent); + nodes.push(node); + if (isIdentifier(node)) { + node.escapedText = escapeLeadingUnderscores(scanner.getTokenValue()); } - nodes.push(createNode(token, pos, textPos, parent)); } pos = textPos; if (token === SyntaxKind.EndOfFileToken) { From 0a3c755fc207d8d5843db4f5e059235b0e6dc67a Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Mon, 20 May 2019 12:26:12 -0700 Subject: [PATCH 02/27] Add test --- .../jsxExpressionFollowedByIdentifier.ts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 tests/cases/fourslash/jsxExpressionFollowedByIdentifier.ts diff --git a/tests/cases/fourslash/jsxExpressionFollowedByIdentifier.ts b/tests/cases/fourslash/jsxExpressionFollowedByIdentifier.ts new file mode 100644 index 00000000000..8d93244e01e --- /dev/null +++ b/tests/cases/fourslash/jsxExpressionFollowedByIdentifier.ts @@ -0,0 +1,18 @@ +/// + +//@Filename: jsxExpressionFollowedByIdentifier.tsx +////declare var React: any; +////declare var x: string; +////const a =
{
/*1*/x/*2*/}
+ +goTo.marker('1'); +verify.getSyntacticDiagnostics([{ + code: 1005, + message: "'}' expected.", + range: { + fileName: test.marker('1').fileName, + pos: test.marker('1').position, + end: test.marker('2').position, + } +}]); +verify.quickInfoIs('var x: string'); \ No newline at end of file From 897e10a81e3495c7749977a51cc4b82602f9ba03 Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Mon, 20 May 2019 14:58:25 -0700 Subject: [PATCH 03/27] Use range instead of two markers --- .../fourslash/jsxExpressionFollowedByIdentifier.ts | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/cases/fourslash/jsxExpressionFollowedByIdentifier.ts b/tests/cases/fourslash/jsxExpressionFollowedByIdentifier.ts index 8d93244e01e..3231ed9cf62 100644 --- a/tests/cases/fourslash/jsxExpressionFollowedByIdentifier.ts +++ b/tests/cases/fourslash/jsxExpressionFollowedByIdentifier.ts @@ -3,16 +3,12 @@ //@Filename: jsxExpressionFollowedByIdentifier.tsx ////declare var React: any; ////declare var x: string; -////const a =
{
/*1*/x/*2*/}
+////const a =
{
[|x|]}
-goTo.marker('1'); +const range = test.ranges()[0]; verify.getSyntacticDiagnostics([{ code: 1005, message: "'}' expected.", - range: { - fileName: test.marker('1').fileName, - pos: test.marker('1').position, - end: test.marker('2').position, - } + range, }]); -verify.quickInfoIs('var x: string'); \ No newline at end of file +verify.quickInfoAt(range, 'var x: string'); \ No newline at end of file From 77a76c157bf65a7589791ebd689f695172f04f4c Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Tue, 21 May 2019 09:45:08 -0700 Subject: [PATCH 04/27] Revert "Allow synthetic identifiers to exist and give them escapedText" This reverts commit 422b5414f1961be252fc7f705b6e2be8143c313f. --- src/services/services.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/services/services.ts b/src/services/services.ts index 6e4889e330e..9637b3c5321 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -172,11 +172,10 @@ namespace ts { const token = scanner.scan(); const textPos = scanner.getTextPos(); if (textPos <= end) { - const node = createNode(token, pos, textPos, parent); - nodes.push(node); - if (isIdentifier(node)) { - node.escapedText = escapeLeadingUnderscores(scanner.getTokenValue()); + if (token === SyntaxKind.Identifier) { + Debug.fail(`Did not expect ${Debug.showSyntaxKind(parent)} to have an Identifier in its trivia`); } + nodes.push(createNode(token, pos, textPos, parent)); } pos = textPos; if (token === SyntaxKind.EndOfFileToken) { From feaef9c8297e89a0df44f4e0e2d3d5e5aa9fead2 Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Tue, 21 May 2019 14:21:44 -0700 Subject: [PATCH 05/27] Improve error message for JSXExpressions that are comma expressions --- src/compiler/checker.ts | 7 +++++++ src/compiler/diagnosticMessages.json | 4 ++++ src/compiler/parser.ts | 5 ++++- src/harness/fourslash.ts | 18 ++++++++++++++++++ tests/cases/fourslash/fourslash.ts | 1 + .../jsxExpressionFollowedByIdentifier.ts | 1 + .../jsxExpressionWithCommaExpression.ts | 11 +++++++++++ 7 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 tests/cases/fourslash/jsxExpressionWithCommaExpression.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 18c1f42f838..d0efd490816 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -19850,6 +19850,7 @@ namespace ts { } function checkJsxExpression(node: JsxExpression, checkMode?: CheckMode) { + checkGrammarJsxExpression(node); if (node.expression) { const type = checkExpression(node.expression, checkMode); if (node.dotDotDotToken && type !== anyType && !isArrayType(type)) { @@ -31658,6 +31659,12 @@ namespace ts { } } + function checkGrammarJsxExpression(node: JsxExpression) { + if (node.expression && isCommaSequence(node.expression)) { + return grammarErrorOnNode(node.expression, Diagnostics.JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array); + } + } + function checkGrammarForInOrForOfStatement(forInOrOfStatement: ForInOrOfStatement): boolean { if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) { return true; diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 87101781ead..97e80f69b11 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -4986,5 +4986,9 @@ "Classes may not have a field named 'constructor'.": { "category": "Error", "code": 18006 + }, + "JSX expressions may not use the comma operator. Did you mean to write an array?": { + "category": "Error", + "code": 18007 } } diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index c38e4f67fe2..f3b0c2c06e6 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -4430,7 +4430,10 @@ namespace ts { if (token() !== SyntaxKind.CloseBraceToken) { node.dotDotDotToken = parseOptionalToken(SyntaxKind.DotDotDotToken); - node.expression = parseAssignmentExpressionOrHigher(); + // Only an AssignmentExpression is valid here per the JSX spec, + // but we can unambiguously parse a comma sequence and provide + // a better error message in grammar checking. + node.expression = parseExpression(); } if (inExpressionContext) { parseExpected(SyntaxKind.CloseBraceToken); diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index df7f0051f3f..a2e2c0f29af 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -582,6 +582,20 @@ namespace FourSlash { }); } + public verifyErrorExistsAtRange(range: Range, code: number) { + const span = ts.createTextSpanFromRange(range); + const hasMatchingError = ts.some( + this.getDiagnostics(range.fileName), + ({ code, start, length }) => + code === code && + ts.isNumber(start) && ts.isNumber(length) && + ts.textSpansEqual(span, { start, length })); + + if (!hasMatchingError) { + this.raiseError(`No error with code ${code} found at provided range.`); + } + } + public verifyNumberOfErrorsInCurrentFile(expected: number) { const errors = this.getDiagnostics(this.activeFile.fileName); const actual = errors.length; @@ -3968,6 +3982,10 @@ namespace FourSlashInterface { this.state.verifyNoErrors(); } + public errorExistsAtRange(range: FourSlash.Range, code: number) { + this.state.verifyErrorExistsAtRange(range, code); + } + public numberOfErrorsInCurrentFile(expected: number) { this.state.verifyNumberOfErrorsInCurrentFile(expected); } diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts index 4252296d5da..427a3558b31 100644 --- a/tests/cases/fourslash/fourslash.ts +++ b/tests/cases/fourslash/fourslash.ts @@ -238,6 +238,7 @@ declare namespace FourSlashInterface { signatureHelp(...options: VerifySignatureHelpOptions[], ): void; // Checks that there are no compile errors. noErrors(): void; + errorExistsAtRange(range: Range, code: number): void; numberOfErrorsInCurrentFile(expected: number): void; baselineCurrentFileBreakpointLocations(): void; baselineCurrentFileNameOrDottedNameSpans(): void; diff --git a/tests/cases/fourslash/jsxExpressionFollowedByIdentifier.ts b/tests/cases/fourslash/jsxExpressionFollowedByIdentifier.ts index 3231ed9cf62..d040bacd546 100644 --- a/tests/cases/fourslash/jsxExpressionFollowedByIdentifier.ts +++ b/tests/cases/fourslash/jsxExpressionFollowedByIdentifier.ts @@ -4,6 +4,7 @@ ////declare var React: any; ////declare var x: string; ////const a =
{
[|x|]}
+////const b =
[|x|]} /> const range = test.ranges()[0]; verify.getSyntacticDiagnostics([{ diff --git a/tests/cases/fourslash/jsxExpressionWithCommaExpression.ts b/tests/cases/fourslash/jsxExpressionWithCommaExpression.ts new file mode 100644 index 00000000000..829a2172364 --- /dev/null +++ b/tests/cases/fourslash/jsxExpressionWithCommaExpression.ts @@ -0,0 +1,11 @@ +/// + +//@Filename: jsxExpressionWithCommaExpression.tsx +//@jsx: react +////declare var React: any; +////declare var x: string; +////const a =
+////const b =
{[|x, x|]}
+ +verify.getSyntacticDiagnostics([]); +test.ranges().forEach(range => verify.errorExistsAtRange(range, 18006)); From 2856aabd70463e320ccc0afc9a0d813187d17d9d Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Tue, 21 May 2019 15:28:16 -0700 Subject: [PATCH 06/27] Parse stray identifier-ish as JSXText instead of trivia --- src/compiler/parser.ts | 5 +++-- src/harness/fourslash.ts | 9 +++++---- tests/cases/fourslash/fourslash.ts | 2 +- .../fourslash/jsxExpressionFollowedByIdentifier.ts | 13 +++++-------- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index f3b0c2c06e6..e56ff98846e 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -4439,8 +4439,9 @@ namespace ts { parseExpected(SyntaxKind.CloseBraceToken); } else { - parseExpected(SyntaxKind.CloseBraceToken, /*message*/ undefined, /*shouldAdvance*/ false); - scanJsxText(); + if (parseExpected(SyntaxKind.CloseBraceToken, /*message*/ undefined, /*shouldAdvance*/ false)) { + scanJsxText(); + } } return finishNode(node); diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index a2e2c0f29af..5d0725ea106 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -582,12 +582,13 @@ namespace FourSlash { }); } - public verifyErrorExistsAtRange(range: Range, code: number) { + public verifyErrorExistsAtRange(range: Range, code: number, expectedMessage?: string) { const span = ts.createTextSpanFromRange(range); const hasMatchingError = ts.some( this.getDiagnostics(range.fileName), - ({ code, start, length }) => + ({ code, messageText, start, length }) => code === code && + (!expectedMessage || expectedMessage === messageText) && ts.isNumber(start) && ts.isNumber(length) && ts.textSpansEqual(span, { start, length })); @@ -3982,8 +3983,8 @@ namespace FourSlashInterface { this.state.verifyNoErrors(); } - public errorExistsAtRange(range: FourSlash.Range, code: number) { - this.state.verifyErrorExistsAtRange(range, code); + public errorExistsAtRange(range: FourSlash.Range, code: number, message?: string) { + this.state.verifyErrorExistsAtRange(range, code, message); } public numberOfErrorsInCurrentFile(expected: number) { diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts index 427a3558b31..e6f2a08f002 100644 --- a/tests/cases/fourslash/fourslash.ts +++ b/tests/cases/fourslash/fourslash.ts @@ -238,7 +238,7 @@ declare namespace FourSlashInterface { signatureHelp(...options: VerifySignatureHelpOptions[], ): void; // Checks that there are no compile errors. noErrors(): void; - errorExistsAtRange(range: Range, code: number): void; + errorExistsAtRange(range: Range, code: number, message?: string): void; numberOfErrorsInCurrentFile(expected: number): void; baselineCurrentFileBreakpointLocations(): void; baselineCurrentFileNameOrDottedNameSpans(): void; diff --git a/tests/cases/fourslash/jsxExpressionFollowedByIdentifier.ts b/tests/cases/fourslash/jsxExpressionFollowedByIdentifier.ts index d040bacd546..501a325b989 100644 --- a/tests/cases/fourslash/jsxExpressionFollowedByIdentifier.ts +++ b/tests/cases/fourslash/jsxExpressionFollowedByIdentifier.ts @@ -2,14 +2,11 @@ //@Filename: jsxExpressionFollowedByIdentifier.tsx ////declare var React: any; -////declare var x: string; ////const a =
{
[|x|]}
////const b =
[|x|]} /> -const range = test.ranges()[0]; -verify.getSyntacticDiagnostics([{ - code: 1005, - message: "'}' expected.", - range, -}]); -verify.quickInfoAt(range, 'var x: string'); \ No newline at end of file +test.ranges().forEach(range => { + verify.errorExistsAtRange(range, 1005, "'}' expected."); + // This is just to ensure getting quick info doesn’t crash + verify.not.quickInfoExists(); +}); From 52894cf8500ec9b1b864d2118bb79d7b86cfe772 Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Tue, 21 May 2019 15:39:07 -0700 Subject: [PATCH 07/27] Accept baselines, I guess --- .../baselines/reference/jsxAndTypeAssertion.js | 11 +++++++---- .../reference/jsxInvalidEsprimaTestSuite.js | 2 +- .../reference/jsxParsingError1.errors.txt | 17 +++++++---------- tests/baselines/reference/jsxParsingError1.js | 3 +-- .../reference/jsxParsingError1.symbols | 2 +- .../baselines/reference/jsxParsingError1.types | 6 +++--- .../reference/tsxErrorRecovery1.errors.txt | 16 ++-------------- tests/baselines/reference/tsxErrorRecovery1.js | 8 +++----- .../reference/tsxErrorRecovery1.symbols | 2 ++ .../baselines/reference/tsxErrorRecovery1.types | 10 ++++++---- 10 files changed, 33 insertions(+), 44 deletions(-) diff --git a/tests/baselines/reference/jsxAndTypeAssertion.js b/tests/baselines/reference/jsxAndTypeAssertion.js index cf4033f4c57..fb51acd6fd4 100644 --- a/tests/baselines/reference/jsxAndTypeAssertion.js +++ b/tests/baselines/reference/jsxAndTypeAssertion.js @@ -28,18 +28,21 @@ var foo = /** @class */ (function () { return foo; }()); var x; -x = {test} }; +x = {test}: }; x = ; -x = hello {} } +x = hello {} }; x = }>hello}/> -x = }>hello{}} +x = }>hello{}}; x = x, x = ; {{/foo/.test(x) ? : }} : -}}}/>; +} + + +}}/>; diff --git a/tests/baselines/reference/jsxInvalidEsprimaTestSuite.js b/tests/baselines/reference/jsxInvalidEsprimaTestSuite.js index bf17ca57c0d..b04a03079b7 100644 --- a/tests/baselines/reference/jsxInvalidEsprimaTestSuite.js +++ b/tests/baselines/reference/jsxInvalidEsprimaTestSuite.js @@ -123,7 +123,7 @@ var x =
one
,
two
; var x =
one
/* intervening comment */, /* intervening comment */
two
; ; //// [20.jsx] -{"str"}}; +{"str"};}; //// [21.jsx] ; //// [22.jsx] diff --git a/tests/baselines/reference/jsxParsingError1.errors.txt b/tests/baselines/reference/jsxParsingError1.errors.txt index dec1228fd72..a3e4e0b4f25 100644 --- a/tests/baselines/reference/jsxParsingError1.errors.txt +++ b/tests/baselines/reference/jsxParsingError1.errors.txt @@ -1,9 +1,8 @@ -tests/cases/conformance/jsx/file.tsx(11,36): error TS1005: '}' expected. -tests/cases/conformance/jsx/file.tsx(11,44): error TS1003: Identifier expected. -tests/cases/conformance/jsx/file.tsx(11,46): error TS1161: Unterminated regular expression literal. +tests/cases/conformance/jsx/file.tsx(11,30): error TS2695: Left side of comma operator is unused and has no side effects. +tests/cases/conformance/jsx/file.tsx(11,30): error TS18007: JSX expressions may not use the comma operator. Did you mean to write an array? -==== tests/cases/conformance/jsx/file.tsx (3 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (2 errors) ==== declare module JSX { interface Element { } interface IntrinsicElements { @@ -15,10 +14,8 @@ tests/cases/conformance/jsx/file.tsx(11,46): error TS1161: Unterminated regular const class1 = "foo"; const class2 = "bar"; const elem =
; - ~ -!!! error TS1005: '}' expected. - ~ -!!! error TS1003: Identifier expected. - -!!! error TS1161: Unterminated regular expression literal. + ~~~~~~ +!!! error TS2695: Left side of comma operator is unused and has no side effects. + ~~~~~~~~~~~~~~ +!!! error TS18007: JSX expressions may not use the comma operator. Did you mean to write an array? \ No newline at end of file diff --git a/tests/baselines/reference/jsxParsingError1.js b/tests/baselines/reference/jsxParsingError1.js index bf2d48b0491..09bb9c113c1 100644 --- a/tests/baselines/reference/jsxParsingError1.js +++ b/tests/baselines/reference/jsxParsingError1.js @@ -16,5 +16,4 @@ const elem =
; // This should be a parse error var class1 = "foo"; var class2 = "bar"; -var elem =
; -/>;; +var elem =
; diff --git a/tests/baselines/reference/jsxParsingError1.symbols b/tests/baselines/reference/jsxParsingError1.symbols index 35d1ba6c290..535f39f5927 100644 --- a/tests/baselines/reference/jsxParsingError1.symbols +++ b/tests/baselines/reference/jsxParsingError1.symbols @@ -25,5 +25,5 @@ const elem =
; >div : Symbol(JSX.IntrinsicElements, Decl(file.tsx, 1, 22)) >className : Symbol(className, Decl(file.tsx, 10, 17)) >class1 : Symbol(class1, Decl(file.tsx, 8, 5)) ->class2 : Symbol(class2, Decl(file.tsx, 10, 36)) +>class2 : Symbol(class2, Decl(file.tsx, 9, 5)) diff --git a/tests/baselines/reference/jsxParsingError1.types b/tests/baselines/reference/jsxParsingError1.types index 3278c28c724..2d4c65b91d0 100644 --- a/tests/baselines/reference/jsxParsingError1.types +++ b/tests/baselines/reference/jsxParsingError1.types @@ -18,10 +18,10 @@ const class2 = "bar"; const elem =
; >elem : JSX.Element ->
: JSX.Element >div : any >className : string +>class1, class2 : "bar" >class1 : "foo" ->class2 : true ->/>; : RegExp +>class2 : "bar" diff --git a/tests/baselines/reference/tsxErrorRecovery1.errors.txt b/tests/baselines/reference/tsxErrorRecovery1.errors.txt index d7e4f5c55df..34c2a3fc879 100644 --- a/tests/baselines/reference/tsxErrorRecovery1.errors.txt +++ b/tests/baselines/reference/tsxErrorRecovery1.errors.txt @@ -1,26 +1,14 @@ -tests/cases/conformance/jsx/file.tsx(4,11): error TS17008: JSX element 'div' has no corresponding closing tag. tests/cases/conformance/jsx/file.tsx(4,19): error TS1109: Expression expected. -tests/cases/conformance/jsx/file.tsx(7,11): error TS2304: Cannot find name 'a'. -tests/cases/conformance/jsx/file.tsx(7,12): error TS1005: '}' expected. -tests/cases/conformance/jsx/file.tsx(8,1): error TS1005: ' {
- ~~~ -!!! error TS17008: JSX element 'div' has no corresponding closing tag. ~~ !!! error TS1109: Expression expected. } // Shouldn't see any errors down here var y = { a: 1 }; - ~ -!!! error TS2304: Cannot find name 'a'. - ~ -!!! error TS1005: '}' expected. - - -!!! error TS1005: ' {}div> -} -// Shouldn't see any errors down here -var y = {a} 1 }; - ; + var x =
{}
; } +// Shouldn't see any errors down here +var y = { a: 1 }; diff --git a/tests/baselines/reference/tsxErrorRecovery1.symbols b/tests/baselines/reference/tsxErrorRecovery1.symbols index de6bce7d278..2b39f9bbce7 100644 --- a/tests/baselines/reference/tsxErrorRecovery1.symbols +++ b/tests/baselines/reference/tsxErrorRecovery1.symbols @@ -11,4 +11,6 @@ function foo() { } // Shouldn't see any errors down here var y = { a: 1 }; +>y : Symbol(y, Decl(file.tsx, 6, 3)) +>a : Symbol(a, Decl(file.tsx, 6, 9)) diff --git a/tests/baselines/reference/tsxErrorRecovery1.types b/tests/baselines/reference/tsxErrorRecovery1.types index d75b4ab89ae..010097d4166 100644 --- a/tests/baselines/reference/tsxErrorRecovery1.types +++ b/tests/baselines/reference/tsxErrorRecovery1.types @@ -6,13 +6,15 @@ function foo() { var x =
{
>x : JSX.Element ->
{
}// Shouldn't see any errors down herevar y = { a: 1 }; : JSX.Element +>
{
: JSX.Element >div : any > : any +>div : any } // Shouldn't see any errors down here var y = { a: 1 }; ->a : any - -> : any +>y : { a: number; } +>{ a: 1 } : { a: number; } +>a : number +>1 : 1 From ad9c36e0ecae1be0532b1e87db59ecc4f80c96bc Mon Sep 17 00:00:00 2001 From: Andrew Branch Date: Wed, 22 May 2019 10:00:09 -0700 Subject: [PATCH 08/27] Expose ts.Diagnostics to fourslash --- tests/cases/fourslash/fourslash.ts | 17 +++++++++++++++++ .../jsxExpressionFollowedByIdentifier.ts | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts index e6f2a08f002..29bfe9acade 100644 --- a/tests/cases/fourslash/fourslash.ts +++ b/tests/cases/fourslash/fourslash.ts @@ -42,6 +42,8 @@ // // TODO: figure out a better solution to the API exposure problem. +/// + declare module ts { export type MapKey = string | number; export interface Map { @@ -70,6 +72,21 @@ declare module ts { text: string; } + enum DiagnosticCategory { + Warning, + Error, + Suggestion, + Message + } + + interface DiagnosticMessage { + key: string; + category: DiagnosticCategory; + code: number; + message: string; + reportsUnnecessary?: {}; + } + function flatMap(array: ReadonlyArray, mapfn: (x: T, i: number) => U | ReadonlyArray | undefined): U[]; } diff --git a/tests/cases/fourslash/jsxExpressionFollowedByIdentifier.ts b/tests/cases/fourslash/jsxExpressionFollowedByIdentifier.ts index 501a325b989..16dcb7f6560 100644 --- a/tests/cases/fourslash/jsxExpressionFollowedByIdentifier.ts +++ b/tests/cases/fourslash/jsxExpressionFollowedByIdentifier.ts @@ -6,7 +6,7 @@ ////const b =
[|x|]} /> test.ranges().forEach(range => { - verify.errorExistsAtRange(range, 1005, "'}' expected."); + verify.errorExistsAtRange(range, ts.Diagnostics._0_expected.code, "'}' expected."); // This is just to ensure getting quick info doesn’t crash verify.not.quickInfoExists(); }); From d760cbb74bb63b7f8d2712ae333086857dcf952f Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Mon, 17 Jun 2019 14:27:55 -0700 Subject: [PATCH 09/27] Make any paths in buildInfoFile to be relative to it. --- src/compiler/builder.ts | 108 +++++++++--------- src/compiler/tsbuild.ts | 4 +- src/compiler/watch.ts | 8 +- .../unittests/tscWatch/incremental.ts | 93 ++++++++------- .../reference/api/tsserverlibrary.d.ts | 2 +- tests/baselines/reference/api/typescript.d.ts | 2 +- .../inferred-type-from-transitive-module.js | 44 +++---- .../inferred-type-from-transitive-module.js | 44 +++---- ...s-merged-and-contains-late-bound-member.js | 24 ++-- ...s-merged-and-contains-late-bound-member.js | 24 ++-- .../incremental-declaration-changes/sample.js | 82 ++++++------- .../when-declaration-option-changes.js | 16 +-- ...en-logic-config-changes-declaration-dir.js | 66 +++++------ .../when-target-option-changes.js | 20 ++-- .../sample.js | 16 +-- .../tsbuild/sample1/initial-Build/sample.js | 82 ++++++------- .../when-declaration-option-changes.js | 16 +-- ...en-logic-config-changes-declaration-dir.js | 82 ++++++------- .../when-logic-specifies-tsBuildInfoFile.js | 82 ++++++------- .../when-target-option-changes.js | 20 ++-- 20 files changed, 420 insertions(+), 415 deletions(-) diff --git a/src/compiler/builder.ts b/src/compiler/builder.ts index d4c2132d36b..541cc24413f 100644 --- a/src/compiler/builder.ts +++ b/src/compiler/builder.ts @@ -10,18 +10,13 @@ namespace ts { export interface ReusableDiagnosticRelatedInformation { category: DiagnosticCategory; code: number; - file: Path | undefined; + file: string | undefined; start: number | undefined; length: number | undefined; messageText: string | ReusableDiagnosticMessageChain; } - export interface ReusableDiagnosticMessageChain { - messageText: string; - category: DiagnosticCategory; - code: number; - next?: ReusableDiagnosticMessageChain; - } + export type ReusableDiagnosticMessageChain = DiagnosticMessageChain; export interface ReusableBuilderProgramState extends ReusableBuilderState { /** @@ -227,7 +222,7 @@ namespace ts { // Unchanged file copy diagnostics const diagnostics = oldState!.semanticDiagnosticsPerFile!.get(sourceFilePath); if (diagnostics) { - state.semanticDiagnosticsPerFile!.set(sourceFilePath, oldState!.hasReusableDiagnostic ? convertToDiagnostics(diagnostics as ReadonlyArray, newProgram) : diagnostics as ReadonlyArray); + state.semanticDiagnosticsPerFile!.set(sourceFilePath, oldState!.hasReusableDiagnostic ? convertToDiagnostics(diagnostics as ReadonlyArray, newProgram, getCanonicalFileName) : diagnostics as ReadonlyArray); if (!state.semanticDiagnosticsFromOldState) { state.semanticDiagnosticsFromOldState = createMap(); } @@ -246,37 +241,32 @@ namespace ts { return state; } - function convertToDiagnostics(diagnostics: ReadonlyArray, newProgram: Program): ReadonlyArray { + function convertToDiagnostics(diagnostics: ReadonlyArray, newProgram: Program, getCanonicalFileName: GetCanonicalFileName): ReadonlyArray { if (!diagnostics.length) return emptyArray; + const buildInfoDirectory = getDirectoryPath(getOutputPathForBuildInfo(newProgram.getCompilerOptions())!); return diagnostics.map(diagnostic => { - const result: Diagnostic = convertToDiagnosticRelatedInformation(diagnostic, newProgram); + const result: Diagnostic = convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath); result.reportsUnnecessary = diagnostic.reportsUnnecessary; result.source = diagnostic.source; const { relatedInformation } = diagnostic; result.relatedInformation = relatedInformation ? relatedInformation.length ? - relatedInformation.map(r => convertToDiagnosticRelatedInformation(r, newProgram)) : + relatedInformation.map(r => convertToDiagnosticRelatedInformation(r, newProgram, toPath)) : emptyArray : undefined; return result; }); + + function toPath(path: string) { + return ts.toPath(path, buildInfoDirectory, getCanonicalFileName); + } } - function convertToDiagnosticRelatedInformation(diagnostic: ReusableDiagnosticRelatedInformation, newProgram: Program): DiagnosticRelatedInformation { - const { file, messageText } = diagnostic; + function convertToDiagnosticRelatedInformation(diagnostic: ReusableDiagnosticRelatedInformation, newProgram: Program, toPath: (path: string) => Path): DiagnosticRelatedInformation { + const { file } = diagnostic; return { ...diagnostic, - file: file && newProgram.getSourceFileByPath(file), - messageText: messageText === undefined || isString(messageText) ? - messageText : - convertToDiagnosticMessageChain(messageText, newProgram) - }; - } - - function convertToDiagnosticMessageChain(diagnostic: ReusableDiagnosticMessageChain, newProgram: Program): DiagnosticMessageChain { - return { - ...diagnostic, - next: diagnostic.next && convertToDiagnosticMessageChain(diagnostic.next, newProgram) + file: file ? newProgram.getSourceFileByPath(toPath(file)) : undefined }; } @@ -620,19 +610,20 @@ namespace ts { /** * Gets the program information to be emitted in buildInfo so that we can use it to create new program */ - function getProgramBuildInfo(state: Readonly): ProgramBuildInfo | undefined { + function getProgramBuildInfo(state: Readonly, getCanonicalFileName: GetCanonicalFileName): ProgramBuildInfo | undefined { if (state.compilerOptions.outFile || state.compilerOptions.out) return undefined; + const buildInfoDirectory = getDirectoryPath(getOutputPathForBuildInfo(state.compilerOptions)!); const fileInfos: MapLike = {}; state.fileInfos.forEach((value, key) => { const signature = state.currentAffectedFilesSignatures && state.currentAffectedFilesSignatures.get(key); - fileInfos[key] = signature === undefined ? value : { version: value.version, signature }; + fileInfos[relativeToBuildInfo(key)] = signature === undefined ? value : { version: value.version, signature }; }); const result: ProgramBuildInfo = { fileInfos, options: state.compilerOptions }; if (state.referencedMap) { const referencedMap: MapLike = {}; state.referencedMap.forEach((value, key) => { - referencedMap[key] = arrayFrom(value.keys()); + referencedMap[relativeToBuildInfo(key)] = arrayFrom(value.keys(), relativeToBuildInfo); }); result.referencedMap = referencedMap; } @@ -642,9 +633,9 @@ namespace ts { state.exportedModulesMap.forEach((value, key) => { const newValue = state.currentAffectedFilesExportedModulesMap && state.currentAffectedFilesExportedModulesMap.get(key); // Not in temporary cache, use existing value - if (newValue === undefined) exportedModulesMap[key] = arrayFrom(value.keys()); + if (newValue === undefined) exportedModulesMap[relativeToBuildInfo(key)] = arrayFrom(value.keys(), relativeToBuildInfo); // Value in cache and has updated value map, use that - else if (newValue) exportedModulesMap[key] = arrayFrom(newValue.keys()); + else if (newValue) exportedModulesMap[relativeToBuildInfo(key)] = arrayFrom(newValue.keys(), relativeToBuildInfo); }); result.exportedModulesMap = exportedModulesMap; } @@ -655,50 +646,44 @@ namespace ts { state.semanticDiagnosticsPerFile.forEach((value, key) => semanticDiagnosticsPerFile.push( value.length ? [ - key, + relativeToBuildInfo(key), state.hasReusableDiagnostic ? value as ReadonlyArray : - convertToReusableDiagnostics(value as ReadonlyArray) + convertToReusableDiagnostics(value as ReadonlyArray, relativeToBuildInfo) ] : - key + relativeToBuildInfo(key) )); result.semanticDiagnosticsPerFile = semanticDiagnosticsPerFile; } return result; + + function relativeToBuildInfo(path: string) { + return ensurePathIsNonModuleName(getRelativePathFromDirectory(buildInfoDirectory, path, getCanonicalFileName)); + } } - function convertToReusableDiagnostics(diagnostics: ReadonlyArray): ReadonlyArray { + function convertToReusableDiagnostics(diagnostics: ReadonlyArray, relativeToBuildInfo: (path: string) => string): ReadonlyArray { Debug.assert(!!diagnostics.length); return diagnostics.map(diagnostic => { - const result: ReusableDiagnostic = convertToReusableDiagnosticRelatedInformation(diagnostic); + const result: ReusableDiagnostic = convertToReusableDiagnosticRelatedInformation(diagnostic, relativeToBuildInfo); result.reportsUnnecessary = diagnostic.reportsUnnecessary; result.source = diagnostic.source; const { relatedInformation } = diagnostic; result.relatedInformation = relatedInformation ? relatedInformation.length ? - relatedInformation.map(r => convertToReusableDiagnosticRelatedInformation(r)) : + relatedInformation.map(r => convertToReusableDiagnosticRelatedInformation(r, relativeToBuildInfo)) : emptyArray : undefined; return result; }); } - function convertToReusableDiagnosticRelatedInformation(diagnostic: DiagnosticRelatedInformation): ReusableDiagnosticRelatedInformation { - const { file, messageText } = diagnostic; + function convertToReusableDiagnosticRelatedInformation(diagnostic: DiagnosticRelatedInformation, relativeToBuildInfo: (path: string) => string): ReusableDiagnosticRelatedInformation { + const { file } = diagnostic; return { ...diagnostic, - file: file && file.path, - messageText: messageText === undefined || isString(messageText) ? - messageText : - convertToReusableDiagnosticMessageChain(messageText) - }; - } - - function convertToReusableDiagnosticMessageChain(diagnostic: DiagnosticMessageChain): ReusableDiagnosticMessageChain { - return { - ...diagnostic, - next: diagnostic.next && convertToReusableDiagnosticMessageChain(diagnostic.next) + file: file ? relativeToBuildInfo(file.path) : undefined }; } @@ -767,7 +752,7 @@ namespace ts { const computeHash = host.createHash || generateDjb2Hash; let state = createBuilderProgramState(newProgram, getCanonicalFileName, oldState); let backupState: BuilderProgramState | undefined; - newProgram.getProgramBuildInfo = () => getProgramBuildInfo(state); + newProgram.getProgramBuildInfo = () => getProgramBuildInfo(state, getCanonicalFileName); // To ensure that we arent storing any references to old program or new program without state newProgram = undefined!; // TODO: GH#18217 @@ -980,26 +965,35 @@ namespace ts { } } - function getMapOfReferencedSet(mapLike: MapLike> | undefined): ReadonlyMap | undefined { + function getMapOfReferencedSet(mapLike: MapLike> | undefined, toPath: (path: string) => Path): ReadonlyMap | undefined { if (!mapLike) return undefined; const map = createMap(); // Copies keys/values from template. Note that for..in will not throw if // template is undefined, and instead will just exit the loop. for (const key in mapLike) { if (hasProperty(mapLike, key)) { - map.set(key, arrayToSet(mapLike[key])); + map.set(toPath(key), arrayToSet(mapLike[key], toPath)); } } return map; } - export function createBuildProgramUsingProgramBuildInfo(program: ProgramBuildInfo): EmitAndSemanticDiagnosticsBuilderProgram { - const fileInfos = createMapFromTemplate(program.fileInfos); + export function createBuildProgramUsingProgramBuildInfo(program: ProgramBuildInfo, buildInfoPath: string, useCaseSensitiveFileNames: boolean): EmitAndSemanticDiagnosticsBuilderProgram { + const buildInfoDirectory = getDirectoryPath(buildInfoPath); + const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames); + + const fileInfos = createMap(); + for (const key in program.fileInfos) { + if (hasProperty(program.fileInfos, key)) { + fileInfos.set(toPath(key), program.fileInfos[key]); + } + } + const state: ReusableBuilderProgramState = { fileInfos, compilerOptions: program.options, - referencedMap: getMapOfReferencedSet(program.referencedMap), - exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap), + referencedMap: getMapOfReferencedSet(program.referencedMap, toPath), + exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap, toPath), semanticDiagnosticsPerFile: program.semanticDiagnosticsPerFile && arrayToMap(program.semanticDiagnosticsPerFile, value => isString(value) ? value : value[0], value => isString(value) ? emptyArray : value[1]), hasReusableDiagnostic: true }; @@ -1025,6 +1019,10 @@ namespace ts { emitNextAffectedFile: notImplemented, getSemanticDiagnosticsOfNextAffectedFile: notImplemented, }; + + function toPath(path: string) { + return ts.toPath(path, buildInfoDirectory, getCanonicalFileName); + } } export function createRedirectedBuilderProgram(state: { program: Program | undefined; compilerOptions: CompilerOptions; }, configFileParsingDiagnostics: ReadonlyArray): BuilderProgram { diff --git a/src/compiler/tsbuild.ts b/src/compiler/tsbuild.ts index 94718a1b368..7e92e727c50 100644 --- a/src/compiler/tsbuild.ts +++ b/src/compiler/tsbuild.ts @@ -1298,11 +1298,11 @@ namespace ts { } } - function getOldProgram({ options, builderPrograms, readFileWithCache }: SolutionBuilderState, proj: ResolvedConfigFilePath, parsed: ParsedCommandLine) { + function getOldProgram({ options, builderPrograms, readFileWithCache, host }: SolutionBuilderState, proj: ResolvedConfigFilePath, parsed: ParsedCommandLine) { if (options.force) return undefined; const value = builderPrograms.get(proj); if (value) return value; - return readBuilderProgram(parsed.options, readFileWithCache) as any as T; + return readBuilderProgram(parsed.options, readFileWithCache, host.useCaseSensitiveFileNames()) as any as T; } function afterProgramCreate({ host, watch, builderPrograms }: SolutionBuilderState, proj: ResolvedConfigFilePath, program: T) { diff --git a/src/compiler/watch.ts b/src/compiler/watch.ts index 3ba2a5f5959..a961c308af1 100644 --- a/src/compiler/watch.ts +++ b/src/compiler/watch.ts @@ -437,7 +437,7 @@ namespace ts { } namespace ts { - export function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined) { + export function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined, useCaseSensitiveFileNames: boolean) { if (compilerOptions.out || compilerOptions.outFile) return undefined; const buildInfoPath = getOutputPathForBuildInfo(compilerOptions); if (!buildInfoPath) return undefined; @@ -446,7 +446,7 @@ namespace ts { const buildInfo = getBuildInfo(content); if (buildInfo.version !== version) return undefined; if (!buildInfo.program) return undefined; - return createBuildProgramUsingProgramBuildInfo(buildInfo.program); + return createBuildProgramUsingProgramBuildInfo(buildInfo.program, buildInfoPath, useCaseSensitiveFileNames); } export function createIncrementalCompilerHost(options: CompilerOptions, system = sys): CompilerHost { @@ -471,7 +471,7 @@ namespace ts { }: IncrementalProgramOptions): T { host = host || createIncrementalCompilerHost(options); createProgram = createProgram || createEmitAndSemanticDiagnosticsBuilderProgram as any as CreateProgram; - const oldProgram = readBuilderProgram(options, path => host!.readFile(path)) as any as T; + const oldProgram = readBuilderProgram(options, path => host!.readFile(path), host.useCaseSensitiveFileNames()) as any as T; return createProgram(rootNames, options, host, oldProgram, configFileParsingDiagnostics, projectReferences); } @@ -747,7 +747,7 @@ namespace ts { ((typeDirectiveNames, containingFile, redirectedReference) => resolutionCache.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference)); const userProvidedResolution = !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives; - builderProgram = readBuilderProgram(compilerOptions, path => compilerHost.readFile(path)) as any as T; + builderProgram = readBuilderProgram(compilerOptions, path => compilerHost.readFile(path), compilerHost.useCaseSensitiveFileNames()) as any as T; synchronizeProgram(); // Update the wild card directory watch diff --git a/src/testRunner/unittests/tscWatch/incremental.ts b/src/testRunner/unittests/tscWatch/incremental.ts index 54109dec846..e0dfb29016c 100644 --- a/src/testRunner/unittests/tscWatch/incremental.ts +++ b/src/testRunner/unittests/tscWatch/incremental.ts @@ -129,6 +129,14 @@ namespace ts.tscWatch { signature: Harness.mockHash(libFile.content) }; + const getCanonicalFileName = createGetCanonicalFileName(/*useCaseSensitiveFileNames*/ false); + function relativeToBuildInfo(buildInfoPath: string, path: string) { + return getRelativePathFromFile(buildInfoPath, path, getCanonicalFileName); + } + + const buildInfoPath = `${project}/tsconfig.tsbuildinfo`; + const [libFilePath, file1Path, file2Path] = [libFile.path, `${project}/file1.ts`, `${project}/file2.ts`].map(path => relativeToBuildInfo(buildInfoPath, path)); + describe("non module compilation", () => { function getFileInfo(content: string): BuilderState.FileInfo { return { version: Harness.mockHash(content), signature: Harness.mockHash(`declare ${content}\n`) }; @@ -150,7 +158,6 @@ namespace ts.tscWatch { path: `${project}/file2.js`, content: "var y = 20;\n" }; - describe("own file emit without errors", () => { const modifiedFile2Content = file2.content.replace("y", "z").replace("20", "10"); verifyIncrementalWatchEmit({ @@ -163,14 +170,14 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(file1.content), - [file2.path]: getFileInfo(file2.content) + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(file1.content), + [file2Path]: getFileInfo(file2.content) }, options: { incremental: true, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, - semanticDiagnosticsPerFile: [libFile.path, file1.path, file2.path] + semanticDiagnosticsPerFile: [libFilePath, file1Path, file2Path] }, version }) @@ -186,14 +193,14 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(file1.content), - [file2.path]: getFileInfo(modifiedFile2Content) + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(file1.content), + [file2Path]: getFileInfo(modifiedFile2Content) }, options: { incremental: true, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, - semanticDiagnosticsPerFile: [libFile.path, file1.path, file2.path] + semanticDiagnosticsPerFile: [libFilePath, file1Path, file2Path] }, version }) @@ -213,16 +220,16 @@ namespace ts.tscWatch { signature: Harness.mockHash("declare const y: string;\n") }; const file2ReuasableError: ProgramBuildInfoDiagnostic = [ - file2.path, [ + file2Path, [ { - file: file2.path, + file: file2Path, start: 6, length: 1, code: Diagnostics.Type_0_is_not_assignable_to_type_1.code, category: Diagnostics.Type_0_is_not_assignable_to_type_1.category, messageText: "Type '20' is not assignable to type 'string'." } - ] as ReusableDiagnostic[] + ] ]; const file2Errors = [ "file2.ts(1,7): error TS2322: Type '20' is not assignable to type 'string'.\n" @@ -238,16 +245,16 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(file1.content), - [file2.path]: file2FileInfo + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(file1.content), + [file2Path]: file2FileInfo }, options: { incremental: true, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [ - libFile.path, - file1.path, + libFilePath, + file1Path, file2ReuasableError ] }, @@ -265,16 +272,16 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(modifiedFile1Content), - [file2.path]: file2FileInfo + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(modifiedFile1Content), + [file2Path]: file2FileInfo }, options: { incremental: true, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [ - libFile.path, - file1.path, + libFilePath, + file1Path, file2ReuasableError ] }, @@ -369,14 +376,14 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(file1.content), - [file2.path]: getFileInfo(file2.content) + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(file1.content), + [file2Path]: getFileInfo(file2.content) }, options: { incremental: true, module: ModuleKind.AMD, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, - semanticDiagnosticsPerFile: [libFile.path, file1.path, file2.path] + semanticDiagnosticsPerFile: [libFilePath, file1Path, file2Path] }, version }) @@ -391,14 +398,14 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(file1.content), - [file2.path]: getFileInfo(modifiedFile2Content) + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(file1.content), + [file2Path]: getFileInfo(modifiedFile2Content) }, options: { incremental: true, module: ModuleKind.AMD, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, - semanticDiagnosticsPerFile: [libFile.path, file1.path, file2.path] + semanticDiagnosticsPerFile: [libFilePath, file1Path, file2Path] }, version }) @@ -418,16 +425,16 @@ namespace ts.tscWatch { signature: Harness.mockHash("export declare const y: string;\n") }; const file2ReuasableError: ProgramBuildInfoDiagnostic = [ - file2.path, [ + file2Path, [ { - file: file2.path, + file: file2Path, start: 13, length: 1, code: Diagnostics.Type_0_is_not_assignable_to_type_1.code, category: Diagnostics.Type_0_is_not_assignable_to_type_1.category, messageText: "Type '20' is not assignable to type 'string'." } - ] as ReusableDiagnostic[] + ] ]; const file2Errors = [ "file2.ts(1,14): error TS2322: Type '20' is not assignable to type 'string'.\n" @@ -443,16 +450,16 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(file1.content), - [file2.path]: file2FileInfo + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(file1.content), + [file2Path]: file2FileInfo }, options: { incremental: true, module: ModuleKind.AMD, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [ - libFile.path, - file1.path, + libFilePath, + file1Path, file2ReuasableError ] }, @@ -469,17 +476,17 @@ namespace ts.tscWatch { content: getBuildInfoText({ program: { fileInfos: { - [libFile.path]: libFileInfo, - [file1.path]: getFileInfo(modifiedFile1Content), - [file2.path]: file2FileInfo + [libFilePath]: libFileInfo, + [file1Path]: getFileInfo(modifiedFile1Content), + [file2Path]: file2FileInfo }, options: { incremental: true, module: ModuleKind.AMD, configFilePath: configFile.path }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [ - libFile.path, + libFilePath, file2ReuasableError, - file1.path + file1Path ] }, version diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index cbab57b0644..8f4f774f5d6 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -4450,7 +4450,7 @@ declare namespace ts { function createAbstractBuilder(rootNames: ReadonlyArray | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: ReadonlyArray, projectReferences?: ReadonlyArray): BuilderProgram; } declare namespace ts { - function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined): EmitAndSemanticDiagnosticsBuilderProgram | undefined; + function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined, useCaseSensitiveFileNames: boolean): EmitAndSemanticDiagnosticsBuilderProgram | undefined; function createIncrementalCompilerHost(options: CompilerOptions, system?: System): CompilerHost; interface IncrementalProgramOptions { rootNames: ReadonlyArray; diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index fd254a2fe50..7efb518603e 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -4450,7 +4450,7 @@ declare namespace ts { function createAbstractBuilder(rootNames: ReadonlyArray | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: ReadonlyArray, projectReferences?: ReadonlyArray): BuilderProgram; } declare namespace ts { - function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined): EmitAndSemanticDiagnosticsBuilderProgram | undefined; + function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined, useCaseSensitiveFileNames: boolean): EmitAndSemanticDiagnosticsBuilderProgram | undefined; function createIncrementalCompilerHost(options: CompilerOptions, system?: System): CompilerHost; interface IncrementalProgramOptions { rootNames: ReadonlyArray; diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js index f7ffde933fd..e6fb4d53c12 100644 --- a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js +++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js @@ -30,27 +30,27 @@ export declare const lazyBar: LazyAction<() => void, typeof import("./lazyIndex" { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/bar.ts": { + "../bar.ts": { "version": "747071916", "signature": "-9232740537" }, - "/src/bundling.ts": { + "../bundling.ts": { "version": "-21659820217", "signature": "-40032907372" }, - "/src/global.d.ts": { + "../global.d.ts": { "version": "-9780226215", "signature": "-9780226215" }, - "/src/lazyindex.ts": { + "../lazyindex.ts": { "version": "-6956449754", "signature": "-6224542381" }, - "/src/index.ts": { + "../index.ts": { "version": "-11602502901", "signature": "6256067474" } @@ -63,30 +63,30 @@ export declare const lazyBar: LazyAction<() => void, typeof import("./lazyIndex" "configFilePath": "/src/tsconfig.json" }, "referencedMap": { - "/src/index.ts": [ - "/src/bundling.ts", - "/src/lazyindex.ts" + "../index.ts": [ + "../bundling.ts", + "../lazyindex.ts" ], - "/src/lazyindex.ts": [ - "/src/bar.ts" + "../lazyindex.ts": [ + "../bar.ts" ] }, "exportedModulesMap": { - "/src/index.ts": [ - "/src/bundling.ts", - "/src/lazyindex.ts" + "../index.ts": [ + "../bundling.ts", + "../lazyindex.ts" ], - "/src/lazyindex.ts": [ - "/src/bar.ts" + "../lazyindex.ts": [ + "../bar.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/bar.ts", - "/src/bundling.ts", - "/src/global.d.ts", - "/src/index.ts", - "/src/lazyindex.ts" + "../../lib/lib.d.ts", + "../bar.ts", + "../bundling.ts", + "../global.d.ts", + "../index.ts", + "../lazyindex.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module.js index e587db59b21..1de6d110e02 100644 --- a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module.js +++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module.js @@ -68,27 +68,27 @@ exports.bar = bar_1.default; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/bar.ts": { + "../bar.ts": { "version": "5936740878", "signature": "11191036521" }, - "/src/bundling.ts": { + "../bundling.ts": { "version": "-21659820217", "signature": "-40032907372" }, - "/src/global.d.ts": { + "../global.d.ts": { "version": "-9780226215", "signature": "-9780226215" }, - "/src/lazyindex.ts": { + "../lazyindex.ts": { "version": "-6956449754", "signature": "-6224542381" }, - "/src/index.ts": { + "../index.ts": { "version": "-11602502901", "signature": "18468008756" } @@ -101,30 +101,30 @@ exports.bar = bar_1.default; "configFilePath": "/src/tsconfig.json" }, "referencedMap": { - "/src/index.ts": [ - "/src/bundling.ts", - "/src/lazyindex.ts" + "../index.ts": [ + "../bundling.ts", + "../lazyindex.ts" ], - "/src/lazyindex.ts": [ - "/src/bar.ts" + "../lazyindex.ts": [ + "../bar.ts" ] }, "exportedModulesMap": { - "/src/index.ts": [ - "/src/bundling.ts", - "/src/lazyindex.ts" + "../index.ts": [ + "../bundling.ts", + "../lazyindex.ts" ], - "/src/lazyindex.ts": [ - "/src/bar.ts" + "../lazyindex.ts": [ + "../bar.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/bar.ts", - "/src/bundling.ts", - "/src/global.d.ts", - "/src/index.ts", - "/src/lazyindex.ts" + "../../lib/lib.d.ts", + "../bar.ts", + "../bundling.ts", + "../global.d.ts", + "../index.ts", + "../lazyindex.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js b/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js index b0549b1a8fb..fb85601c160 100644 --- a/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js +++ b/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js @@ -21,19 +21,19 @@ type A = HKT[typeof sym]; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/src/globals.d.ts": { + "./src/globals.d.ts": { "version": "-1994196675", "signature": "-1994196675" }, - "/src/src/hkt.ts": { + "./src/hkt.ts": { "version": "675797797", "signature": "2373810515" }, - "/src/src/main.ts": { + "./src/main.ts": { "version": "-27494779858", "signature": "-7779857705" } @@ -44,20 +44,20 @@ type A = HKT[typeof sym]; "configFilePath": "/src/tsconfig.json" }, "referencedMap": { - "/src/src/main.ts": [ - "/src/src/hkt.ts" + "./src/main.ts": [ + "./src/hkt.ts" ] }, "exportedModulesMap": { - "/src/src/main.ts": [ - "/src/src/hkt.ts" + "./src/main.ts": [ + "./src/hkt.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/src/globals.d.ts", - "/src/src/hkt.ts", - "/src/src/main.ts" + "../lib/lib.d.ts", + "./src/globals.d.ts", + "./src/hkt.ts", + "./src/main.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js b/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js index a48d6df88e4..48ae88b77cb 100644 --- a/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js +++ b/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js @@ -14,19 +14,19 @@ var x = 10; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/src/globals.d.ts": { + "./src/globals.d.ts": { "version": "-1994196675", "signature": "-1994196675" }, - "/src/src/hkt.ts": { + "./src/hkt.ts": { "version": "675797797", "signature": "2373810515" }, - "/src/src/main.ts": { + "./src/main.ts": { "version": "-28387946490", "signature": "-7779857705" } @@ -37,20 +37,20 @@ var x = 10; "configFilePath": "/src/tsconfig.json" }, "referencedMap": { - "/src/src/main.ts": [ - "/src/src/hkt.ts" + "./src/main.ts": [ + "./src/hkt.ts" ] }, "exportedModulesMap": { - "/src/src/main.ts": [ - "/src/src/hkt.ts" + "./src/main.ts": [ + "./src/hkt.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/src/globals.d.ts", - "/src/src/hkt.ts", - "/src/src/main.ts" + "../lib/lib.d.ts", + "./src/globals.d.ts", + "./src/hkt.ts", + "./src/main.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js index a698d6c34cf..e21e1a3b4cb 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js @@ -171,19 +171,19 @@ export class someClass { } { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "25219880154" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-13387000654", "signature": "12514354613" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -198,10 +198,10 @@ export class someClass { } "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" @@ -211,19 +211,19 @@ export class someClass { } { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-2069755619", "signature": "-2069755619" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "./index.ts": { "version": "-5786964698", "signature": "-6548680073" } @@ -237,21 +237,21 @@ export class someClass { } "configFilePath": "/src/logic/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" @@ -261,23 +261,23 @@ export class someClass { } { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-2069755619", "signature": "-2069755619" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "../logic/index.ts": { "version": "-6548680073", "signature": "-6548680073" }, - "/src/tests/index.ts": { + "./index.ts": { "version": "12336236525", "signature": "-9209611" } @@ -290,29 +290,29 @@ export class someClass { } "configFilePath": "/src/tests/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts", - "/src/logic/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts", + "../logic/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts", - "/src/tests/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "../logic/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js index 69c7b20d506..90d449acc85 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js @@ -20,19 +20,19 @@ export declare function multiply(a: number, b: number): number; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "-8396256275" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-18749805970", "signature": "1874987148" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -46,10 +46,10 @@ export declare function multiply(a: number, b: number): number; "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js index 53f222a4bf5..444c03f4d09 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js @@ -24,19 +24,19 @@ export declare const m: typeof mod; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "./index.ts": { "version": "-5786964698", "signature": "-6548680073" } @@ -51,21 +51,21 @@ export declare const m: typeof mod; "configFilePath": "/src/logic/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" @@ -75,23 +75,23 @@ export declare const m: typeof mod; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "../logic/index.ts": { "version": "-6548680073", "signature": "-6548680073" }, - "/src/tests/index.ts": { + "./index.ts": { "version": "12336236525", "signature": "-9209611" } @@ -104,29 +104,29 @@ export declare const m: typeof mod; "configFilePath": "/src/tests/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts", - "/src/logic/decls/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts", + "../logic/decls/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts", - "/src/tests/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "../logic/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-target-option-changes.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-target-option-changes.js index 53bd9b167fb..95de840f6bc 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-target-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-target-option-changes.js @@ -28,23 +28,23 @@ exports.multiply = multiply; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "8926001564", "signature": "8926001564" }, - "/lib/lib.esnext.d.ts": { + "../../lib/lib.esnext.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "-8396256275" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-18749805970", "signature": "1874987148" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -59,11 +59,11 @@ exports.multiply = multiply; "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/lib/lib.esnext.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "../../lib/lib.esnext.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js index aae81ea9fdc..715b0331f16 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js @@ -24,19 +24,19 @@ class someClass { } { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "25219880154" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-16698397488", "signature": "11051732871" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -51,10 +51,10 @@ class someClass { } "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js index ef63741766a..e61fc8ae88e 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js @@ -184,19 +184,19 @@ exports.multiply = multiply; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "25219880154" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-18749805970", "signature": "11051732871" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -211,10 +211,10 @@ exports.multiply = multiply; "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" @@ -369,19 +369,19 @@ sourceFile:index.ts { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "./index.ts": { "version": "-5786964698", "signature": "-6548680073" } @@ -395,21 +395,21 @@ sourceFile:index.ts "configFilePath": "/src/logic/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" @@ -435,23 +435,23 @@ exports.m = mod; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "../logic/index.ts": { "version": "-6548680073", "signature": "-6548680073" }, - "/src/tests/index.ts": { + "./index.ts": { "version": "12336236525", "signature": "-9209611" } @@ -464,29 +464,29 @@ exports.m = mod; "configFilePath": "/src/tests/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts", - "/src/logic/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts", + "../logic/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts", - "/src/tests/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "../logic/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js index 90f10c0a25c..9e1c9e71efb 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js @@ -26,19 +26,19 @@ exports.multiply = multiply; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "-8396256275" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-18749805970", "signature": "1874987148" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -51,10 +51,10 @@ exports.multiply = multiply; "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js index ef63741766a..e61fc8ae88e 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js @@ -184,19 +184,19 @@ exports.multiply = multiply; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "25219880154" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-18749805970", "signature": "11051732871" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -211,10 +211,10 @@ exports.multiply = multiply; "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" @@ -369,19 +369,19 @@ sourceFile:index.ts { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "./index.ts": { "version": "-5786964698", "signature": "-6548680073" } @@ -395,21 +395,21 @@ sourceFile:index.ts "configFilePath": "/src/logic/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" @@ -435,23 +435,23 @@ exports.m = mod; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "../logic/index.ts": { "version": "-6548680073", "signature": "-6548680073" }, - "/src/tests/index.ts": { + "./index.ts": { "version": "12336236525", "signature": "-9209611" } @@ -464,29 +464,29 @@ exports.m = mod; "configFilePath": "/src/tests/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts", - "/src/logic/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts", + "../logic/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts", - "/src/tests/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "../logic/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js index b3b74cb388c..809c003d732 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js @@ -184,19 +184,19 @@ exports.multiply = multiply; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "25219880154" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-18749805970", "signature": "11051732871" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -211,10 +211,10 @@ exports.multiply = multiply; "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" @@ -369,19 +369,19 @@ sourceFile:index.ts { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "./index.ts": { "version": "-5786964698", "signature": "-6548680073" } @@ -396,21 +396,21 @@ sourceFile:index.ts "configFilePath": "/src/logic/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" @@ -452,23 +452,23 @@ exports.m = mod; { "program": { "fileInfos": { - "/lib/lib.d.ts": { + "../../lib/lib.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/src/core/index.ts": { + "../core/index.ts": { "version": "-13851440507", "signature": "-13851440507" }, - "/src/core/anothermodule.ts": { + "../core/anothermodule.ts": { "version": "7652028357", "signature": "7652028357" }, - "/src/logic/index.ts": { + "../logic/index.ts": { "version": "-6548680073", "signature": "-6548680073" }, - "/src/tests/index.ts": { + "./index.ts": { "version": "12336236525", "signature": "-9209611" } @@ -481,29 +481,29 @@ exports.m = mod; "configFilePath": "/src/tests/tsconfig.json" }, "referencedMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts", - "/src/core/index.d.ts", - "/src/logic/index.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts", + "../core/index.d.ts", + "../logic/index.d.ts" ] }, "exportedModulesMap": { - "/src/logic/index.ts": [ - "/src/core/anothermodule.d.ts" + "../logic/index.ts": [ + "../core/anothermodule.d.ts" ], - "/src/tests/index.ts": [ - "/src/core/anothermodule.d.ts" + "./index.ts": [ + "../core/anothermodule.d.ts" ] }, "semanticDiagnosticsPerFile": [ - "/lib/lib.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/logic/index.ts", - "/src/tests/index.ts" + "../../lib/lib.d.ts", + "../core/anothermodule.ts", + "../core/index.ts", + "../logic/index.ts", + "./index.ts" ] }, "version": "FakeTSVersion" diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js index fdf7cc38412..884cb3d6186 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js @@ -45,23 +45,23 @@ export function multiply(a, b) { return a * b; } { "program": { "fileInfos": { - "/lib/lib.esnext.d.ts": { + "../../lib/lib.esnext.d.ts": { "version": "-15964756381", "signature": "-15964756381" }, - "/lib/lib.esnext.full.d.ts": { + "../../lib/lib.esnext.full.d.ts": { "version": "8926001564", "signature": "8926001564" }, - "/src/core/anothermodule.ts": { + "./anothermodule.ts": { "version": "-2676574883", "signature": "-8396256275" }, - "/src/core/index.ts": { + "./index.ts": { "version": "-18749805970", "signature": "1874987148" }, - "/src/core/some_decl.d.ts": { + "./some_decl.d.ts": { "version": "-9253692965", "signature": "-9253692965" } @@ -76,11 +76,11 @@ export function multiply(a, b) { return a * b; } "referencedMap": {}, "exportedModulesMap": {}, "semanticDiagnosticsPerFile": [ - "/lib/lib.esnext.d.ts", - "/lib/lib.esnext.full.d.ts", - "/src/core/anothermodule.ts", - "/src/core/index.ts", - "/src/core/some_decl.d.ts" + "../../lib/lib.esnext.d.ts", + "../../lib/lib.esnext.full.d.ts", + "./anothermodule.ts", + "./index.ts", + "./some_decl.d.ts" ] }, "version": "FakeTSVersion" From 9446fc0c0c10c903c52c70847aca45c573703eaa Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 19 Jun 2019 12:26:13 -0700 Subject: [PATCH 10/27] Convert options to relative paths --- src/compiler/builder.ts | 79 ++++++++++++++++++- src/compiler/commandLineParser.ts | 3 +- .../unittests/tscWatch/incremental.ts | 44 +++++++++-- .../inferred-type-from-transitive-module.js | 4 +- .../inferred-type-from-transitive-module.js | 4 +- ...s-merged-and-contains-late-bound-member.js | 4 +- ...s-merged-and-contains-late-bound-member.js | 4 +- .../incremental-declaration-changes/sample.js | 6 +- .../when-declaration-option-changes.js | 2 +- ...en-logic-config-changes-declaration-dir.js | 6 +- .../when-target-option-changes.js | 2 +- .../sample.js | 2 +- .../tsbuild/sample1/initial-Build/sample.js | 6 +- .../when-declaration-option-changes.js | 2 +- ...en-logic-config-changes-declaration-dir.js | 6 +- .../when-logic-specifies-tsBuildInfoFile.js | 8 +- .../when-target-option-changes.js | 2 +- 17 files changed, 144 insertions(+), 40 deletions(-) diff --git a/src/compiler/builder.ts b/src/compiler/builder.ts index 541cc24413f..d70f55edc9d 100644 --- a/src/compiler/builder.ts +++ b/src/compiler/builder.ts @@ -619,7 +619,10 @@ namespace ts { fileInfos[relativeToBuildInfo(key)] = signature === undefined ? value : { version: value.version, signature }; }); - const result: ProgramBuildInfo = { fileInfos, options: state.compilerOptions }; + const result: ProgramBuildInfo = { + fileInfos, + options: convertToReusableCompilerOptions(state.compilerOptions, relativeToBuildInfo) + }; if (state.referencedMap) { const referencedMap: MapLike = {}; state.referencedMap.forEach((value, key) => { @@ -663,6 +666,40 @@ namespace ts { } } + function convertToReusableCompilerOptions(options: CompilerOptions, relativeToBuildInfo: (path: string) => string) { + const result: CompilerOptions = {}; + const optionsNameMap = getOptionNameMap().optionNameMap; + + for (const name in options) { + if (hasProperty(options, name)) { + result[name] = convertToReusableCompilerOptionValue( + optionsNameMap.get(name.toLowerCase()), + options[name] as CompilerOptionsValue, + relativeToBuildInfo + ); + } + } + if (result.configFilePath) { + result.configFilePath = relativeToBuildInfo(result.configFilePath); + } + return result; + } + + function convertToReusableCompilerOptionValue(option: CommandLineOption | undefined, value: CompilerOptionsValue, relativeToBuildInfo: (path: string) => string) { + if (option) { + if (option.type === "list") { + const values = value as ReadonlyArray; + if (option.element.isFilePath && values.length) { + return values.map(relativeToBuildInfo); + } + } + else if (option.isFilePath) { + return relativeToBuildInfo(value as string); + } + } + return value; + } + function convertToReusableDiagnostics(diagnostics: ReadonlyArray, relativeToBuildInfo: (path: string) => string): ReadonlyArray { Debug.assert(!!diagnostics.length); return diagnostics.map(diagnostic => { @@ -991,7 +1028,7 @@ namespace ts { const state: ReusableBuilderProgramState = { fileInfos, - compilerOptions: program.options, + compilerOptions: convertFromReusableCompilerOptions(program.options, toAbsolutePath), referencedMap: getMapOfReferencedSet(program.referencedMap, toPath), exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap, toPath), semanticDiagnosticsPerFile: program.semanticDiagnosticsPerFile && arrayToMap(program.semanticDiagnosticsPerFile, value => isString(value) ? value : value[0], value => isString(value) ? emptyArray : value[1]), @@ -1023,6 +1060,44 @@ namespace ts { function toPath(path: string) { return ts.toPath(path, buildInfoDirectory, getCanonicalFileName); } + + function toAbsolutePath(path: string) { + return getNormalizedAbsolutePath(path, buildInfoDirectory); + } + } + + function convertFromReusableCompilerOptions(options: CompilerOptions, toAbsolutePath: (path: string) => string) { + const result: CompilerOptions = {}; + const optionsNameMap = getOptionNameMap().optionNameMap; + + for (const name in options) { + if (hasProperty(options, name)) { + result[name] = convertFromReusableCompilerOptionValue( + optionsNameMap.get(name.toLowerCase()), + options[name] as CompilerOptionsValue, + toAbsolutePath + ); + } + } + if (result.configFilePath) { + result.configFilePath = toAbsolutePath(result.configFilePath); + } + return result; + } + + function convertFromReusableCompilerOptionValue(option: CommandLineOption | undefined, value: CompilerOptionsValue, toAbsolutePath: (path: string) => string) { + if (option) { + if (option.type === "list") { + const values = value as ReadonlyArray; + if (option.element.isFilePath && values.length) { + return values.map(toAbsolutePath); + } + } + else if (option.isFilePath) { + return toAbsolutePath(value as string); + } + } + return value; } export function createRedirectedBuilderProgram(state: { program: Program | undefined; compilerOptions: CompilerOptions; }, configFileParsingDiagnostics: ReadonlyArray): BuilderProgram { diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 394a94cb663..9fa2dfe1501 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -969,7 +969,8 @@ namespace ts { return typeAcquisition; } - function getOptionNameMap(): OptionNameMap { + /* @internal */ + export function getOptionNameMap(): OptionNameMap { return optionNameMapCache || (optionNameMapCache = createOptionNameMap(optionDeclarations)); } diff --git a/src/testRunner/unittests/tscWatch/incremental.ts b/src/testRunner/unittests/tscWatch/incremental.ts index e0dfb29016c..03c63bb95ff 100644 --- a/src/testRunner/unittests/tscWatch/incremental.ts +++ b/src/testRunner/unittests/tscWatch/incremental.ts @@ -174,7 +174,10 @@ namespace ts.tscWatch { [file1Path]: getFileInfo(file1.content), [file2Path]: getFileInfo(file2.content) }, - options: { incremental: true, configFilePath: configFile.path }, + options: { + incremental: true, + configFilePath: "./tsconfig.json" + }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [libFilePath, file1Path, file2Path] @@ -197,7 +200,10 @@ namespace ts.tscWatch { [file1Path]: getFileInfo(file1.content), [file2Path]: getFileInfo(modifiedFile2Content) }, - options: { incremental: true, configFilePath: configFile.path }, + options: { + incremental: true, + configFilePath: "./tsconfig.json" + }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [libFilePath, file1Path, file2Path] @@ -249,7 +255,10 @@ namespace ts.tscWatch { [file1Path]: getFileInfo(file1.content), [file2Path]: file2FileInfo }, - options: { incremental: true, configFilePath: configFile.path }, + options: { + incremental: true, + configFilePath: "./tsconfig.json" + }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [ @@ -276,7 +285,10 @@ namespace ts.tscWatch { [file1Path]: getFileInfo(modifiedFile1Content), [file2Path]: file2FileInfo }, - options: { incremental: true, configFilePath: configFile.path }, + options: { + incremental: true, + configFilePath: "./tsconfig.json" + }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [ @@ -380,7 +392,11 @@ namespace ts.tscWatch { [file1Path]: getFileInfo(file1.content), [file2Path]: getFileInfo(file2.content) }, - options: { incremental: true, module: ModuleKind.AMD, configFilePath: configFile.path }, + options: { + incremental: true, + module: ModuleKind.AMD, + configFilePath: "./tsconfig.json" + }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [libFilePath, file1Path, file2Path] @@ -402,7 +418,11 @@ namespace ts.tscWatch { [file1Path]: getFileInfo(file1.content), [file2Path]: getFileInfo(modifiedFile2Content) }, - options: { incremental: true, module: ModuleKind.AMD, configFilePath: configFile.path }, + options: { + incremental: true, + module: ModuleKind.AMD, + configFilePath: "./tsconfig.json" + }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [libFilePath, file1Path, file2Path] @@ -454,7 +474,11 @@ namespace ts.tscWatch { [file1Path]: getFileInfo(file1.content), [file2Path]: file2FileInfo }, - options: { incremental: true, module: ModuleKind.AMD, configFilePath: configFile.path }, + options: { + incremental: true, + module: ModuleKind.AMD, + configFilePath: "./tsconfig.json" + }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [ @@ -480,7 +504,11 @@ namespace ts.tscWatch { [file1Path]: getFileInfo(modifiedFile1Content), [file2Path]: file2FileInfo }, - options: { incremental: true, module: ModuleKind.AMD, configFilePath: configFile.path }, + options: { + incremental: true, + module: ModuleKind.AMD, + configFilePath: "./tsconfig.json" + }, referencedMap: {}, exportedModulesMap: {}, semanticDiagnosticsPerFile: [ diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js index e6fb4d53c12..c9334a7bcc9 100644 --- a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js +++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/incremental-declaration-changes/inferred-type-from-transitive-module.js @@ -58,9 +58,9 @@ export declare const lazyBar: LazyAction<() => void, typeof import("./lazyIndex" "options": { "target": 1, "declaration": true, - "outDir": "/src/obj", + "outDir": "./", "incremental": true, - "configFilePath": "/src/tsconfig.json" + "configFilePath": "../tsconfig.json" }, "referencedMap": { "../index.ts": [ diff --git a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module.js b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module.js index 1de6d110e02..88e0b710bb4 100644 --- a/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module.js +++ b/tests/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/initial-Build/inferred-type-from-transitive-module.js @@ -96,9 +96,9 @@ exports.bar = bar_1.default; "options": { "target": 1, "declaration": true, - "outDir": "/src/obj", + "outDir": "./", "incremental": true, - "configFilePath": "/src/tsconfig.json" + "configFilePath": "../tsconfig.json" }, "referencedMap": { "../index.ts": [ diff --git a/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js b/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js index fb85601c160..bfd580e9a99 100644 --- a/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js +++ b/tests/baselines/reference/tsbuild/lateBoundSymbol/incremental-declaration-doesnt-change/interface-is-merged-and-contains-late-bound-member.js @@ -39,9 +39,9 @@ type A = HKT[typeof sym]; } }, "options": { - "rootDir": "/src/src", + "rootDir": "./src", "incremental": true, - "configFilePath": "/src/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "./src/main.ts": [ diff --git a/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js b/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js index 48ae88b77cb..d1e15d4ca99 100644 --- a/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js +++ b/tests/baselines/reference/tsbuild/lateBoundSymbol/initial-Build/interface-is-merged-and-contains-late-bound-member.js @@ -32,9 +32,9 @@ var x = 10; } }, "options": { - "rootDir": "/src/src", + "rootDir": "./src", "incremental": true, - "configFilePath": "/src/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "./src/main.ts": [ diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js index e21e1a3b4cb..cc92be46021 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/sample.js @@ -193,7 +193,7 @@ export class someClass { } "declaration": true, "declarationMap": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/core/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": {}, "exportedModulesMap": {}, @@ -234,7 +234,7 @@ export class someClass { } "sourceMap": true, "forceConsistentCasingInFileNames": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/logic/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "./index.ts": [ @@ -287,7 +287,7 @@ export class someClass { } "declaration": true, "forceConsistentCasingInFileNames": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/tests/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "../logic/index.ts": [ diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js index 90d449acc85..d58354590cb 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-declaration-option-changes.js @@ -41,7 +41,7 @@ export declare function multiply(a: number, b: number): number; "incremental": true, "declaration": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/core/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": {}, "exportedModulesMap": {}, diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js index 444c03f4d09..feefdf8f816 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-logic-config-changes-declaration-dir.js @@ -44,11 +44,11 @@ export declare const m: typeof mod; "options": { "composite": true, "declaration": true, - "declarationDir": "/src/logic/decls", + "declarationDir": "./decls", "sourceMap": true, "forceConsistentCasingInFileNames": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/logic/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "./index.ts": [ @@ -101,7 +101,7 @@ export declare const m: typeof mod; "declaration": true, "forceConsistentCasingInFileNames": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/tests/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "../logic/index.ts": [ diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-target-option-changes.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-target-option-changes.js index 95de840f6bc..8e740f6a235 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-target-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-target-option-changes.js @@ -54,7 +54,7 @@ exports.multiply = multiply; "listFiles": true, "listEmittedFiles": true, "target": 1, - "configFilePath": "/src/core/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": {}, "exportedModulesMap": {}, diff --git a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js index 715b0331f16..ed2fb38595b 100644 --- a/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/incremental-declaration-doesnt-change/sample.js @@ -46,7 +46,7 @@ class someClass { } "declaration": true, "declarationMap": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/core/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": {}, "exportedModulesMap": {}, diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js index e61fc8ae88e..75e23dfa0af 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/sample.js @@ -206,7 +206,7 @@ exports.multiply = multiply; "declaration": true, "declarationMap": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/core/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": {}, "exportedModulesMap": {}, @@ -392,7 +392,7 @@ sourceFile:index.ts "sourceMap": true, "forceConsistentCasingInFileNames": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/logic/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "./index.ts": [ @@ -461,7 +461,7 @@ exports.m = mod; "declaration": true, "forceConsistentCasingInFileNames": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/tests/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "../logic/index.ts": [ diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js index 9e1c9e71efb..8a66ec9da1f 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-declaration-option-changes.js @@ -46,7 +46,7 @@ exports.multiply = multiply; "options": { "incremental": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/core/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": {}, "exportedModulesMap": {}, diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js index e61fc8ae88e..75e23dfa0af 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-config-changes-declaration-dir.js @@ -206,7 +206,7 @@ exports.multiply = multiply; "declaration": true, "declarationMap": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/core/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": {}, "exportedModulesMap": {}, @@ -392,7 +392,7 @@ sourceFile:index.ts "sourceMap": true, "forceConsistentCasingInFileNames": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/logic/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "./index.ts": [ @@ -461,7 +461,7 @@ exports.m = mod; "declaration": true, "forceConsistentCasingInFileNames": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/tests/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "../logic/index.ts": [ diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js index 809c003d732..f419af6508a 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-logic-specifies-tsBuildInfoFile.js @@ -206,7 +206,7 @@ exports.multiply = multiply; "declaration": true, "declarationMap": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/core/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": {}, "exportedModulesMap": {}, @@ -388,12 +388,12 @@ sourceFile:index.ts }, "options": { "composite": true, - "tsBuildInfoFile": "/src/logic/ownFile.tsbuildinfo", + "tsBuildInfoFile": "./ownFile.tsbuildinfo", "declaration": true, "sourceMap": true, "forceConsistentCasingInFileNames": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/logic/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "./index.ts": [ @@ -478,7 +478,7 @@ exports.m = mod; "declaration": true, "forceConsistentCasingInFileNames": true, "skipDefaultLibCheck": true, - "configFilePath": "/src/tests/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": { "../logic/index.ts": [ diff --git a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js index 884cb3d6186..895ac5e4bc5 100644 --- a/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js +++ b/tests/baselines/reference/tsbuild/sample1/initial-Build/when-target-option-changes.js @@ -71,7 +71,7 @@ export function multiply(a, b) { return a * b; } "listFiles": true, "listEmittedFiles": true, "target": 8, - "configFilePath": "/src/core/tsconfig.json" + "configFilePath": "./tsconfig.json" }, "referencedMap": {}, "exportedModulesMap": {}, From b9fc44ece7f6c067fd7cb225cceee74f51fc5990 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 19 Jun 2019 13:17:26 -0700 Subject: [PATCH 11/27] Bundle info paths as relative to tsbuildinfo file --- src/compiler/emitter.ts | 50 ++++++++++++++----- src/compiler/types.ts | 1 + .../unittests/tscWatch/incremental.ts | 8 +-- .../modules-and-globals-mixed-in-amd.js | 24 ++++----- .../multiple-emitHelpers-in-all-projects.js | 24 ++++----- .../multiple-prologues-in-all-projects.js | 24 ++++----- .../shebang-in-all-projects.js | 24 ++++----- .../stripInternal.js | 24 ++++----- .../triple-slash-refs-in-all-projects.js | 24 ++++----- .../multiple-emitHelpers-in-all-projects.js | 24 ++++----- .../multiple-prologues-in-all-projects.js | 24 ++++----- .../stripInternal.js | 24 ++++----- .../modules-and-globals-mixed-in-amd.js | 24 ++++----- .../multiple-emitHelpers-in-all-projects.js | 24 ++++----- .../multiple-prologues-in-all-projects.js | 24 ++++----- .../initial-Build/shebang-in-all-projects.js | 24 ++++----- .../initial-Build/stripInternal.js | 24 ++++----- .../triple-slash-refs-in-all-projects.js | 24 ++++----- ...e-resolution-finds-original-source-file.js | 24 ++++----- .../baseline-sectioned-sourcemaps.js | 28 +++++------ .../emitHelpers-in-all-projects.js | 28 +++++------ .../multiple-prologues-in-all-projects.js | 28 +++++------ .../shebang-in-all-projects.js | 28 +++++------ .../strict-in-all-projects.js | 28 +++++------ ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- .../stripInternal.js | 28 +++++------ .../triple-slash-refs-in-all-projects.js | 28 +++++------ .../baseline-sectioned-sourcemaps.js | 28 +++++------ .../emitHelpers-in-all-projects.js | 28 +++++------ ...tHelpers-in-only-one-dependency-project.js | 28 +++++------ .../multiple-emitHelpers-in-all-projects.js | 28 +++++------ ...tiple-emitHelpers-in-different-projects.js | 28 +++++------ .../multiple-prologues-in-all-projects.js | 28 +++++------ ...ultiple-prologues-in-different-projects.js | 28 +++++------ .../shebang-in-all-projects.js | 28 +++++------ .../shebang-in-only-one-dependency-project.js | 28 +++++------ .../strict-in-all-projects.js | 28 +++++------ .../strict-in-one-dependency.js | 28 +++++------ ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- .../stripInternal-jsdoc-style-comment.js | 28 +++++------ ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- ...-jsdoc-style-with-comments-emit-enabled.js | 28 +++++------ ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- ...tripInternal-with-comments-emit-enabled.js | 28 +++++------ .../stripInternal.js | 28 +++++------ .../triple-slash-refs-in-all-projects.js | 28 +++++------ .../triple-slash-refs-in-one-project.js | 28 +++++------ ...t-composite-but-uses-project-references.js | 8 +-- ...-source-files-are-empty-in-the-own-file.js | 28 +++++------ .../emitHelpers-in-all-projects.js | 28 +++++------ ...tHelpers-in-only-one-dependency-project.js | 28 +++++------ .../multiple-emitHelpers-in-all-projects.js | 28 +++++------ ...tiple-emitHelpers-in-different-projects.js | 28 +++++------ .../multiple-prologues-in-all-projects.js | 28 +++++------ ...ultiple-prologues-in-different-projects.js | 28 +++++------ .../strict-in-all-projects.js | 28 +++++------ .../strict-in-one-dependency.js | 28 +++++------ ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- .../stripInternal-jsdoc-style-comment.js | 28 +++++------ ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- ...tripInternal-with-comments-emit-enabled.js | 28 +++++------ .../stripInternal.js | 28 +++++------ .../baseline-sectioned-sourcemaps.js | 34 ++++++------- .../declarationMap-and-sourceMap-disabled.js | 14 +++--- .../emitHelpers-in-all-projects.js | 34 ++++++------- ...tHelpers-in-only-one-dependency-project.js | 34 ++++++------- .../multiple-emitHelpers-in-all-projects.js | 34 ++++++------- ...tiple-emitHelpers-in-different-projects.js | 34 ++++++------- .../multiple-prologues-in-all-projects.js | 34 ++++++------- ...ultiple-prologues-in-different-projects.js | 34 ++++++------- .../initial-Build/shebang-in-all-projects.js | 34 ++++++------- .../shebang-in-only-one-dependency-project.js | 34 ++++++------- .../initial-Build/strict-in-all-projects.js | 34 ++++++------- .../initial-Build/strict-in-one-dependency.js | 34 ++++++------- ...hen-internal-is-inside-another-internal.js | 34 ++++++------- ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- .../stripInternal-jsdoc-style-comment.js | 34 ++++++------- ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- ...-jsdoc-style-with-comments-emit-enabled.js | 34 ++++++------- ...l-when-few-members-of-enum-are-internal.js | 34 ++++++------- ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- ...en-one-two-three-are-prepended-in-order.js | 34 ++++++------- ...tripInternal-with-comments-emit-enabled.js | 34 ++++++------- .../initial-Build/stripInternal.js | 34 ++++++------- .../triple-slash-refs-in-all-projects.js | 34 ++++++------- .../triple-slash-refs-in-one-project.js | 34 ++++++------- ...roject-is-not-composite-but-incremental.js | 34 ++++++------- ...t-composite-but-uses-project-references.js | 14 +++--- ...final-project-specifies-tsBuildInfoFile.js | 34 ++++++------- ...-source-files-are-empty-in-the-own-file.js | 34 ++++++------- 92 files changed, 1334 insertions(+), 1309 deletions(-) diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index ddd273c3602..456a53f2651 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -249,14 +249,16 @@ namespace ts { }; function emitSourceFileOrBundle({ jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, buildInfoPath }: EmitFileNames, sourceFileOrBundle: SourceFile | Bundle | undefined) { + let buildInfoDirectory: string | undefined; if (buildInfoPath && sourceFileOrBundle && isBundle(sourceFileOrBundle)) { + buildInfoDirectory = getDirectoryPath(buildInfoPath); bundleBuildInfo = { - commonSourceDirectory: host.getCommonSourceDirectory(), - sourceFiles: sourceFileOrBundle.sourceFiles.map(file => file.fileName) + commonSourceDirectory: relativeToBuildInfo(host.getCommonSourceDirectory()), + sourceFiles: sourceFileOrBundle.sourceFiles.map(file => relativeToBuildInfo(file.fileName)) }; } - emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath); - emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath); + emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, relativeToBuildInfo); + emitDeclarationFileOrBundle(sourceFileOrBundle, declarationFilePath, declarationMapPath, relativeToBuildInfo); emitBuildInfo(bundleBuildInfo, buildInfoPath); if (!emitSkipped && emittedFilesList) { @@ -278,6 +280,10 @@ namespace ts { emittedFilesList.push(declarationMapPath); } } + + function relativeToBuildInfo(path: string) { + return ensurePathIsNonModuleName(getRelativePathFromDirectory(buildInfoDirectory!, path, host.getCanonicalFileName)); + } } function emitBuildInfo(bundle: BundleBuildInfo | undefined, buildInfoPath: string | undefined) { @@ -291,7 +297,11 @@ namespace ts { writeFile(host, emitterDiagnostics, buildInfoPath, getBuildInfoText({ bundle, program, version }), /*writeByteOrderMark*/ false); } - function emitJsFileOrBundle(sourceFileOrBundle: SourceFile | Bundle | undefined, jsFilePath: string | undefined, sourceMapFilePath: string | undefined) { + function emitJsFileOrBundle( + sourceFileOrBundle: SourceFile | Bundle | undefined, + jsFilePath: string | undefined, + sourceMapFilePath: string | undefined, + relativeToBuildInfo: (path: string) => string) { if (!sourceFileOrBundle || emitOnlyDtsFiles || !jsFilePath) { return; } @@ -314,7 +324,8 @@ namespace ts { inlineSourceMap: compilerOptions.inlineSourceMap, inlineSources: compilerOptions.inlineSources, extendedDiagnostics: compilerOptions.extendedDiagnostics, - writeBundleFileInfo: !!bundleBuildInfo + writeBundleFileInfo: !!bundleBuildInfo, + relativeToBuildInfo }; // Create a printer to print the nodes @@ -335,7 +346,11 @@ namespace ts { if (bundleBuildInfo) bundleBuildInfo.js = printer.bundleFileInfo; } - function emitDeclarationFileOrBundle(sourceFileOrBundle: SourceFile | Bundle | undefined, declarationFilePath: string | undefined, declarationMapPath: string | undefined) { + function emitDeclarationFileOrBundle( + sourceFileOrBundle: SourceFile | Bundle | undefined, + declarationFilePath: string | undefined, + declarationMapPath: string | undefined, + relativeToBuildInfo: (path: string) => string) { if (!sourceFileOrBundle || !(declarationFilePath && !isInJSFile(sourceFileOrBundle))) { return; } @@ -366,7 +381,8 @@ namespace ts { extendedDiagnostics: compilerOptions.extendedDiagnostics, onlyPrintJsDocStyle: true, writeBundleFileInfo: !!bundleBuildInfo, - recordInternalSection: !!bundleBuildInfo + recordInternalSection: !!bundleBuildInfo, + relativeToBuildInfo }; const declarationPrinter = createPrinter(printerOptions, { @@ -613,10 +629,10 @@ namespace ts { getNewLine(): string; } - function createSourceFilesFromBundleBuildInfo(bundle: BundleBuildInfo): ReadonlyArray { + function createSourceFilesFromBundleBuildInfo(bundle: BundleBuildInfo, buildInfoDirectory: string): ReadonlyArray { const sourceFiles = bundle.sourceFiles.map(fileName => { const sourceFile = createNode(SyntaxKind.SourceFile, 0, 0) as SourceFile; - sourceFile.fileName = fileName; + sourceFile.fileName = getNormalizedAbsolutePath(fileName, buildInfoDirectory); sourceFile.text = ""; sourceFile.statements = createNodeArray(); return sourceFile; @@ -660,6 +676,7 @@ namespace ts { const buildInfo = getBuildInfo(buildInfoText); if (!buildInfo.bundle || !buildInfo.bundle.js || (declarationText && !buildInfo.bundle.dts)) return buildInfoPath!; + const buildInfoDirectory = getDirectoryPath(buildInfoPath!); const ownPrependInput = createInputFiles( jsFileText, declarationText!, @@ -675,11 +692,11 @@ namespace ts { ); const outputFiles: OutputFile[] = []; const prependNodes = createPrependNodes(config.projectReferences, getCommandLine, f => host.readFile(f)); - const sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle); + const sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle, buildInfoDirectory); const emitHost: EmitHost = { getPrependNodes: memoize(() => [...prependNodes, ownPrependInput]), getCanonicalFileName: host.getCanonicalFileName, - getCommonSourceDirectory: () => buildInfo.bundle!.commonSourceDirectory, + getCommonSourceDirectory: () => getNormalizedAbsolutePath(buildInfo.bundle!.commonSourceDirectory, buildInfoDirectory), getCompilerOptions: () => config.options, getCurrentDirectory: () => host.getCurrentDirectory(), getNewLine: () => host.getNewLine(), @@ -774,6 +791,7 @@ namespace ts { let write = writeBase; let isOwnFileEmit: boolean; const bundleFileInfo = printerOptions.writeBundleFileInfo ? { sections: [] } as BundleFileInfo : undefined; + const relativeToBuildInfo = bundleFileInfo ? Debug.assertDefined(printerOptions.relativeToBuildInfo) : undefined; const recordInternalSection = printerOptions.recordInternalSection; let sourceFileTextPos = 0; let sourceFileTextKind: BundleFileTextLikeKind = BundleFileSectionKind.Text; @@ -942,7 +960,13 @@ namespace ts { if (prepend.oldFileOfCurrentEmit) bundleFileInfo.sections.push(...newSections); else { newSections.forEach(section => Debug.assert(isBundleFileTextLike(section))); - bundleFileInfo.sections.push({ pos, end: writer.getTextPos(), kind: BundleFileSectionKind.Prepend, data: (prepend as UnparsedSource).fileName, texts: newSections as BundleFileTextLike[] }); + bundleFileInfo.sections.push({ + pos, + end: writer.getTextPos(), + kind: BundleFileSectionKind.Prepend, + data: relativeToBuildInfo!((prepend as UnparsedSource).fileName), + texts: newSections as BundleFileTextLike[] + }); } } } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 845c63b707b..761c9d83790 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -5726,6 +5726,7 @@ namespace ts { /*@internal*/ writeBundleFileInfo?: boolean; /*@internal*/ recordInternalSection?: boolean; /*@internal*/ stripInternal?: boolean; + /*@internal*/ relativeToBuildInfo?: (path: string) => string; } /* @internal */ diff --git a/src/testRunner/unittests/tscWatch/incremental.ts b/src/testRunner/unittests/tscWatch/incremental.ts index 03c63bb95ff..15f5a6dbe5f 100644 --- a/src/testRunner/unittests/tscWatch/incremental.ts +++ b/src/testRunner/unittests/tscWatch/incremental.ts @@ -322,8 +322,8 @@ namespace ts.tscWatch { path: `${project}/out.tsbuildinfo`, content: getBuildInfoText({ bundle: { - commonSourceDirectory: `${project}/`, - sourceFiles: [file1.path, file2.path], + commonSourceDirectory: relativeToBuildInfo(`${project}/out.tsbuildinfo`, `${project}/`), + sourceFiles: [file1Path, file2Path], js: { sections: [ { pos: 0, end: outFile.content.length, kind: BundleFileSectionKind.Text } @@ -550,8 +550,8 @@ namespace ts.tscWatch { path: `${project}/out.tsbuildinfo`, content: getBuildInfoText({ bundle: { - commonSourceDirectory: `${project}/`, - sourceFiles: [file1.path, file2.path], + commonSourceDirectory: relativeToBuildInfo(`${project}/out.tsbuildinfo`, `${project}/`), + sourceFiles: [file1Path, file2Path], js: { sections: [ { pos: 0, end: outFile.content.length, kind: BundleFileSectionKind.Text } diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/modules-and-globals-mixed-in-amd.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/modules-and-globals-mixed-in-amd.js index 1df2f57322a..e30eed1615a 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/modules-and-globals-mixed-in-amd.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/modules-and-globals-mixed-in-amd.js @@ -221,10 +221,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -232,7 +232,7 @@ sourceFile:file4.ts "pos": 0, "end": 438, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 0, @@ -254,7 +254,7 @@ sourceFile:file4.ts "pos": 0, "end": 171, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -278,7 +278,7 @@ sourceFile:file4.ts ====================================================================== File:: /src/app/module.js ---------------------------------------------------------------------- -prepend: (0-438):: /src/lib/module.js texts:: 1 +prepend: (0-438):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (0-438) var myGlob = 20; @@ -308,7 +308,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-171):: /src/lib/module.d.ts texts:: 1 +prepend: (0-171):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-171) declare const myGlob = 20; @@ -496,12 +496,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js index e71e158b6bc..6297215f3ca 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js @@ -593,10 +593,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -622,7 +622,7 @@ sourceFile:file4.ts "pos": 1180, "end": 1935, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 1180, @@ -651,7 +651,7 @@ sourceFile:file4.ts "pos": 0, "end": 227, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -712,7 +712,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (1180-1935):: /src/lib/module.js texts:: 1 +prepend: (1180-1935):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (1180-1935) var myGlob = 20; @@ -762,7 +762,7 @@ appfile4Spread.apply(void 0, __spread([10, 20, 30])); ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-227):: /src/lib/module.d.ts texts:: 1 +prepend: (0-227):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-227) declare const myGlob = 20; @@ -1171,12 +1171,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js index 0e846ce4745..689dc08570f 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js @@ -305,10 +305,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -340,7 +340,7 @@ sourceFile:file4.ts "pos": 62, "end": 523, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 62, @@ -390,7 +390,7 @@ sourceFile:file4.ts "pos": 0, "end": 171, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -426,7 +426,7 @@ prologue: (30-44):: myPrologue3 prologue: (46-60):: myPrologue2 "myPrologue2"; ---------------------------------------------------------------------- -prepend: (62-523):: /src/lib/module.js texts:: 1 +prepend: (62-523):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (62-523) var myGlob = 20; @@ -458,7 +458,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-171):: /src/lib/module.d.ts texts:: 1 +prepend: (0-171):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-171) declare const myGlob = 20; @@ -698,12 +698,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/shebang-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/shebang-in-all-projects.js index d5cd667821c..d55f61ae925 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/shebang-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/shebang-in-all-projects.js @@ -226,10 +226,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -237,7 +237,7 @@ sourceFile:file4.ts "pos": 25, "end": 463, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 25, @@ -259,7 +259,7 @@ sourceFile:file4.ts "pos": 25, "end": 196, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 25, @@ -283,7 +283,7 @@ sourceFile:file4.ts ====================================================================== File:: /src/app/module.js ---------------------------------------------------------------------- -prepend: (25-463):: /src/lib/module.js texts:: 1 +prepend: (25-463):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (25-463) var myGlob = 20; @@ -313,7 +313,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (25-196):: /src/lib/module.d.ts texts:: 1 +prepend: (25-196):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (25-196) declare const myGlob = 20; @@ -506,12 +506,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/stripInternal.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/stripInternal.js index 967ca7d4a19..16f1d50a224 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/stripInternal.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/stripInternal.js @@ -1664,10 +1664,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -1675,7 +1675,7 @@ sourceFile:file4.ts "pos": 0, "end": 4158, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 0, @@ -1697,7 +1697,7 @@ sourceFile:file4.ts "pos": 0, "end": 217, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -1721,7 +1721,7 @@ sourceFile:file4.ts ====================================================================== File:: /src/app/module.js ---------------------------------------------------------------------- -prepend: (0-4158):: /src/lib/module.js texts:: 1 +prepend: (0-4158):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (0-4158) /*@internal*/ var myGlob = 20; @@ -1841,7 +1841,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-217):: /src/lib/module.d.ts texts:: 1 +prepend: (0-217):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-217) declare module "file1" { @@ -3500,12 +3500,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js index 3f54094bbb4..ece0a5fc25a 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js @@ -297,10 +297,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -308,7 +308,7 @@ sourceFile:file4.ts "pos": 0, "end": 513, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 0, @@ -342,7 +342,7 @@ sourceFile:file4.ts "pos": 89, "end": 297, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 89, @@ -366,7 +366,7 @@ sourceFile:file4.ts ====================================================================== File:: /src/app/module.js ---------------------------------------------------------------------- -prepend: (0-513):: /src/lib/module.js texts:: 1 +prepend: (0-513):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (0-513) /// @@ -406,7 +406,7 @@ reference: (0-39):: tripleRef.d.ts reference: (41-87):: ../lib/tripleRef.d.ts /// ---------------------------------------------------------------------- -prepend: (89-297):: /src/lib/module.d.ts texts:: 1 +prepend: (89-297):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (89-297) declare const file0Const: libfile0; @@ -634,12 +634,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js index dd4ab0b77fd..6c9be3154a5 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js @@ -532,10 +532,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -561,7 +561,7 @@ sourceFile:file4.ts "pos": 1180, "end": 1821, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 1180, @@ -590,7 +590,7 @@ sourceFile:file4.ts "pos": 0, "end": 227, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -651,7 +651,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (1180-1821):: /src/lib/module.js texts:: 1 +prepend: (1180-1821):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (1180-1821) var myGlob = 20; @@ -698,7 +698,7 @@ appfile4Spread.apply(void 0, __spread([10, 20, 30])); ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-227):: /src/lib/module.d.ts texts:: 1 +prepend: (0-227):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-227) declare const myGlob = 20; @@ -1022,12 +1022,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js index cf4206dd92e..df3412c267c 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js @@ -469,10 +469,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -504,7 +504,7 @@ sourceFile:file4.ts "pos": 62, "end": 514, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 62, @@ -554,7 +554,7 @@ sourceFile:file4.ts "pos": 0, "end": 171, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -590,7 +590,7 @@ prologue: (30-44):: myPrologue3 prologue: (46-60):: myPrologue2 "myPrologue2"; ---------------------------------------------------------------------- -prepend: (62-514):: /src/lib/module.js texts:: 1 +prepend: (62-514):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (62-514) var myGlob = 20; @@ -622,7 +622,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-171):: /src/lib/module.d.ts texts:: 1 +prepend: (0-171):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-171) declare const myGlob = 20; @@ -972,12 +972,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/stripInternal.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/stripInternal.js index 5d966ce119e..1c8bad6c40a 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/stripInternal.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/incremental-headers-change-without-dts-changes/stripInternal.js @@ -1844,10 +1844,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -1855,7 +1855,7 @@ sourceFile:file4.ts "pos": 0, "end": 4143, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 0, @@ -1877,7 +1877,7 @@ sourceFile:file4.ts "pos": 0, "end": 191, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -1901,7 +1901,7 @@ sourceFile:file4.ts ====================================================================== File:: /src/app/module.js ---------------------------------------------------------------------- -prepend: (0-4143):: /src/lib/module.js texts:: 1 +prepend: (0-4143):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (0-4143) /*@internal*/ var myGlob = 20; @@ -2020,7 +2020,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-191):: /src/lib/module.d.ts texts:: 1 +prepend: (0-191):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-191) declare module "file1" { @@ -4365,12 +4365,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/modules-and-globals-mixed-in-amd.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/modules-and-globals-mixed-in-amd.js index 8ed340ba812..4106601d1e3 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/modules-and-globals-mixed-in-amd.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/modules-and-globals-mixed-in-amd.js @@ -380,10 +380,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -391,7 +391,7 @@ sourceFile:file4.ts "pos": 0, "end": 409, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 0, @@ -413,7 +413,7 @@ sourceFile:file4.ts "pos": 0, "end": 171, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -437,7 +437,7 @@ sourceFile:file4.ts ====================================================================== File:: /src/app/module.js ---------------------------------------------------------------------- -prepend: (0-409):: /src/lib/module.js texts:: 1 +prepend: (0-409):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (0-409) var myGlob = 20; @@ -466,7 +466,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-171):: /src/lib/module.d.ts texts:: 1 +prepend: (0-171):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-171) declare const myGlob = 20; @@ -753,12 +753,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/multiple-emitHelpers-in-all-projects.js index 52b1fff8303..eeb57b9cf9e 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/multiple-emitHelpers-in-all-projects.js @@ -826,10 +826,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -855,7 +855,7 @@ sourceFile:file4.ts "pos": 1180, "end": 1906, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 1180, @@ -884,7 +884,7 @@ sourceFile:file4.ts "pos": 0, "end": 227, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -945,7 +945,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (1180-1906):: /src/lib/module.js texts:: 1 +prepend: (1180-1906):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (1180-1906) var myGlob = 20; @@ -994,7 +994,7 @@ appfile4Spread.apply(void 0, __spread([10, 20, 30])); ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-227):: /src/lib/module.d.ts texts:: 1 +prepend: (0-227):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-227) declare const myGlob = 20; @@ -1560,12 +1560,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/multiple-prologues-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/multiple-prologues-in-all-projects.js index b02bd3eda87..4835019b1f9 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/multiple-prologues-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/multiple-prologues-in-all-projects.js @@ -478,10 +478,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -513,7 +513,7 @@ sourceFile:file4.ts "pos": 62, "end": 494, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 62, @@ -563,7 +563,7 @@ sourceFile:file4.ts "pos": 0, "end": 171, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -599,7 +599,7 @@ prologue: (30-44):: myPrologue3 prologue: (46-60):: myPrologue2 "myPrologue2"; ---------------------------------------------------------------------- -prepend: (62-494):: /src/lib/module.js texts:: 1 +prepend: (62-494):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (62-494) var myGlob = 20; @@ -630,7 +630,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-171):: /src/lib/module.d.ts texts:: 1 +prepend: (0-171):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-171) declare const myGlob = 20; @@ -1001,12 +1001,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/shebang-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/shebang-in-all-projects.js index 879886a6565..eb0407a5b17 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/shebang-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/shebang-in-all-projects.js @@ -395,10 +395,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -406,7 +406,7 @@ sourceFile:file4.ts "pos": 25, "end": 434, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 25, @@ -428,7 +428,7 @@ sourceFile:file4.ts "pos": 25, "end": 196, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 25, @@ -452,7 +452,7 @@ sourceFile:file4.ts ====================================================================== File:: /src/app/module.js ---------------------------------------------------------------------- -prepend: (25-434):: /src/lib/module.js texts:: 1 +prepend: (25-434):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (25-434) var myGlob = 20; @@ -481,7 +481,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (25-196):: /src/lib/module.d.ts texts:: 1 +prepend: (25-196):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (25-196) declare const myGlob = 20; @@ -784,12 +784,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/stripInternal.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/stripInternal.js index cc6e0679812..dcac12cae9f 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/stripInternal.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/stripInternal.js @@ -1863,10 +1863,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -1874,7 +1874,7 @@ sourceFile:file4.ts "pos": 0, "end": 4129, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 0, @@ -1896,7 +1896,7 @@ sourceFile:file4.ts "pos": 0, "end": 217, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 0, @@ -1920,7 +1920,7 @@ sourceFile:file4.ts ====================================================================== File:: /src/app/module.js ---------------------------------------------------------------------- -prepend: (0-4129):: /src/lib/module.js texts:: 1 +prepend: (0-4129):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (0-4129) /*@internal*/ var myGlob = 20; @@ -2039,7 +2039,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-217):: /src/lib/module.d.ts texts:: 1 +prepend: (0-217):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-217) declare module "file1" { @@ -4457,12 +4457,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/triple-slash-refs-in-all-projects.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/triple-slash-refs-in-all-projects.js index 43e85f88471..30f8da909cd 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/triple-slash-refs-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/triple-slash-refs-in-all-projects.js @@ -511,10 +511,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -522,7 +522,7 @@ sourceFile:file4.ts "pos": 0, "end": 484, "kind": "prepend", - "data": "/src/lib/module.js", + "data": "../lib/module.js", "texts": [ { "pos": 0, @@ -556,7 +556,7 @@ sourceFile:file4.ts "pos": 89, "end": 297, "kind": "prepend", - "data": "/src/lib/module.d.ts", + "data": "../lib/module.d.ts", "texts": [ { "pos": 89, @@ -580,7 +580,7 @@ sourceFile:file4.ts ====================================================================== File:: /src/app/module.js ---------------------------------------------------------------------- -prepend: (0-484):: /src/lib/module.js texts:: 1 +prepend: (0-484):: ../lib/module.js texts:: 1 >>-------------------------------------------------------------------- text: (0-484) /// @@ -619,7 +619,7 @@ reference: (0-39):: tripleRef.d.ts reference: (41-87):: ../lib/tripleRef.d.ts /// ---------------------------------------------------------------------- -prepend: (89-297):: /src/lib/module.d.ts texts:: 1 +prepend: (89-297):: ../lib/module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (89-297) declare const file0Const: libfile0; @@ -979,12 +979,12 @@ sourceFile:global.ts //// [/src/lib/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/lib/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./file0.ts", + "./file1.ts", + "./file2.ts", + "./global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/when-the-module-resolution-finds-original-source-file.js b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/when-the-module-resolution-finds-original-source-file.js index 119eb04f23a..3fdb37efb3a 100644 --- a/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/when-the-module-resolution-finds-original-source-file.js +++ b/tests/baselines/reference/tsbuild/amdModulesWithOut/initial-Build/when-the-module-resolution-finds-original-source-file.js @@ -385,10 +385,10 @@ sourceFile:file4.ts //// [/src/app/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/app/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/app/file3.ts", - "/src/app/file4.ts" + "./file3.ts", + "./file4.ts" ], "js": { "sections": [ @@ -396,7 +396,7 @@ sourceFile:file4.ts "pos": 0, "end": 417, "kind": "prepend", - "data": "/src/module.js", + "data": "../module.js", "texts": [ { "pos": 0, @@ -418,7 +418,7 @@ sourceFile:file4.ts "pos": 0, "end": 179, "kind": "prepend", - "data": "/src/module.d.ts", + "data": "../module.d.ts", "texts": [ { "pos": 0, @@ -442,7 +442,7 @@ sourceFile:file4.ts ====================================================================== File:: /src/app/module.js ---------------------------------------------------------------------- -prepend: (0-417):: /src/module.js texts:: 1 +prepend: (0-417):: ../module.js texts:: 1 >>-------------------------------------------------------------------- text: (0-417) var myGlob = 20; @@ -471,7 +471,7 @@ var myVar = 30; ====================================================================== File:: /src/app/module.d.ts ---------------------------------------------------------------------- -prepend: (0-179):: /src/module.d.ts texts:: 1 +prepend: (0-179):: ../module.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-179) declare const myGlob = 20; @@ -542,12 +542,12 @@ var globalConst = 10; //// [/src/module.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/", + "commonSourceDirectory": "./", "sourceFiles": [ - "/src/lib/file0.ts", - "/src/lib/file1.ts", - "/src/lib/file2.ts", - "/src/lib/global.ts" + "./lib/file0.ts", + "./lib/file1.ts", + "./lib/file2.ts", + "./lib/global.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/baseline-sectioned-sourcemaps.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/baseline-sectioned-sourcemaps.js index 76213f9b6ce..b8705b1b03d 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/baseline-sectioned-sourcemaps.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/baseline-sectioned-sourcemaps.js @@ -301,11 +301,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1109,9 +1109,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1119,7 +1119,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 109, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1132,7 +1132,7 @@ sourceFile:../../third_part1.ts "pos": 109, "end": 394, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 109, @@ -1154,7 +1154,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 156, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1167,7 +1167,7 @@ sourceFile:../../third_part1.ts "pos": 156, "end": 256, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 156, @@ -1191,7 +1191,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-109):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-109):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-109) var s = "Hola, world"; @@ -1202,7 +1202,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (109-394):: /src/2/second-output.js texts:: 1 +prepend: (109-394):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (109-394) var N; @@ -1230,7 +1230,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-156):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-156):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-156) interface TheFirst { @@ -1243,7 +1243,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (156-256):: /src/2/second-output.d.ts texts:: 1 +prepend: (156-256):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (156-256) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/emitHelpers-in-all-projects.js index 6271da6473a..f3a11792c1f 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/emitHelpers-in-all-projects.js @@ -396,11 +396,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1472,9 +1472,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1488,7 +1488,7 @@ sourceFile:../../third_part1.ts "pos": 502, "end": 728, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 502, @@ -1501,7 +1501,7 @@ sourceFile:../../third_part1.ts "pos": 728, "end": 1132, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 728, @@ -1528,7 +1528,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 207, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1541,7 +1541,7 @@ sourceFile:../../third_part1.ts "pos": 207, "end": 360, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 207, @@ -1578,7 +1578,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (502-728):: /src/first/bin/first-output.js texts:: 1 +prepend: (502-728):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (502-728) var s = "Hola, world"; @@ -1592,7 +1592,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (728-1132):: /src/2/second-output.js texts:: 1 +prepend: (728-1132):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (728-1132) var N; @@ -1626,7 +1626,7 @@ function forthirdthird_part1Rest() { ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-207):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-207):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-207) interface TheFirst { @@ -1640,7 +1640,7 @@ declare function forfirstfirst_PART1Rest(): void; declare function f(): string; ---------------------------------------------------------------------- -prepend: (207-360):: /src/2/second-output.d.ts texts:: 1 +prepend: (207-360):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (207-360) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/multiple-prologues-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/multiple-prologues-in-all-projects.js index 253fe2963c7..3b3e6b136dc 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/multiple-prologues-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/multiple-prologues-in-all-projects.js @@ -318,11 +318,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1236,9 +1236,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1270,7 +1270,7 @@ sourceFile:../../third_part1.ts "pos": 62, "end": 171, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 62, @@ -1283,7 +1283,7 @@ sourceFile:../../third_part1.ts "pos": 171, "end": 456, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 171, @@ -1342,7 +1342,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 156, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1355,7 +1355,7 @@ sourceFile:../../third_part1.ts "pos": 156, "end": 256, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 156, @@ -1391,7 +1391,7 @@ prologue: (30-44):: myPrologue2 prologue: (46-60):: myPrologue3 "myPrologue3"; ---------------------------------------------------------------------- -prepend: (62-171):: /src/first/bin/first-output.js texts:: 1 +prepend: (62-171):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (62-171) var s = "Hola, world"; @@ -1402,7 +1402,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (171-456):: /src/2/second-output.js texts:: 1 +prepend: (171-456):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (171-456) var N; @@ -1430,7 +1430,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-156):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-156):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-156) interface TheFirst { @@ -1443,7 +1443,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (156-256):: /src/2/second-output.d.ts texts:: 1 +prepend: (156-256):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (156-256) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/shebang-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/shebang-in-all-projects.js index 1dec0c6adfc..5dc312d58ce 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/shebang-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/shebang-in-all-projects.js @@ -308,11 +308,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1128,9 +1128,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1138,7 +1138,7 @@ sourceFile:../../third_part1.ts "pos": 33, "end": 142, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 33, @@ -1151,7 +1151,7 @@ sourceFile:../../third_part1.ts "pos": 142, "end": 427, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 142, @@ -1173,7 +1173,7 @@ sourceFile:../../third_part1.ts "pos": 33, "end": 189, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 33, @@ -1186,7 +1186,7 @@ sourceFile:../../third_part1.ts "pos": 189, "end": 289, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 189, @@ -1210,7 +1210,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (33-142):: /src/first/bin/first-output.js texts:: 1 +prepend: (33-142):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (33-142) var s = "Hola, world"; @@ -1221,7 +1221,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (142-427):: /src/2/second-output.js texts:: 1 +prepend: (142-427):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (142-427) var N; @@ -1249,7 +1249,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (33-189):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (33-189):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (33-189) interface TheFirst { @@ -1262,7 +1262,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (189-289):: /src/2/second-output.d.ts texts:: 1 +prepend: (189-289):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (189-289) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/strict-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/strict-in-all-projects.js index f0a326a6b66..84d8de40064 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/strict-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/strict-in-all-projects.js @@ -303,11 +303,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1141,9 +1141,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1157,7 +1157,7 @@ sourceFile:../../third_part1.ts "pos": 15, "end": 124, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 15, @@ -1170,7 +1170,7 @@ sourceFile:../../third_part1.ts "pos": 124, "end": 409, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 124, @@ -1211,7 +1211,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 156, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1224,7 +1224,7 @@ sourceFile:../../third_part1.ts "pos": 156, "end": 256, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 156, @@ -1251,7 +1251,7 @@ File:: /src/third/thirdjs/output/third-output.js prologue: (0-13):: use strict "use strict"; ---------------------------------------------------------------------- -prepend: (15-124):: /src/first/bin/first-output.js texts:: 1 +prepend: (15-124):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (15-124) var s = "Hola, world"; @@ -1262,7 +1262,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (124-409):: /src/2/second-output.js texts:: 1 +prepend: (124-409):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (124-409) var N; @@ -1290,7 +1290,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-156):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-156):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-156) interface TheFirst { @@ -1303,7 +1303,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (156-256):: /src/2/second-output.d.ts texts:: 1 +prepend: (156-256):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (156-256) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/stripInternal-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/stripInternal-when-one-two-three-are-prepended-in-order.js index c82ee4e581b..0b7ac11a100 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/stripInternal-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/stripInternal-when-one-two-three-are-prepended-in-order.js @@ -2540,10 +2540,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2551,7 +2551,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 109, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2573,7 +2573,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 156, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2632,7 +2632,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-109):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-109):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-109) var s = "Hola, world"; @@ -2751,7 +2751,7 @@ var C = (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-156):: /src/first/bin/first-output.d.ts texts:: 2 +prepend: (0-156):: ../first/bin/first-output.d.ts texts:: 2 >>-------------------------------------------------------------------- internal: (0-39) interface TheFirst { @@ -3141,11 +3141,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -5257,9 +5257,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -5267,7 +5267,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3161, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -5289,7 +5289,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 275, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -5313,7 +5313,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3161):: /src/2/second-output.js texts:: 1 +prepend: (0-3161):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3161) var s = "Hola, world"; @@ -5434,7 +5434,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-275):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-275):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-275) declare const s = "Hola, world"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/stripInternal.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/stripInternal.js index b7f8e605cc8..031180b66ce 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/stripInternal.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/stripInternal.js @@ -301,11 +301,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2417,9 +2417,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2427,7 +2427,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 109, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2440,7 +2440,7 @@ sourceFile:../../third_part1.ts "pos": 109, "end": 3161, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 109, @@ -2462,7 +2462,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 115, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2475,7 +2475,7 @@ sourceFile:../../third_part1.ts "pos": 115, "end": 275, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 115, @@ -2499,7 +2499,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-109):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-109):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-109) var s = "Hola, world"; @@ -2510,7 +2510,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (109-3161):: /src/2/second-output.js texts:: 1 +prepend: (109-3161):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (109-3161) var N; @@ -2625,7 +2625,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-115):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-115):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-115) declare const s = "Hola, world"; @@ -2635,7 +2635,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (115-275):: /src/2/second-output.d.ts texts:: 1 +prepend: (115-275):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (115-275) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/triple-slash-refs-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/triple-slash-refs-in-all-projects.js index 19f2c6e32b1..837220d8dd1 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/triple-slash-refs-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-changes/triple-slash-refs-in-all-projects.js @@ -358,11 +358,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1343,9 +1343,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1353,7 +1353,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1366,7 +1366,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 493, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 157, @@ -1406,7 +1406,7 @@ sourceFile:../../third_part1.ts "pos": 160, "end": 367, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 160, @@ -1419,7 +1419,7 @@ sourceFile:../../third_part1.ts "pos": 367, "end": 521, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 367, @@ -1443,7 +1443,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-157) var s = "Hola, world"; @@ -1455,7 +1455,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (157-493):: /src/2/second-output.js texts:: 1 +prepend: (157-493):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (157-493) var second_part1Const = new secondsecond_part1(); @@ -1494,7 +1494,7 @@ reference: (47-101):: ../../../first/tripleRef.d.ts reference: (103-158):: ../../../second/tripleRef.d.ts /// ---------------------------------------------------------------------- -prepend: (160-367):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (160-367):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (160-367) interface TheFirst { @@ -1508,7 +1508,7 @@ declare const first_part2Const: firstfirst_part2; declare function f(): string; ---------------------------------------------------------------------- -prepend: (367-521):: /src/2/second-output.d.ts texts:: 1 +prepend: (367-521):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (367-521) declare const second_part1Const: secondsecond_part1; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/baseline-sectioned-sourcemaps.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/baseline-sectioned-sourcemaps.js index dd601438212..de8f6f9b0db 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/baseline-sectioned-sourcemaps.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/baseline-sectioned-sourcemaps.js @@ -186,11 +186,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -760,9 +760,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -770,7 +770,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -783,7 +783,7 @@ sourceFile:../../third_part1.ts "pos": 127, "end": 412, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 127, @@ -805,7 +805,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -818,7 +818,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -842,7 +842,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -854,7 +854,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (127-412):: /src/2/second-output.js texts:: 1 +prepend: (127-412):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (127-412) var N; @@ -882,7 +882,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -895,7 +895,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-all-projects.js index 828d013c259..2c8eeceeac3 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-all-projects.js @@ -260,11 +260,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1044,9 +1044,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1060,7 +1060,7 @@ sourceFile:../../third_part1.ts "pos": 502, "end": 746, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 502, @@ -1073,7 +1073,7 @@ sourceFile:../../third_part1.ts "pos": 746, "end": 1150, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 746, @@ -1100,7 +1100,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 208, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1113,7 +1113,7 @@ sourceFile:../../third_part1.ts "pos": 208, "end": 361, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 208, @@ -1150,7 +1150,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (502-746):: /src/first/bin/first-output.js texts:: 1 +prepend: (502-746):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (502-746) var s = "Hello, world"; @@ -1165,7 +1165,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (746-1150):: /src/2/second-output.js texts:: 1 +prepend: (746-1150):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (746-1150) var N; @@ -1199,7 +1199,7 @@ function forthirdthird_part1Rest() { ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-208):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-208):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-208) interface TheFirst { @@ -1213,7 +1213,7 @@ declare function forfirstfirst_PART1Rest(): void; declare function f(): string; ---------------------------------------------------------------------- -prepend: (208-361):: /src/2/second-output.d.ts texts:: 1 +prepend: (208-361):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (208-361) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-only-one-dependency-project.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-only-one-dependency-project.js index 44e22ae289e..80c79449ce1 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-only-one-dependency-project.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/emitHelpers-in-only-one-dependency-project.js @@ -204,11 +204,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -873,9 +873,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -889,7 +889,7 @@ sourceFile:../../third_part1.ts "pos": 502, "end": 669, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 502, @@ -902,7 +902,7 @@ sourceFile:../../third_part1.ts "pos": 669, "end": 1073, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 669, @@ -924,7 +924,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 208, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -937,7 +937,7 @@ sourceFile:../../third_part1.ts "pos": 208, "end": 361, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 208, @@ -974,7 +974,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (502-669):: /src/first/bin/first-output.js texts:: 1 +prepend: (502-669):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (502-669) var s = "Hello, world"; @@ -987,7 +987,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (669-1073):: /src/2/second-output.js texts:: 1 +prepend: (669-1073):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (669-1073) var N; @@ -1018,7 +1018,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-208):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-208):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-208) interface TheFirst { @@ -1032,7 +1032,7 @@ declare function forfirstfirst_PART1Rest(): void; declare function f(): string; ---------------------------------------------------------------------- -prepend: (208-361):: /src/2/second-output.d.ts texts:: 1 +prepend: (208-361):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (208-361) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js index 2efa78454c0..9a1d94824d4 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-all-projects.js @@ -402,11 +402,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1579,9 +1579,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1607,7 +1607,7 @@ sourceFile:../../third_part1.ts "pos": 1180, "end": 1636, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 1180, @@ -1620,7 +1620,7 @@ sourceFile:../../third_part1.ts "pos": 1636, "end": 2256, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 1636, @@ -1649,7 +1649,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 272, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1662,7 +1662,7 @@ sourceFile:../../third_part1.ts "pos": 272, "end": 491, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 272, @@ -1723,7 +1723,7 @@ var __spread = (this && this.__spread) || function () { return ar; }; ---------------------------------------------------------------------- -prepend: (1180-1636):: /src/first/bin/first-output.js texts:: 1 +prepend: (1180-1636):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1180-1636) var s = "Hello, world"; @@ -1745,7 +1745,7 @@ function firstfirst_part3Spread() { firstfirst_part3Spread.apply(void 0, __spread([10, 20, 30])); ---------------------------------------------------------------------- -prepend: (1636-2256):: /src/2/second-output.js texts:: 1 +prepend: (1636-2256):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1636-2256) var N; @@ -1793,7 +1793,7 @@ thirdthird_part1Spread.apply(void 0, __spread([10, 20, 30])); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-272):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-272):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-272) interface TheFirst { @@ -1808,7 +1808,7 @@ declare function f(): string; declare function firstfirst_part3Spread(...b: number[]): void; ---------------------------------------------------------------------- -prepend: (272-491):: /src/2/second-output.d.ts texts:: 1 +prepend: (272-491):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (272-491) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-different-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-different-projects.js index fc441e6a919..5a6d733931e 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-different-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-emitHelpers-in-different-projects.js @@ -260,11 +260,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1134,9 +1134,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1162,7 +1162,7 @@ sourceFile:../../third_part1.ts "pos": 1180, "end": 1424, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 1180, @@ -1175,7 +1175,7 @@ sourceFile:../../third_part1.ts "pos": 1424, "end": 1925, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 1424, @@ -1202,7 +1202,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 208, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1215,7 +1215,7 @@ sourceFile:../../third_part1.ts "pos": 208, "end": 374, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 208, @@ -1276,7 +1276,7 @@ var __spread = (this && this.__spread) || function () { return ar; }; ---------------------------------------------------------------------- -prepend: (1180-1424):: /src/first/bin/first-output.js texts:: 1 +prepend: (1180-1424):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1180-1424) var s = "Hello, world"; @@ -1291,7 +1291,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (1424-1925):: /src/2/second-output.js texts:: 1 +prepend: (1424-1925):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1424-1925) var N; @@ -1329,7 +1329,7 @@ function forthirdthird_part1Rest() { ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-208):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-208):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-208) interface TheFirst { @@ -1343,7 +1343,7 @@ declare function forfirstfirst_PART1Rest(): void; declare function f(): string; ---------------------------------------------------------------------- -prepend: (208-374):: /src/2/second-output.d.ts texts:: 1 +prepend: (208-374):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (208-374) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js index 35873e95388..c8eae0ea272 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-all-projects.js @@ -202,11 +202,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -881,9 +881,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -915,7 +915,7 @@ sourceFile:../../third_part1.ts "pos": 62, "end": 189, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 62, @@ -928,7 +928,7 @@ sourceFile:../../third_part1.ts "pos": 189, "end": 474, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 189, @@ -987,7 +987,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1000,7 +1000,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1036,7 +1036,7 @@ prologue: (30-44):: myPrologue2 prologue: (46-60):: myPrologue3 "myPrologue3"; ---------------------------------------------------------------------- -prepend: (62-189):: /src/first/bin/first-output.js texts:: 1 +prepend: (62-189):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (62-189) var s = "Hello, world"; @@ -1048,7 +1048,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (189-474):: /src/2/second-output.js texts:: 1 +prepend: (189-474):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (189-474) var N; @@ -1076,7 +1076,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1089,7 +1089,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-different-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-different-projects.js index b4c18d19029..cbf38cf0642 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-different-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/multiple-prologues-in-different-projects.js @@ -188,11 +188,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -828,9 +828,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -856,7 +856,7 @@ sourceFile:../../third_part1.ts "pos": 46, "end": 173, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 46, @@ -869,7 +869,7 @@ sourceFile:../../third_part1.ts "pos": 173, "end": 458, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 173, @@ -910,7 +910,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -923,7 +923,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -956,7 +956,7 @@ prologue: (15-28):: myPrologue prologue: (30-44):: myPrologue2 "myPrologue2"; ---------------------------------------------------------------------- -prepend: (46-173):: /src/first/bin/first-output.js texts:: 1 +prepend: (46-173):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (46-173) var s = "Hello, world"; @@ -968,7 +968,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (173-458):: /src/2/second-output.js texts:: 1 +prepend: (173-458):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (173-458) var N; @@ -996,7 +996,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1009,7 +1009,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-all-projects.js index 6bfe067b159..b0c4c820ac2 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-all-projects.js @@ -190,11 +190,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -771,9 +771,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -781,7 +781,7 @@ sourceFile:../../third_part1.ts "pos": 33, "end": 160, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 33, @@ -794,7 +794,7 @@ sourceFile:../../third_part1.ts "pos": 160, "end": 445, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 160, @@ -816,7 +816,7 @@ sourceFile:../../third_part1.ts "pos": 33, "end": 190, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 33, @@ -829,7 +829,7 @@ sourceFile:../../third_part1.ts "pos": 190, "end": 290, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 190, @@ -853,7 +853,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (33-160):: /src/first/bin/first-output.js texts:: 1 +prepend: (33-160):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (33-160) var s = "Hello, world"; @@ -865,7 +865,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (160-445):: /src/2/second-output.js texts:: 1 +prepend: (160-445):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (160-445) var N; @@ -893,7 +893,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (33-190):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (33-190):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (33-190) interface TheFirst { @@ -906,7 +906,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (190-290):: /src/2/second-output.d.ts texts:: 1 +prepend: (190-290):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (190-290) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-only-one-dependency-project.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-only-one-dependency-project.js index 3f8540c42d4..d89f565e375 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-only-one-dependency-project.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/shebang-in-only-one-dependency-project.js @@ -186,11 +186,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -763,9 +763,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -773,7 +773,7 @@ sourceFile:../../third_part1.ts "pos": 35, "end": 162, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 35, @@ -786,7 +786,7 @@ sourceFile:../../third_part1.ts "pos": 162, "end": 447, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 162, @@ -808,7 +808,7 @@ sourceFile:../../third_part1.ts "pos": 35, "end": 192, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 35, @@ -821,7 +821,7 @@ sourceFile:../../third_part1.ts "pos": 192, "end": 292, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 192, @@ -845,7 +845,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (35-162):: /src/first/bin/first-output.js texts:: 1 +prepend: (35-162):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (35-162) var s = "Hello, world"; @@ -857,7 +857,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (162-447):: /src/2/second-output.js texts:: 1 +prepend: (162-447):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (162-447) var N; @@ -885,7 +885,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (35-192):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (35-192):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (35-192) interface TheFirst { @@ -898,7 +898,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (192-292):: /src/2/second-output.d.ts texts:: 1 +prepend: (192-292):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (192-292) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-all-projects.js index 6258dd97d25..5cf3ea7abd4 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-all-projects.js @@ -188,11 +188,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -792,9 +792,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -808,7 +808,7 @@ sourceFile:../../third_part1.ts "pos": 15, "end": 142, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 15, @@ -821,7 +821,7 @@ sourceFile:../../third_part1.ts "pos": 142, "end": 427, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 142, @@ -862,7 +862,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -875,7 +875,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -902,7 +902,7 @@ File:: /src/third/thirdjs/output/third-output.js prologue: (0-13):: use strict "use strict"; ---------------------------------------------------------------------- -prepend: (15-142):: /src/first/bin/first-output.js texts:: 1 +prepend: (15-142):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (15-142) var s = "Hello, world"; @@ -914,7 +914,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (142-427):: /src/2/second-output.js texts:: 1 +prepend: (142-427):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (142-427) var N; @@ -942,7 +942,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -955,7 +955,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-one-dependency.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-one-dependency.js index ca03930150c..372ef671910 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-one-dependency.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/strict-in-one-dependency.js @@ -186,11 +186,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -762,9 +762,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -778,7 +778,7 @@ sourceFile:../../third_part1.ts "pos": 15, "end": 142, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 15, @@ -791,7 +791,7 @@ sourceFile:../../third_part1.ts "pos": 142, "end": 427, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 142, @@ -813,7 +813,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -826,7 +826,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -853,7 +853,7 @@ File:: /src/third/thirdjs/output/third-output.js prologue: (0-13):: use strict "use strict"; ---------------------------------------------------------------------- -prepend: (15-142):: /src/first/bin/first-output.js texts:: 1 +prepend: (15-142):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (15-142) var s = "Hello, world"; @@ -865,7 +865,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (142-427):: /src/2/second-output.js texts:: 1 +prepend: (142-427):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (142-427) var N; @@ -893,7 +893,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -906,7 +906,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js index d1b45613c2e..d9691fde1a8 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js @@ -1725,10 +1725,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -1736,7 +1736,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1758,7 +1758,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1817,7 +1817,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -1937,7 +1937,7 @@ var C = (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 2 +prepend: (0-157):: ../first/bin/first-output.d.ts texts:: 2 >>-------------------------------------------------------------------- internal: (0-39) interface TheFirst { @@ -2212,11 +2212,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -4072,9 +4072,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -4082,7 +4082,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3179, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -4104,7 +4104,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -4128,7 +4128,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3179):: /src/2/second-output.js texts:: 1 +prepend: (0-3179):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3179) var s = "Hello, world"; @@ -4250,7 +4250,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-276) declare const s = "Hello, world"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment.js index 764219107a9..38403c4693d 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-comment.js @@ -186,11 +186,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2046,9 +2046,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2056,7 +2056,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2069,7 +2069,7 @@ sourceFile:../../third_part1.ts "pos": 127, "end": 3179, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 127, @@ -2091,7 +2091,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 116, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2104,7 +2104,7 @@ sourceFile:../../third_part1.ts "pos": 116, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 116, @@ -2128,7 +2128,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -2140,7 +2140,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (127-3179):: /src/2/second-output.js texts:: 1 +prepend: (127-3179):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (127-3179) var N; @@ -2255,7 +2255,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-116):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-116):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-116) declare const s = "Hello, world"; @@ -2265,7 +2265,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (116-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (116-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (116-276) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index beb2d1cc67a..a48020f4ba7 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -1825,10 +1825,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -1836,7 +1836,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1858,7 +1858,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 172, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1917,7 +1917,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -2037,7 +2037,7 @@ var C = /** @class */ (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-172):: /src/first/bin/first-output.d.ts texts:: 2 +prepend: (0-172):: ../first/bin/first-output.d.ts texts:: 2 >>-------------------------------------------------------------------- internal: (0-54) /**@internal*/ interface TheFirst { @@ -2312,11 +2312,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -4272,9 +4272,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -4282,7 +4282,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3561, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -4304,7 +4304,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -4328,7 +4328,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3561):: /src/2/second-output.js texts:: 1 +prepend: (0-3561):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3561) var s = "Hello, world"; @@ -4450,7 +4450,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-276) declare const s = "Hello, world"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled.js index 6b82b8598be..29ad265d6ab 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-jsdoc-style-with-comments-emit-enabled.js @@ -186,11 +186,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2146,9 +2146,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2156,7 +2156,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2169,7 +2169,7 @@ sourceFile:../../third_part1.ts "pos": 127, "end": 3561, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 127, @@ -2191,7 +2191,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 116, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2204,7 +2204,7 @@ sourceFile:../../third_part1.ts "pos": 116, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 116, @@ -2228,7 +2228,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -2240,7 +2240,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (127-3561):: /src/2/second-output.js texts:: 1 +prepend: (127-3561):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (127-3561) var N; @@ -2355,7 +2355,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-116):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-116):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-116) declare const s = "Hello, world"; @@ -2365,7 +2365,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (116-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (116-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (116-276) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-when-one-two-three-are-prepended-in-order.js index 564e08a5e38..08a0bffd148 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-when-one-two-three-are-prepended-in-order.js @@ -1725,10 +1725,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -1736,7 +1736,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1758,7 +1758,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1817,7 +1817,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -1937,7 +1937,7 @@ var C = (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 2 +prepend: (0-157):: ../first/bin/first-output.d.ts texts:: 2 >>-------------------------------------------------------------------- internal: (0-39) interface TheFirst { @@ -2212,11 +2212,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -4072,9 +4072,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -4082,7 +4082,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3179, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -4104,7 +4104,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -4128,7 +4128,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3179):: /src/2/second-output.js texts:: 1 +prepend: (0-3179):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3179) var s = "Hello, world"; @@ -4250,7 +4250,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-276) declare const s = "Hello, world"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index eeb8407c881..e17e3f05842 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -1825,10 +1825,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -1836,7 +1836,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1858,7 +1858,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1917,7 +1917,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -2037,7 +2037,7 @@ var C = /** @class */ (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 2 +prepend: (0-157):: ../first/bin/first-output.d.ts texts:: 2 >>-------------------------------------------------------------------- internal: (0-39) interface TheFirst { @@ -2312,11 +2312,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -4272,9 +4272,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -4282,7 +4282,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3543, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -4304,7 +4304,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -4328,7 +4328,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3543):: /src/2/second-output.js texts:: 1 +prepend: (0-3543):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3543) var s = "Hello, world"; @@ -4450,7 +4450,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-276) declare const s = "Hello, world"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled.js index 9dd8185be7d..29c643c43f5 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal-with-comments-emit-enabled.js @@ -186,11 +186,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2146,9 +2146,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2156,7 +2156,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2169,7 +2169,7 @@ sourceFile:../../third_part1.ts "pos": 127, "end": 3543, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 127, @@ -2191,7 +2191,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 116, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2204,7 +2204,7 @@ sourceFile:../../third_part1.ts "pos": 116, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 116, @@ -2228,7 +2228,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -2240,7 +2240,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (127-3543):: /src/2/second-output.js texts:: 1 +prepend: (127-3543):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (127-3543) var N; @@ -2355,7 +2355,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-116):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-116):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-116) declare const s = "Hello, world"; @@ -2365,7 +2365,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (116-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (116-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (116-276) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal.js index 8b4b41c6ae7..e91c046c278 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/stripInternal.js @@ -186,11 +186,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2046,9 +2046,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2056,7 +2056,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2069,7 +2069,7 @@ sourceFile:../../third_part1.ts "pos": 127, "end": 3179, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 127, @@ -2091,7 +2091,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 116, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2104,7 +2104,7 @@ sourceFile:../../third_part1.ts "pos": 116, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 116, @@ -2128,7 +2128,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -2140,7 +2140,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (127-3179):: /src/2/second-output.js texts:: 1 +prepend: (127-3179):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (127-3179) var N; @@ -2255,7 +2255,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-116):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-116):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-116) declare const s = "Hello, world"; @@ -2265,7 +2265,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (116-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (116-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (116-276) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js index 1b9ced8b498..a7e041fe565 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-all-projects.js @@ -215,11 +215,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -887,9 +887,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -897,7 +897,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 175, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -910,7 +910,7 @@ sourceFile:../../third_part1.ts "pos": 175, "end": 511, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 175, @@ -950,7 +950,7 @@ sourceFile:../../third_part1.ts "pos": 160, "end": 368, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 160, @@ -963,7 +963,7 @@ sourceFile:../../third_part1.ts "pos": 368, "end": 522, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 368, @@ -987,7 +987,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-175):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-175):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-175) var s = "Hello, world"; @@ -1000,7 +1000,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (175-511):: /src/2/second-output.js texts:: 1 +prepend: (175-511):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (175-511) var second_part1Const = new secondsecond_part1(); @@ -1039,7 +1039,7 @@ reference: (47-101):: ../../../first/tripleRef.d.ts reference: (103-158):: ../../../second/tripleRef.d.ts /// ---------------------------------------------------------------------- -prepend: (160-368):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (160-368):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (160-368) interface TheFirst { @@ -1053,7 +1053,7 @@ declare const first_part2Const: firstfirst_part2; declare function f(): string; ---------------------------------------------------------------------- -prepend: (368-522):: /src/2/second-output.d.ts texts:: 1 +prepend: (368-522):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (368-522) declare const second_part1Const: secondsecond_part1; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-one-project.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-one-project.js index 9b459e7469e..c34e752d808 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-one-project.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/triple-slash-refs-in-one-project.js @@ -186,11 +186,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -789,9 +789,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -799,7 +799,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -812,7 +812,7 @@ sourceFile:../../third_part1.ts "pos": 127, "end": 463, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 127, @@ -840,7 +840,7 @@ sourceFile:../../third_part1.ts "pos": 57, "end": 214, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 57, @@ -853,7 +853,7 @@ sourceFile:../../third_part1.ts "pos": 214, "end": 368, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 214, @@ -877,7 +877,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -889,7 +889,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (127-463):: /src/2/second-output.js texts:: 1 +prepend: (127-463):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (127-463) var second_part1Const = new secondsecond_part1(); @@ -921,7 +921,7 @@ File:: /src/third/thirdjs/output/third-output.d.ts reference: (0-55):: ../../../second/tripleRef.d.ts /// ---------------------------------------------------------------------- -prepend: (57-214):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (57-214):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (57-214) interface TheFirst { @@ -934,7 +934,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (214-368):: /src/2/second-output.d.ts texts:: 1 +prepend: (214-368):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (214-368) declare const second_part1Const: secondsecond_part1; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-final-project-is-not-composite-but-uses-project-references.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-final-project-is-not-composite-but-uses-project-references.js index 87797890960..eb117294ec4 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-final-project-is-not-composite-but-uses-project-references.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-final-project-is-not-composite-but-uses-project-references.js @@ -186,11 +186,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-source-files-are-empty-in-the-own-file.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-source-files-are-empty-in-the-own-file.js index e74c0b0fe6f..d050ca2dd0c 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-source-files-are-empty-in-the-own-file.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-declaration-doesnt-change/when-source-files-are-empty-in-the-own-file.js @@ -186,11 +186,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -705,9 +705,9 @@ sourceFile:../../../second/second_part2.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -715,7 +715,7 @@ sourceFile:../../../second/second_part2.ts "pos": 0, "end": 127, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -728,7 +728,7 @@ sourceFile:../../../second/second_part2.ts "pos": 127, "end": 412, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 127, @@ -745,7 +745,7 @@ sourceFile:../../../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -758,7 +758,7 @@ sourceFile:../../../second/second_part2.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -777,7 +777,7 @@ sourceFile:../../../second/second_part2.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-127):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-127):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-127) var s = "Hello, world"; @@ -789,7 +789,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (127-412):: /src/2/second-output.js texts:: 1 +prepend: (127-412):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (127-412) var N; @@ -812,7 +812,7 @@ var C = (function () { ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -825,7 +825,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-all-projects.js index f168d0562a0..f595aac7193 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-all-projects.js @@ -326,11 +326,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1316,9 +1316,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1332,7 +1332,7 @@ sourceFile:../../third_part1.ts "pos": 502, "end": 652, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 502, @@ -1345,7 +1345,7 @@ sourceFile:../../third_part1.ts "pos": 652, "end": 1056, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 652, @@ -1372,7 +1372,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 208, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1385,7 +1385,7 @@ sourceFile:../../third_part1.ts "pos": 208, "end": 361, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 208, @@ -1422,7 +1422,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (502-652):: /src/first/bin/first-output.js texts:: 1 +prepend: (502-652):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (502-652) var s = "Hello, world"; @@ -1434,7 +1434,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (652-1056):: /src/2/second-output.js texts:: 1 +prepend: (652-1056):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (652-1056) var N; @@ -1468,7 +1468,7 @@ function forthirdthird_part1Rest() { ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-208):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-208):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-208) interface TheFirst { @@ -1482,7 +1482,7 @@ declare function forfirstfirst_PART1Rest(): void; declare function f(): string; ---------------------------------------------------------------------- -prepend: (208-361):: /src/2/second-output.d.ts texts:: 1 +prepend: (208-361):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (208-361) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-only-one-dependency-project.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-only-one-dependency-project.js index d043ab564b2..65d56d99c99 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-only-one-dependency-project.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/emitHelpers-in-only-one-dependency-project.js @@ -384,11 +384,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1367,9 +1367,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1383,7 +1383,7 @@ sourceFile:../../third_part1.ts "pos": 502, "end": 729, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 502, @@ -1396,7 +1396,7 @@ sourceFile:../../third_part1.ts "pos": 729, "end": 1133, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 729, @@ -1418,7 +1418,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 208, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1431,7 +1431,7 @@ sourceFile:../../third_part1.ts "pos": 208, "end": 361, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 208, @@ -1468,7 +1468,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (502-729):: /src/first/bin/first-output.js texts:: 1 +prepend: (502-729):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (502-729) var s = "Hello, world"; @@ -1482,7 +1482,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (729-1133):: /src/2/second-output.js texts:: 1 +prepend: (729-1133):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (729-1133) var N; @@ -1513,7 +1513,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-208):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-208):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-208) interface TheFirst { @@ -1527,7 +1527,7 @@ declare function forfirstfirst_PART1Rest(): void; declare function f(): string; ---------------------------------------------------------------------- -prepend: (208-361):: /src/2/second-output.d.ts texts:: 1 +prepend: (208-361):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (208-361) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js index eee32672ff5..85a0007b0ff 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-all-projects.js @@ -498,11 +498,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1978,9 +1978,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2006,7 +2006,7 @@ sourceFile:../../third_part1.ts "pos": 1180, "end": 1542, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 1180, @@ -2019,7 +2019,7 @@ sourceFile:../../third_part1.ts "pos": 1542, "end": 2162, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 1542, @@ -2048,7 +2048,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 272, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2061,7 +2061,7 @@ sourceFile:../../third_part1.ts "pos": 272, "end": 491, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 272, @@ -2122,7 +2122,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (1180-1542):: /src/first/bin/first-output.js texts:: 1 +prepend: (1180-1542):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1180-1542) var s = "Hello, world"; @@ -2141,7 +2141,7 @@ function firstfirst_part3Spread() { firstfirst_part3Spread.apply(void 0, __spread([10, 20, 30])); ---------------------------------------------------------------------- -prepend: (1542-2162):: /src/2/second-output.js texts:: 1 +prepend: (1542-2162):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1542-2162) var N; @@ -2189,7 +2189,7 @@ thirdthird_part1Spread.apply(void 0, __spread([10, 20, 30])); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-272):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-272):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-272) interface TheFirst { @@ -2204,7 +2204,7 @@ declare function f(): string; declare function firstfirst_part3Spread(...b: number[]): void; ---------------------------------------------------------------------- -prepend: (272-491):: /src/2/second-output.d.ts texts:: 1 +prepend: (272-491):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (272-491) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-different-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-different-projects.js index 73bbca16dff..ea399602b00 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-different-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-emitHelpers-in-different-projects.js @@ -326,11 +326,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1420,9 +1420,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1448,7 +1448,7 @@ sourceFile:../../third_part1.ts "pos": 1180, "end": 1330, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 1180, @@ -1461,7 +1461,7 @@ sourceFile:../../third_part1.ts "pos": 1330, "end": 1831, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 1330, @@ -1488,7 +1488,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 208, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1501,7 +1501,7 @@ sourceFile:../../third_part1.ts "pos": 208, "end": 374, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 208, @@ -1562,7 +1562,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (1180-1330):: /src/first/bin/first-output.js texts:: 1 +prepend: (1180-1330):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1180-1330) var s = "Hello, world"; @@ -1574,7 +1574,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (1330-1831):: /src/2/second-output.js texts:: 1 +prepend: (1330-1831):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1330-1831) var N; @@ -1612,7 +1612,7 @@ function forthirdthird_part1Rest() { ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-208):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-208):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-208) interface TheFirst { @@ -1626,7 +1626,7 @@ declare function forfirstfirst_PART1Rest(): void; declare function f(): string; ---------------------------------------------------------------------- -prepend: (208-374):: /src/2/second-output.d.ts texts:: 1 +prepend: (208-374):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (208-374) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js index 8ac1eaf3e4e..948b6e8233a 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-all-projects.js @@ -321,11 +321,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1254,9 +1254,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1294,7 +1294,7 @@ sourceFile:../../third_part1.ts "pos": 78, "end": 188, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 78, @@ -1307,7 +1307,7 @@ sourceFile:../../third_part1.ts "pos": 188, "end": 473, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 188, @@ -1366,7 +1366,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1379,7 +1379,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1418,7 +1418,7 @@ prologue: (46-60):: myPrologue2 prologue: (62-76):: myPrologue3 "myPrologue3"; ---------------------------------------------------------------------- -prepend: (78-188):: /src/first/bin/first-output.js texts:: 1 +prepend: (78-188):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (78-188) var s = "Hello, world"; @@ -1429,7 +1429,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (188-473):: /src/2/second-output.js texts:: 1 +prepend: (188-473):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (188-473) var N; @@ -1457,7 +1457,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1470,7 +1470,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-different-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-different-projects.js index ac619362984..f16a24a3fb8 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-different-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/multiple-prologues-in-different-projects.js @@ -307,11 +307,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1201,9 +1201,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1235,7 +1235,7 @@ sourceFile:../../third_part1.ts "pos": 62, "end": 172, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 62, @@ -1248,7 +1248,7 @@ sourceFile:../../third_part1.ts "pos": 172, "end": 457, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 172, @@ -1289,7 +1289,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1302,7 +1302,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1338,7 +1338,7 @@ prologue: (31-44):: myPrologue prologue: (46-60):: myPrologue2 "myPrologue2"; ---------------------------------------------------------------------- -prepend: (62-172):: /src/first/bin/first-output.js texts:: 1 +prepend: (62-172):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (62-172) var s = "Hello, world"; @@ -1349,7 +1349,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (172-457):: /src/2/second-output.js texts:: 1 +prepend: (172-457):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (172-457) var N; @@ -1377,7 +1377,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1390,7 +1390,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-all-projects.js index 2ce4d57f3df..7e96f8915da 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-all-projects.js @@ -307,11 +307,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1160,9 +1160,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1182,7 +1182,7 @@ sourceFile:../../third_part1.ts "pos": 30, "end": 140, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 30, @@ -1195,7 +1195,7 @@ sourceFile:../../third_part1.ts "pos": 140, "end": 425, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 140, @@ -1236,7 +1236,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1249,7 +1249,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1279,7 +1279,7 @@ prologue: (0-13):: use strict prologue: (15-28):: myPrologue "myPrologue"; ---------------------------------------------------------------------- -prepend: (30-140):: /src/first/bin/first-output.js texts:: 1 +prepend: (30-140):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (30-140) var s = "Hello, world"; @@ -1290,7 +1290,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (140-425):: /src/2/second-output.js texts:: 1 +prepend: (140-425):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (140-425) var N; @@ -1318,7 +1318,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1331,7 +1331,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-one-dependency.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-one-dependency.js index bb8de6b65e2..ebb00b3b84c 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-one-dependency.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/strict-in-one-dependency.js @@ -305,11 +305,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1140,9 +1140,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1162,7 +1162,7 @@ sourceFile:../../third_part1.ts "pos": 30, "end": 140, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 30, @@ -1175,7 +1175,7 @@ sourceFile:../../third_part1.ts "pos": 140, "end": 425, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 140, @@ -1197,7 +1197,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1210,7 +1210,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1240,7 +1240,7 @@ prologue: (0-13):: myPrologue prologue: (15-28):: use strict "use strict"; ---------------------------------------------------------------------- -prepend: (30-140):: /src/first/bin/first-output.js texts:: 1 +prepend: (30-140):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (30-140) var s = "Hello, world"; @@ -1251,7 +1251,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (140-425):: /src/2/second-output.js texts:: 1 +prepend: (140-425):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (140-425) var N; @@ -1279,7 +1279,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1292,7 +1292,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js index 49c3f5329cd..965863d088e 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js @@ -2362,10 +2362,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2373,7 +2373,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2395,7 +2395,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2449,7 +2449,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2568,7 +2568,7 @@ var C = (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -2933,11 +2933,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -4963,9 +4963,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -4973,7 +4973,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3162, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -4995,7 +4995,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 317, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -5019,7 +5019,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3162):: /src/2/second-output.js texts:: 1 +prepend: (0-3162):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3162) var s = "Hello, world"; @@ -5140,7 +5140,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-317):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-317):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-317) interface TheFirst { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment.js index 64068d72eb6..e57ae860e88 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-jsdoc-style-comment.js @@ -278,11 +278,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2308,9 +2308,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2318,7 +2318,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2331,7 +2331,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 3162, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -2353,7 +2353,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2366,7 +2366,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 317, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -2390,7 +2390,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2401,7 +2401,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-3162):: /src/2/second-output.js texts:: 1 +prepend: (110-3162):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-3162) var N; @@ -2516,7 +2516,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -2529,7 +2529,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-317):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-317):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-317) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-when-one-two-three-are-prepended-in-order.js index 8eeef00c278..8330077b7b9 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-when-one-two-three-are-prepended-in-order.js @@ -2362,10 +2362,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2373,7 +2373,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2395,7 +2395,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2449,7 +2449,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2568,7 +2568,7 @@ var C = (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -2933,11 +2933,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -4963,9 +4963,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -4973,7 +4973,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3162, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -4995,7 +4995,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 317, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -5019,7 +5019,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3162):: /src/2/second-output.js texts:: 1 +prepend: (0-3162):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3162) var s = "Hello, world"; @@ -5140,7 +5140,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-317):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-317):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-317) interface TheFirst { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index 75c06d747f5..962e2c19099 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -2462,10 +2462,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2473,7 +2473,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2495,7 +2495,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2549,7 +2549,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2668,7 +2668,7 @@ var C = /** @class */ (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -3033,11 +3033,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -5163,9 +5163,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -5173,7 +5173,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3526, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -5195,7 +5195,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 317, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -5219,7 +5219,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3526):: /src/2/second-output.js texts:: 1 +prepend: (0-3526):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3526) var s = "Hello, world"; @@ -5340,7 +5340,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-317):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-317):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-317) interface TheFirst { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled.js index 0ababa719a1..fb04c867b4e 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal-with-comments-emit-enabled.js @@ -278,11 +278,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2408,9 +2408,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2418,7 +2418,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2431,7 +2431,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 3526, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -2453,7 +2453,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2466,7 +2466,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 317, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -2490,7 +2490,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2501,7 +2501,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-3526):: /src/2/second-output.js texts:: 1 +prepend: (110-3526):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-3526) var N; @@ -2616,7 +2616,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -2629,7 +2629,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-317):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-317):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-317) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal.js b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal.js index 75b16d6c883..4c263d59de8 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/incremental-headers-change-without-dts-changes/stripInternal.js @@ -278,11 +278,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2308,9 +2308,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2318,7 +2318,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2331,7 +2331,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 3162, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -2353,7 +2353,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2366,7 +2366,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 317, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -2390,7 +2390,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2401,7 +2401,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-3162):: /src/2/second-output.js texts:: 1 +prepend: (110-3162):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-3162) var N; @@ -2516,7 +2516,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -2529,7 +2529,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-317):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-317):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-317) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/baseline-sectioned-sourcemaps.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/baseline-sectioned-sourcemaps.js index 7d577643d90..dc954db7140 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/baseline-sectioned-sourcemaps.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/baseline-sectioned-sourcemaps.js @@ -386,10 +386,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -752,11 +752,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1546,9 +1546,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1556,7 +1556,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1569,7 +1569,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 395, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -1591,7 +1591,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1604,7 +1604,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1628,7 +1628,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -1639,7 +1639,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-395):: /src/2/second-output.js texts:: 1 +prepend: (110-395):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-395) var N; @@ -1667,7 +1667,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1680,7 +1680,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/declarationMap-and-sourceMap-disabled.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/declarationMap-and-sourceMap-disabled.js index 2f3656844c2..71e66236a0a 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/declarationMap-and-sourceMap-disabled.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/declarationMap-and-sourceMap-disabled.js @@ -386,10 +386,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -752,11 +752,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/emitHelpers-in-all-projects.js index 72f24e18ec0..f005ab7855c 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/emitHelpers-in-all-projects.js @@ -479,10 +479,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -968,11 +968,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2060,9 +2060,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2076,7 +2076,7 @@ sourceFile:../../third_part1.ts "pos": 502, "end": 729, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 502, @@ -2089,7 +2089,7 @@ sourceFile:../../third_part1.ts "pos": 729, "end": 1133, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 729, @@ -2116,7 +2116,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 208, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2129,7 +2129,7 @@ sourceFile:../../third_part1.ts "pos": 208, "end": 361, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 208, @@ -2166,7 +2166,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (502-729):: /src/first/bin/first-output.js texts:: 1 +prepend: (502-729):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (502-729) var s = "Hello, world"; @@ -2180,7 +2180,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (729-1133):: /src/2/second-output.js texts:: 1 +prepend: (729-1133):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (729-1133) var N; @@ -2214,7 +2214,7 @@ function forthirdthird_part1Rest() { ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-208):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-208):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-208) interface TheFirst { @@ -2228,7 +2228,7 @@ declare function forfirstfirst_PART1Rest(): void; declare function f(): string; ---------------------------------------------------------------------- -prepend: (208-361):: /src/2/second-output.d.ts texts:: 1 +prepend: (208-361):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (208-361) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/emitHelpers-in-only-one-dependency-project.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/emitHelpers-in-only-one-dependency-project.js index d97e63db8a3..a0903bec835 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/emitHelpers-in-only-one-dependency-project.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/emitHelpers-in-only-one-dependency-project.js @@ -479,10 +479,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -910,11 +910,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1866,9 +1866,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1882,7 +1882,7 @@ sourceFile:../../third_part1.ts "pos": 502, "end": 652, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 502, @@ -1895,7 +1895,7 @@ sourceFile:../../third_part1.ts "pos": 652, "end": 1056, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 652, @@ -1917,7 +1917,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 208, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1930,7 +1930,7 @@ sourceFile:../../third_part1.ts "pos": 208, "end": 361, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 208, @@ -1967,7 +1967,7 @@ var __rest = (this && this.__rest) || function (s, e) { return t; }; ---------------------------------------------------------------------- -prepend: (502-652):: /src/first/bin/first-output.js texts:: 1 +prepend: (502-652):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (502-652) var s = "Hello, world"; @@ -1979,7 +1979,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (652-1056):: /src/2/second-output.js texts:: 1 +prepend: (652-1056):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (652-1056) var N; @@ -2010,7 +2010,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-208):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-208):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-208) interface TheFirst { @@ -2024,7 +2024,7 @@ declare function forfirstfirst_PART1Rest(): void; declare function f(): string; ---------------------------------------------------------------------- -prepend: (208-361):: /src/2/second-output.d.ts texts:: 1 +prepend: (208-361):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (208-361) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-emitHelpers-in-all-projects.js index 95fea18598d..c9c46a61769 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-emitHelpers-in-all-projects.js @@ -654,10 +654,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -1362,11 +1362,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -3002,9 +3002,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -3030,7 +3030,7 @@ sourceFile:../../third_part1.ts "pos": 1180, "end": 1619, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 1180, @@ -3043,7 +3043,7 @@ sourceFile:../../third_part1.ts "pos": 1619, "end": 2239, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 1619, @@ -3072,7 +3072,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 272, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -3085,7 +3085,7 @@ sourceFile:../../third_part1.ts "pos": 272, "end": 491, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 272, @@ -3146,7 +3146,7 @@ var __spread = (this && this.__spread) || function () { return ar; }; ---------------------------------------------------------------------- -prepend: (1180-1619):: /src/first/bin/first-output.js texts:: 1 +prepend: (1180-1619):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1180-1619) var s = "Hello, world"; @@ -3167,7 +3167,7 @@ function firstfirst_part3Spread() { firstfirst_part3Spread.apply(void 0, __spread([10, 20, 30])); ---------------------------------------------------------------------- -prepend: (1619-2239):: /src/2/second-output.js texts:: 1 +prepend: (1619-2239):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1619-2239) var N; @@ -3215,7 +3215,7 @@ thirdthird_part1Spread.apply(void 0, __spread([10, 20, 30])); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-272):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-272):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-272) interface TheFirst { @@ -3230,7 +3230,7 @@ declare function f(): string; declare function firstfirst_part3Spread(...b: number[]): void; ---------------------------------------------------------------------- -prepend: (272-491):: /src/2/second-output.d.ts texts:: 1 +prepend: (272-491):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (272-491) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-emitHelpers-in-different-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-emitHelpers-in-different-projects.js index 571327e08d6..a5a8082cb6e 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-emitHelpers-in-different-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-emitHelpers-in-different-projects.js @@ -561,10 +561,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -1072,11 +1072,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2287,9 +2287,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2315,7 +2315,7 @@ sourceFile:../../third_part1.ts "pos": 1180, "end": 1407, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 1180, @@ -2328,7 +2328,7 @@ sourceFile:../../third_part1.ts "pos": 1407, "end": 1908, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 1407, @@ -2355,7 +2355,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 208, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2368,7 +2368,7 @@ sourceFile:../../third_part1.ts "pos": 208, "end": 374, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 208, @@ -2429,7 +2429,7 @@ var __spread = (this && this.__spread) || function () { return ar; }; ---------------------------------------------------------------------- -prepend: (1180-1407):: /src/first/bin/first-output.js texts:: 1 +prepend: (1180-1407):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1180-1407) var s = "Hello, world"; @@ -2443,7 +2443,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (1407-1908):: /src/2/second-output.js texts:: 1 +prepend: (1407-1908):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1407-1908) var N; @@ -2481,7 +2481,7 @@ function forthirdthird_part1Rest() { ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-208):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-208):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-208) interface TheFirst { @@ -2495,7 +2495,7 @@ declare function forfirstfirst_PART1Rest(): void; declare function f(): string; ---------------------------------------------------------------------- -prepend: (208-374):: /src/2/second-output.d.ts texts:: 1 +prepend: (208-374):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (208-374) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-prologues-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-prologues-in-all-projects.js index 04ac0643d4e..9f1174ea545 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-prologues-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-prologues-in-all-projects.js @@ -425,10 +425,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -878,11 +878,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1860,9 +1860,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1894,7 +1894,7 @@ sourceFile:../../third_part1.ts "pos": 62, "end": 172, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 62, @@ -1907,7 +1907,7 @@ sourceFile:../../third_part1.ts "pos": 172, "end": 457, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 172, @@ -1966,7 +1966,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1979,7 +1979,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -2015,7 +2015,7 @@ prologue: (30-44):: myPrologue2 prologue: (46-60):: myPrologue3 "myPrologue3"; ---------------------------------------------------------------------- -prepend: (62-172):: /src/first/bin/first-output.js texts:: 1 +prepend: (62-172):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (62-172) var s = "Hello, world"; @@ -2026,7 +2026,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (172-457):: /src/2/second-output.js texts:: 1 +prepend: (172-457):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (172-457) var N; @@ -2054,7 +2054,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -2067,7 +2067,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-prologues-in-different-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-prologues-in-different-projects.js index 063e523cadd..ccd01c44d76 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-prologues-in-different-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/multiple-prologues-in-different-projects.js @@ -423,10 +423,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -843,11 +843,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1751,9 +1751,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1779,7 +1779,7 @@ sourceFile:../../third_part1.ts "pos": 46, "end": 156, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 46, @@ -1792,7 +1792,7 @@ sourceFile:../../third_part1.ts "pos": 156, "end": 441, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 156, @@ -1833,7 +1833,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1846,7 +1846,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1879,7 +1879,7 @@ prologue: (15-28):: myPrologue prologue: (30-44):: myPrologue2 "myPrologue2"; ---------------------------------------------------------------------- -prepend: (46-156):: /src/first/bin/first-output.js texts:: 1 +prepend: (46-156):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (46-156) var s = "Hello, world"; @@ -1890,7 +1890,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (156-441):: /src/2/second-output.js texts:: 1 +prepend: (156-441):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (156-441) var N; @@ -1918,7 +1918,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1931,7 +1931,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/shebang-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/shebang-in-all-projects.js index 3a8bbe3a0d1..8a9eddef3eb 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/shebang-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/shebang-in-all-projects.js @@ -392,10 +392,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -765,11 +765,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1605,9 +1605,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1615,7 +1615,7 @@ sourceFile:../../third_part1.ts "pos": 33, "end": 143, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 33, @@ -1628,7 +1628,7 @@ sourceFile:../../third_part1.ts "pos": 143, "end": 428, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 143, @@ -1650,7 +1650,7 @@ sourceFile:../../third_part1.ts "pos": 33, "end": 190, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 33, @@ -1663,7 +1663,7 @@ sourceFile:../../third_part1.ts "pos": 190, "end": 290, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 190, @@ -1687,7 +1687,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (33-143):: /src/first/bin/first-output.js texts:: 1 +prepend: (33-143):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (33-143) var s = "Hello, world"; @@ -1698,7 +1698,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (143-428):: /src/2/second-output.js texts:: 1 +prepend: (143-428):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (143-428) var N; @@ -1726,7 +1726,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (33-190):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (33-190):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (33-190) interface TheFirst { @@ -1739,7 +1739,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (190-290):: /src/2/second-output.d.ts texts:: 1 +prepend: (190-290):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (190-290) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/shebang-in-only-one-dependency-project.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/shebang-in-only-one-dependency-project.js index 15e22794fbe..6238d669fd9 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/shebang-in-only-one-dependency-project.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/shebang-in-only-one-dependency-project.js @@ -392,10 +392,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -758,11 +758,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1573,9 +1573,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1583,7 +1583,7 @@ sourceFile:../../third_part1.ts "pos": 35, "end": 145, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 35, @@ -1596,7 +1596,7 @@ sourceFile:../../third_part1.ts "pos": 145, "end": 430, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 145, @@ -1618,7 +1618,7 @@ sourceFile:../../third_part1.ts "pos": 35, "end": 192, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 35, @@ -1631,7 +1631,7 @@ sourceFile:../../third_part1.ts "pos": 192, "end": 292, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 192, @@ -1655,7 +1655,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (35-145):: /src/first/bin/first-output.js texts:: 1 +prepend: (35-145):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (35-145) var s = "Hello, world"; @@ -1666,7 +1666,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (145-430):: /src/2/second-output.js texts:: 1 +prepend: (145-430):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (145-430) var N; @@ -1694,7 +1694,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (35-192):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (35-192):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (35-192) interface TheFirst { @@ -1707,7 +1707,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (192-292):: /src/2/second-output.d.ts texts:: 1 +prepend: (192-292):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (192-292) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/strict-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/strict-in-all-projects.js index 9c48cb02568..a87a175f3f6 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/strict-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/strict-in-all-projects.js @@ -388,10 +388,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -784,11 +784,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1648,9 +1648,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1664,7 +1664,7 @@ sourceFile:../../third_part1.ts "pos": 15, "end": 125, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 15, @@ -1677,7 +1677,7 @@ sourceFile:../../third_part1.ts "pos": 125, "end": 410, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 125, @@ -1718,7 +1718,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1731,7 +1731,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1758,7 +1758,7 @@ File:: /src/third/thirdjs/output/third-output.js prologue: (0-13):: use strict "use strict"; ---------------------------------------------------------------------- -prepend: (15-125):: /src/first/bin/first-output.js texts:: 1 +prepend: (15-125):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (15-125) var s = "Hello, world"; @@ -1769,7 +1769,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (125-410):: /src/2/second-output.js texts:: 1 +prepend: (125-410):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (125-410) var N; @@ -1797,7 +1797,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1810,7 +1810,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/strict-in-one-dependency.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/strict-in-one-dependency.js index a745a5de5ad..5ad6a0c4742 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/strict-in-one-dependency.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/strict-in-one-dependency.js @@ -388,10 +388,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -782,11 +782,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1596,9 +1596,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1612,7 +1612,7 @@ sourceFile:../../third_part1.ts "pos": 15, "end": 125, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 15, @@ -1625,7 +1625,7 @@ sourceFile:../../third_part1.ts "pos": 125, "end": 410, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 125, @@ -1647,7 +1647,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1660,7 +1660,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1687,7 +1687,7 @@ File:: /src/third/thirdjs/output/third-output.js prologue: (0-13):: use strict "use strict"; ---------------------------------------------------------------------- -prepend: (15-125):: /src/first/bin/first-output.js texts:: 1 +prepend: (15-125):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (15-125) var s = "Hello, world"; @@ -1698,7 +1698,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (125-410):: /src/2/second-output.js texts:: 1 +prepend: (125-410):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (125-410) var N; @@ -1726,7 +1726,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1739,7 +1739,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-baseline-when-internal-is-inside-another-internal.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-baseline-when-internal-is-inside-another-internal.js index d0766e5e7c3..8d6722f4b78 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-baseline-when-internal-is-inside-another-internal.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-baseline-when-internal-is-inside-another-internal.js @@ -386,10 +386,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -1070,11 +1070,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2048,9 +2048,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2058,7 +2058,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2071,7 +2071,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 395, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -2093,7 +2093,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 246, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2106,7 +2106,7 @@ sourceFile:../../third_part1.ts "pos": 246, "end": 346, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 246, @@ -2130,7 +2130,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2141,7 +2141,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-395):: /src/2/second-output.js texts:: 1 +prepend: (110-395):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-395) var N; @@ -2169,7 +2169,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-246):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-246):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-246) declare namespace ts { @@ -2187,7 +2187,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (246-346):: /src/2/second-output.d.ts texts:: 1 +prepend: (246-346):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (246-346) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js index 57a8e982586..7a5d6f628ed 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js @@ -2540,10 +2540,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2551,7 +2551,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2573,7 +2573,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2632,7 +2632,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2751,7 +2751,7 @@ var C = (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 2 +prepend: (0-157):: ../first/bin/first-output.d.ts texts:: 2 >>-------------------------------------------------------------------- internal: (0-39) interface TheFirst { @@ -3141,11 +3141,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -5315,9 +5315,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -5325,7 +5325,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3162, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -5347,7 +5347,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -5371,7 +5371,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3162):: /src/2/second-output.js texts:: 1 +prepend: (0-3162):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3162) var s = "Hello, world"; @@ -5492,7 +5492,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-276) declare const s = "Hello, world"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment.js index eb9b017ee43..6e4cd6c0d26 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-comment.js @@ -2271,10 +2271,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2815,11 +2815,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -4970,9 +4970,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -4980,7 +4980,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -4993,7 +4993,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 3162, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -5015,7 +5015,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 116, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -5028,7 +5028,7 @@ sourceFile:../../third_part1.ts "pos": 116, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 116, @@ -5052,7 +5052,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -5063,7 +5063,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-3162):: /src/2/second-output.js texts:: 1 +prepend: (110-3162):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-3162) var N; @@ -5178,7 +5178,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-116):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-116):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-116) declare const s = "Hello, world"; @@ -5188,7 +5188,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (116-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (116-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (116-276) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index 4380826d2c2..0890b8d8188 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -2770,10 +2770,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2781,7 +2781,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2803,7 +2803,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 172, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2862,7 +2862,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2981,7 +2981,7 @@ var C = /** @class */ (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-172):: /src/first/bin/first-output.d.ts texts:: 2 +prepend: (0-172):: ../first/bin/first-output.d.ts texts:: 2 >>-------------------------------------------------------------------- internal: (0-54) /**@internal*/ interface TheFirst { @@ -3377,11 +3377,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -5673,9 +5673,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -5683,7 +5683,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3544, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -5705,7 +5705,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -5729,7 +5729,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3544):: /src/2/second-output.js texts:: 1 +prepend: (0-3544):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3544) var s = "Hello, world"; @@ -5850,7 +5850,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-276) declare const s = "Hello, world"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled.js index b6a92e0894e..87badd92039 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-jsdoc-style-with-comments-emit-enabled.js @@ -2495,10 +2495,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -3045,11 +3045,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -5340,9 +5340,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -5350,7 +5350,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -5363,7 +5363,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 3544, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -5385,7 +5385,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 116, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -5398,7 +5398,7 @@ sourceFile:../../third_part1.ts "pos": 116, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 116, @@ -5422,7 +5422,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -5433,7 +5433,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-3544):: /src/2/second-output.js texts:: 1 +prepend: (110-3544):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-3544) var N; @@ -5548,7 +5548,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-116):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-116):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-116) declare const s = "Hello, world"; @@ -5558,7 +5558,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (116-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (116-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (116-276) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-when-few-members-of-enum-are-internal.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-when-few-members-of-enum-are-internal.js index 693aaefa7ca..91558992f04 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-when-few-members-of-enum-are-internal.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-when-few-members-of-enum-are-internal.js @@ -386,10 +386,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -1234,11 +1234,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -2519,9 +2519,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -2529,7 +2529,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 1131, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2542,7 +2542,7 @@ sourceFile:../../third_part1.ts "pos": 1131, "end": 1416, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 1131, @@ -2564,7 +2564,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 320, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2577,7 +2577,7 @@ sourceFile:../../third_part1.ts "pos": 320, "end": 420, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 320, @@ -2601,7 +2601,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-1131):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-1131):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-1131) var TokenFlags; @@ -2628,7 +2628,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (1131-1416):: /src/2/second-output.js texts:: 1 +prepend: (1131-1416):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (1131-1416) var N; @@ -2656,7 +2656,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-320):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-320):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-320) declare enum TokenFlags { @@ -2677,7 +2677,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (320-420):: /src/2/second-output.d.ts texts:: 1 +prepend: (320-420):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (320-420) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-when-one-two-three-are-prepended-in-order.js index 8d59bb7d365..89862863170 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-when-one-two-three-are-prepended-in-order.js @@ -2540,10 +2540,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2551,7 +2551,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2573,7 +2573,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2632,7 +2632,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2751,7 +2751,7 @@ var C = (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 2 +prepend: (0-157):: ../first/bin/first-output.d.ts texts:: 2 >>-------------------------------------------------------------------- internal: (0-39) interface TheFirst { @@ -3141,11 +3141,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -5315,9 +5315,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -5325,7 +5325,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3162, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -5347,7 +5347,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -5371,7 +5371,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3162):: /src/2/second-output.js texts:: 1 +prepend: (0-3162):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3162) var s = "Hello, world"; @@ -5492,7 +5492,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-276) declare const s = "Hello, world"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index 8049c8a8d16..5d2941abca2 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -2640,10 +2640,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2651,7 +2651,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -2673,7 +2673,7 @@ sourceFile:../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -2732,7 +2732,7 @@ sourceFile:../second/second_part2.ts ====================================================================== File:: /src/2/second-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -2851,7 +2851,7 @@ var C = /** @class */ (function () { ====================================================================== File:: /src/2/second-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 2 +prepend: (0-157):: ../first/bin/first-output.d.ts texts:: 2 >>-------------------------------------------------------------------- internal: (0-39) interface TheFirst { @@ -3241,11 +3241,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -5537,9 +5537,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -5547,7 +5547,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 3526, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 0, @@ -5569,7 +5569,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 0, @@ -5593,7 +5593,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-3526):: /src/2/second-output.js texts:: 1 +prepend: (0-3526):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-3526) var s = "Hello, world"; @@ -5714,7 +5714,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (0-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-276) declare const s = "Hello, world"; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled.js index 2798a961624..2475d4e4eda 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal-with-comments-emit-enabled.js @@ -2371,10 +2371,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2915,11 +2915,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -5210,9 +5210,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -5220,7 +5220,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -5233,7 +5233,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 3526, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -5255,7 +5255,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 116, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -5268,7 +5268,7 @@ sourceFile:../../third_part1.ts "pos": 116, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 116, @@ -5292,7 +5292,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -5303,7 +5303,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-3526):: /src/2/second-output.js texts:: 1 +prepend: (110-3526):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-3526) var N; @@ -5418,7 +5418,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-116):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-116):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-116) declare const s = "Hello, world"; @@ -5428,7 +5428,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (116-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (116-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (116-276) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal.js index 4a14ec151ca..7ac42063f7d 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/stripInternal.js @@ -2271,10 +2271,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -2815,11 +2815,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -4970,9 +4970,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -4980,7 +4980,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -4993,7 +4993,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 3162, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -5015,7 +5015,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 116, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -5028,7 +5028,7 @@ sourceFile:../../third_part1.ts "pos": 116, "end": 276, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 116, @@ -5052,7 +5052,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -5063,7 +5063,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-3162):: /src/2/second-output.js texts:: 1 +prepend: (110-3162):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-3162) var N; @@ -5178,7 +5178,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-116):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-116):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-116) declare const s = "Hello, world"; @@ -5188,7 +5188,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (116-276):: /src/2/second-output.d.ts texts:: 1 +prepend: (116-276):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (116-276) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/triple-slash-refs-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/triple-slash-refs-in-all-projects.js index 724307df9e6..9310b004ec3 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/triple-slash-refs-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/triple-slash-refs-in-all-projects.js @@ -440,10 +440,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -874,11 +874,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1873,9 +1873,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1883,7 +1883,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 158, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1896,7 +1896,7 @@ sourceFile:../../third_part1.ts "pos": 158, "end": 494, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 158, @@ -1936,7 +1936,7 @@ sourceFile:../../third_part1.ts "pos": 160, "end": 368, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 160, @@ -1949,7 +1949,7 @@ sourceFile:../../third_part1.ts "pos": 368, "end": 522, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 368, @@ -1973,7 +1973,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-158):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-158):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-158) var s = "Hello, world"; @@ -1985,7 +1985,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (158-494):: /src/2/second-output.js texts:: 1 +prepend: (158-494):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (158-494) var second_part1Const = new secondsecond_part1(); @@ -2024,7 +2024,7 @@ reference: (47-101):: ../../../first/tripleRef.d.ts reference: (103-158):: ../../../second/tripleRef.d.ts /// ---------------------------------------------------------------------- -prepend: (160-368):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (160-368):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (160-368) interface TheFirst { @@ -2038,7 +2038,7 @@ declare const first_part2Const: firstfirst_part2; declare function f(): string; ---------------------------------------------------------------------- -prepend: (368-522):: /src/2/second-output.d.ts texts:: 1 +prepend: (368-522):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (368-522) declare const second_part1Const: secondsecond_part1; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/triple-slash-refs-in-one-project.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/triple-slash-refs-in-one-project.js index 03f7ed6e550..9a0bc722742 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/triple-slash-refs-in-one-project.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/triple-slash-refs-in-one-project.js @@ -440,10 +440,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -817,11 +817,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1685,9 +1685,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1695,7 +1695,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1708,7 +1708,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 446, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -1736,7 +1736,7 @@ sourceFile:../../third_part1.ts "pos": 57, "end": 214, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 57, @@ -1749,7 +1749,7 @@ sourceFile:../../third_part1.ts "pos": 214, "end": 368, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 214, @@ -1773,7 +1773,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -1784,7 +1784,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-446):: /src/2/second-output.js texts:: 1 +prepend: (110-446):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-446) var second_part1Const = new secondsecond_part1(); @@ -1816,7 +1816,7 @@ File:: /src/third/thirdjs/output/third-output.d.ts reference: (0-55):: ../../../second/tripleRef.d.ts /// ---------------------------------------------------------------------- -prepend: (57-214):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (57-214):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (57-214) interface TheFirst { @@ -1829,7 +1829,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (214-368):: /src/2/second-output.d.ts texts:: 1 +prepend: (214-368):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (214-368) declare const second_part1Const: secondsecond_part1; diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-is-not-composite-but-incremental.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-is-not-composite-but-incremental.js index 5303bca6a8f..77755214958 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-is-not-composite-but-incremental.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-is-not-composite-but-incremental.js @@ -386,10 +386,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -752,11 +752,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1546,9 +1546,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1556,7 +1556,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1569,7 +1569,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 395, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -1591,7 +1591,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1604,7 +1604,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1628,7 +1628,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -1639,7 +1639,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-395):: /src/2/second-output.js texts:: 1 +prepend: (110-395):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-395) var N; @@ -1667,7 +1667,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1680,7 +1680,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-is-not-composite-but-uses-project-references.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-is-not-composite-but-uses-project-references.js index c2019f16c8a..2564a1ae67e 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-is-not-composite-but-uses-project-references.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-is-not-composite-but-uses-project-references.js @@ -386,10 +386,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -752,11 +752,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-specifies-tsBuildInfoFile.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-specifies-tsBuildInfoFile.js index eca89038a2f..288f507f70b 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-specifies-tsBuildInfoFile.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-final-project-specifies-tsBuildInfoFile.js @@ -386,10 +386,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -752,11 +752,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1546,9 +1546,9 @@ sourceFile:../../third_part1.ts //// [/src/third/thirdjs/output/third.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1556,7 +1556,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1569,7 +1569,7 @@ sourceFile:../../third_part1.ts "pos": 110, "end": 395, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -1591,7 +1591,7 @@ sourceFile:../../third_part1.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1604,7 +1604,7 @@ sourceFile:../../third_part1.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1628,7 +1628,7 @@ sourceFile:../../third_part1.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -1639,7 +1639,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-395):: /src/2/second-output.js texts:: 1 +prepend: (110-395):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-395) var N; @@ -1667,7 +1667,7 @@ c.doSomething(); ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1680,7 +1680,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-source-files-are-empty-in-the-own-file.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-source-files-are-empty-in-the-own-file.js index a0ef04729dc..7269a7ca744 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-source-files-are-empty-in-the-own-file.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-Build/when-source-files-are-empty-in-the-own-file.js @@ -386,10 +386,10 @@ sourceFile:../second/second_part2.ts //// [/src/2/second-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/second/", + "commonSourceDirectory": "../second", "sourceFiles": [ - "/src/second/second_part1.ts", - "/src/second/second_part2.ts" + "../second/second_part1.ts", + "../second/second_part2.ts" ], "js": { "sections": [ @@ -752,11 +752,11 @@ sourceFile:../first_part3.ts //// [/src/first/bin/first-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/first/", + "commonSourceDirectory": "..", "sourceFiles": [ - "/src/first/first_PART1.ts", - "/src/first/first_part2.ts", - "/src/first/first_part3.ts" + "../first_PART1.ts", + "../first_part2.ts", + "../first_part3.ts" ], "js": { "sections": [ @@ -1465,9 +1465,9 @@ sourceFile:../../../second/second_part2.ts //// [/src/third/thirdjs/output/third-output.tsbuildinfo] { "bundle": { - "commonSourceDirectory": "/src/third/", + "commonSourceDirectory": "../..", "sourceFiles": [ - "/src/third/third_part1.ts" + "../../third_part1.ts" ], "js": { "sections": [ @@ -1475,7 +1475,7 @@ sourceFile:../../../second/second_part2.ts "pos": 0, "end": 110, "kind": "prepend", - "data": "/src/first/bin/first-output.js", + "data": "../../../first/bin/first-output.js", "texts": [ { "pos": 0, @@ -1488,7 +1488,7 @@ sourceFile:../../../second/second_part2.ts "pos": 110, "end": 395, "kind": "prepend", - "data": "/src/2/second-output.js", + "data": "../../../2/second-output.js", "texts": [ { "pos": 110, @@ -1505,7 +1505,7 @@ sourceFile:../../../second/second_part2.ts "pos": 0, "end": 157, "kind": "prepend", - "data": "/src/first/bin/first-output.d.ts", + "data": "../../../first/bin/first-output.d.ts", "texts": [ { "pos": 0, @@ -1518,7 +1518,7 @@ sourceFile:../../../second/second_part2.ts "pos": 157, "end": 257, "kind": "prepend", - "data": "/src/2/second-output.d.ts", + "data": "../../../2/second-output.d.ts", "texts": [ { "pos": 157, @@ -1537,7 +1537,7 @@ sourceFile:../../../second/second_part2.ts ====================================================================== File:: /src/third/thirdjs/output/third-output.js ---------------------------------------------------------------------- -prepend: (0-110):: /src/first/bin/first-output.js texts:: 1 +prepend: (0-110):: ../../../first/bin/first-output.js texts:: 1 >>-------------------------------------------------------------------- text: (0-110) var s = "Hello, world"; @@ -1548,7 +1548,7 @@ function f() { } ---------------------------------------------------------------------- -prepend: (110-395):: /src/2/second-output.js texts:: 1 +prepend: (110-395):: ../../../2/second-output.js texts:: 1 >>-------------------------------------------------------------------- text: (110-395) var N; @@ -1571,7 +1571,7 @@ var C = (function () { ====================================================================== File:: /src/third/thirdjs/output/third-output.d.ts ---------------------------------------------------------------------- -prepend: (0-157):: /src/first/bin/first-output.d.ts texts:: 1 +prepend: (0-157):: ../../../first/bin/first-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (0-157) interface TheFirst { @@ -1584,7 +1584,7 @@ interface NoJsForHereEither { declare function f(): string; ---------------------------------------------------------------------- -prepend: (157-257):: /src/2/second-output.d.ts texts:: 1 +prepend: (157-257):: ../../../2/second-output.d.ts texts:: 1 >>-------------------------------------------------------------------- text: (157-257) declare namespace N { From 6e5085314399fefbb29a9fd504779950e18fd634 Mon Sep 17 00:00:00 2001 From: Andrew Casey Date: Tue, 18 Jun 2019 16:44:48 -0700 Subject: [PATCH 12/27] Trivially expose getEncodedSyntacticClassifications --- src/server/protocol.ts | 24 ++++++++++++++++++++++++ src/server/session.ts | 8 ++++++++ 2 files changed, 32 insertions(+) diff --git a/src/server/protocol.ts b/src/server/protocol.ts index 2650cd5d765..a23efb4ef29 100644 --- a/src/server/protocol.ts +++ b/src/server/protocol.ts @@ -94,6 +94,8 @@ namespace ts.server.protocol { ApplyChangedToOpenFiles = "applyChangedToOpenFiles", UpdateOpen = "updateOpen", /* @internal */ + EncodedSyntacticClassificationsFull = "encodedSyntacticClassifications-full", + /* @internal */ EncodedSemanticClassificationsFull = "encodedSemanticClassifications-full", /* @internal */ Cleanup = "cleanup", @@ -764,6 +766,28 @@ namespace ts.server.protocol { body?: string[]; } + /** + * A request to get encoded Syntactic classifications for a span in the file + */ + /** @internal */ + export interface EncodedSyntacticClassificationsRequest extends FileRequest { + arguments: EncodedSyntacticClassificationsRequestArgs; + } + + /** + * Arguments for EncodedSyntacticClassificationsRequest request. + */ + export interface EncodedSyntacticClassificationsRequestArgs extends FileRequestArgs { + /** + * Start position of the span. + */ + start: number; + /** + * Length of the span. + */ + length: number; + } + /** * A request to get encoded semantic classifications for a span in the file */ diff --git a/src/server/session.ts b/src/server/session.ts index 5064b529560..8e5ca896c2b 100644 --- a/src/server/session.ts +++ b/src/server/session.ts @@ -881,6 +881,11 @@ namespace ts.server { } } + private getEncodedSyntacticClassifications(args: protocol.EncodedSyntacticClassificationsRequestArgs) { + const { file, project } = this.getFileAndProject(args); + return project.getLanguageService().getEncodedSyntacticClassifications(file, args); + } + private getEncodedSemanticClassifications(args: protocol.EncodedSemanticClassificationsRequestArgs) { const { file, project } = this.getFileAndProject(args); return project.getLanguageService().getEncodedSemanticClassifications(file, args); @@ -2299,6 +2304,9 @@ namespace ts.server { [CommandNames.CompilerOptionsDiagnosticsFull]: (request: protocol.CompilerOptionsDiagnosticsRequest) => { return this.requiredResponse(this.getCompilerOptionsDiagnostics(request.arguments)); }, + [CommandNames.EncodedSyntacticClassificationsFull]: (request: protocol.EncodedSyntacticClassificationsRequest) => { + return this.requiredResponse(this.getEncodedSyntacticClassifications(request.arguments)); + }, [CommandNames.EncodedSemanticClassificationsFull]: (request: protocol.EncodedSemanticClassificationsRequest) => { return this.requiredResponse(this.getEncodedSemanticClassifications(request.arguments)); }, From d36099c98d1be4a76874645bf19dfb912080bc14 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 20 Jun 2019 12:44:20 -0700 Subject: [PATCH 13/27] Use absolute paths for buildInfoDirectory --- src/compiler/builder.ts | 10 +++++----- src/compiler/emitter.ts | 16 ++++++++++------ src/compiler/tsbuild.ts | 4 ++-- src/compiler/watch.ts | 15 ++++++++++----- .../baselines/reference/api/tsserverlibrary.d.ts | 7 ++++++- tests/baselines/reference/api/typescript.d.ts | 7 ++++++- 6 files changed, 39 insertions(+), 20 deletions(-) diff --git a/src/compiler/builder.ts b/src/compiler/builder.ts index d70f55edc9d..704cdaf23f9 100644 --- a/src/compiler/builder.ts +++ b/src/compiler/builder.ts @@ -243,7 +243,7 @@ namespace ts { function convertToDiagnostics(diagnostics: ReadonlyArray, newProgram: Program, getCanonicalFileName: GetCanonicalFileName): ReadonlyArray { if (!diagnostics.length) return emptyArray; - const buildInfoDirectory = getDirectoryPath(getOutputPathForBuildInfo(newProgram.getCompilerOptions())!); + const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(getOutputPathForBuildInfo(newProgram.getCompilerOptions())!, newProgram.getCurrentDirectory())); return diagnostics.map(diagnostic => { const result: Diagnostic = convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath); result.reportsUnnecessary = diagnostic.reportsUnnecessary; @@ -612,7 +612,7 @@ namespace ts { */ function getProgramBuildInfo(state: Readonly, getCanonicalFileName: GetCanonicalFileName): ProgramBuildInfo | undefined { if (state.compilerOptions.outFile || state.compilerOptions.out) return undefined; - const buildInfoDirectory = getDirectoryPath(getOutputPathForBuildInfo(state.compilerOptions)!); + const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(getOutputPathForBuildInfo(state.compilerOptions)!, Debug.assertDefined(state.program).getCurrentDirectory())); const fileInfos: MapLike = {}; state.fileInfos.forEach((value, key) => { const signature = state.currentAffectedFilesSignatures && state.currentAffectedFilesSignatures.get(key); @@ -1015,9 +1015,9 @@ namespace ts { return map; } - export function createBuildProgramUsingProgramBuildInfo(program: ProgramBuildInfo, buildInfoPath: string, useCaseSensitiveFileNames: boolean): EmitAndSemanticDiagnosticsBuilderProgram { - const buildInfoDirectory = getDirectoryPath(buildInfoPath); - const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames); + export function createBuildProgramUsingProgramBuildInfo(program: ProgramBuildInfo, buildInfoPath: string, host: ReadBuildProgramHost): EmitAndSemanticDiagnosticsBuilderProgram { + const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory())); + const getCanonicalFileName = createGetCanonicalFileName(host.useCaseSensitiveFileNames()); const fileInfos = createMap(); for (const key in program.fileInfos) { diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 456a53f2651..97536615986 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -251,10 +251,10 @@ namespace ts { function emitSourceFileOrBundle({ jsFilePath, sourceMapFilePath, declarationFilePath, declarationMapPath, buildInfoPath }: EmitFileNames, sourceFileOrBundle: SourceFile | Bundle | undefined) { let buildInfoDirectory: string | undefined; if (buildInfoPath && sourceFileOrBundle && isBundle(sourceFileOrBundle)) { - buildInfoDirectory = getDirectoryPath(buildInfoPath); + buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory())); bundleBuildInfo = { commonSourceDirectory: relativeToBuildInfo(host.getCommonSourceDirectory()), - sourceFiles: sourceFileOrBundle.sourceFiles.map(file => relativeToBuildInfo(file.fileName)) + sourceFiles: sourceFileOrBundle.sourceFiles.map(file => relativeToBuildInfo(getNormalizedAbsolutePath(file.fileName, host.getCurrentDirectory()))) }; } emitJsFileOrBundle(sourceFileOrBundle, jsFilePath, sourceMapFilePath, relativeToBuildInfo); @@ -629,10 +629,14 @@ namespace ts { getNewLine(): string; } - function createSourceFilesFromBundleBuildInfo(bundle: BundleBuildInfo, buildInfoDirectory: string): ReadonlyArray { + function createSourceFilesFromBundleBuildInfo(bundle: BundleBuildInfo, buildInfoDirectory: string, host: EmitUsingBuildInfoHost): ReadonlyArray { const sourceFiles = bundle.sourceFiles.map(fileName => { const sourceFile = createNode(SyntaxKind.SourceFile, 0, 0) as SourceFile; - sourceFile.fileName = getNormalizedAbsolutePath(fileName, buildInfoDirectory); + sourceFile.fileName = getRelativePathFromDirectory( + host.getCurrentDirectory(), + getNormalizedAbsolutePath(fileName, buildInfoDirectory), + !host.useCaseSensitiveFileNames() + ); sourceFile.text = ""; sourceFile.statements = createNodeArray(); return sourceFile; @@ -676,7 +680,7 @@ namespace ts { const buildInfo = getBuildInfo(buildInfoText); if (!buildInfo.bundle || !buildInfo.bundle.js || (declarationText && !buildInfo.bundle.dts)) return buildInfoPath!; - const buildInfoDirectory = getDirectoryPath(buildInfoPath!); + const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(buildInfoPath!, host.getCurrentDirectory())); const ownPrependInput = createInputFiles( jsFileText, declarationText!, @@ -692,7 +696,7 @@ namespace ts { ); const outputFiles: OutputFile[] = []; const prependNodes = createPrependNodes(config.projectReferences, getCommandLine, f => host.readFile(f)); - const sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle, buildInfoDirectory); + const sourceFilesForJsEmit = createSourceFilesFromBundleBuildInfo(buildInfo.bundle, buildInfoDirectory, host); const emitHost: EmitHost = { getPrependNodes: memoize(() => [...prependNodes, ownPrependInput]), getCanonicalFileName: host.getCanonicalFileName, diff --git a/src/compiler/tsbuild.ts b/src/compiler/tsbuild.ts index 7e92e727c50..df59c592ed3 100644 --- a/src/compiler/tsbuild.ts +++ b/src/compiler/tsbuild.ts @@ -1298,11 +1298,11 @@ namespace ts { } } - function getOldProgram({ options, builderPrograms, readFileWithCache, host }: SolutionBuilderState, proj: ResolvedConfigFilePath, parsed: ParsedCommandLine) { + function getOldProgram({ options, builderPrograms, compilerHost }: SolutionBuilderState, proj: ResolvedConfigFilePath, parsed: ParsedCommandLine) { if (options.force) return undefined; const value = builderPrograms.get(proj); if (value) return value; - return readBuilderProgram(parsed.options, readFileWithCache, host.useCaseSensitiveFileNames()) as any as T; + return readBuilderProgram(parsed.options, compilerHost) as any as T; } function afterProgramCreate({ host, watch, builderPrograms }: SolutionBuilderState, proj: ResolvedConfigFilePath, program: T) { diff --git a/src/compiler/watch.ts b/src/compiler/watch.ts index a961c308af1..d4a97f6f1b8 100644 --- a/src/compiler/watch.ts +++ b/src/compiler/watch.ts @@ -437,16 +437,21 @@ namespace ts { } namespace ts { - export function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined, useCaseSensitiveFileNames: boolean) { + export interface ReadBuildProgramHost { + useCaseSensitiveFileNames(): boolean; + getCurrentDirectory(): string; + readFile(fileName: string): string | undefined; + } + export function readBuilderProgram(compilerOptions: CompilerOptions, host: ReadBuildProgramHost) { if (compilerOptions.out || compilerOptions.outFile) return undefined; const buildInfoPath = getOutputPathForBuildInfo(compilerOptions); if (!buildInfoPath) return undefined; - const content = readFile(buildInfoPath); + const content = host.readFile(buildInfoPath); if (!content) return undefined; const buildInfo = getBuildInfo(content); if (buildInfo.version !== version) return undefined; if (!buildInfo.program) return undefined; - return createBuildProgramUsingProgramBuildInfo(buildInfo.program, buildInfoPath, useCaseSensitiveFileNames); + return createBuildProgramUsingProgramBuildInfo(buildInfo.program, buildInfoPath, host); } export function createIncrementalCompilerHost(options: CompilerOptions, system = sys): CompilerHost { @@ -471,7 +476,7 @@ namespace ts { }: IncrementalProgramOptions): T { host = host || createIncrementalCompilerHost(options); createProgram = createProgram || createEmitAndSemanticDiagnosticsBuilderProgram as any as CreateProgram; - const oldProgram = readBuilderProgram(options, path => host!.readFile(path), host.useCaseSensitiveFileNames()) as any as T; + const oldProgram = readBuilderProgram(options, host) as any as T; return createProgram(rootNames, options, host, oldProgram, configFileParsingDiagnostics, projectReferences); } @@ -747,7 +752,7 @@ namespace ts { ((typeDirectiveNames, containingFile, redirectedReference) => resolutionCache.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference)); const userProvidedResolution = !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives; - builderProgram = readBuilderProgram(compilerOptions, path => compilerHost.readFile(path), compilerHost.useCaseSensitiveFileNames()) as any as T; + builderProgram = readBuilderProgram(compilerOptions, compilerHost) as any as T; synchronizeProgram(); // Update the wild card directory watch diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index 8f4f774f5d6..0d0cb07e50e 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -4450,7 +4450,12 @@ declare namespace ts { function createAbstractBuilder(rootNames: ReadonlyArray | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: ReadonlyArray, projectReferences?: ReadonlyArray): BuilderProgram; } declare namespace ts { - function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined, useCaseSensitiveFileNames: boolean): EmitAndSemanticDiagnosticsBuilderProgram | undefined; + interface ReadBuildProgramHost { + useCaseSensitiveFileNames(): boolean; + getCurrentDirectory(): string; + readFile(fileName: string): string | undefined; + } + function readBuilderProgram(compilerOptions: CompilerOptions, host: ReadBuildProgramHost): EmitAndSemanticDiagnosticsBuilderProgram | undefined; function createIncrementalCompilerHost(options: CompilerOptions, system?: System): CompilerHost; interface IncrementalProgramOptions { rootNames: ReadonlyArray; diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index 7efb518603e..68ecc121338 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -4450,7 +4450,12 @@ declare namespace ts { function createAbstractBuilder(rootNames: ReadonlyArray | undefined, options: CompilerOptions | undefined, host?: CompilerHost, oldProgram?: BuilderProgram, configFileParsingDiagnostics?: ReadonlyArray, projectReferences?: ReadonlyArray): BuilderProgram; } declare namespace ts { - function readBuilderProgram(compilerOptions: CompilerOptions, readFile: (path: string) => string | undefined, useCaseSensitiveFileNames: boolean): EmitAndSemanticDiagnosticsBuilderProgram | undefined; + interface ReadBuildProgramHost { + useCaseSensitiveFileNames(): boolean; + getCurrentDirectory(): string; + readFile(fileName: string): string | undefined; + } + function readBuilderProgram(compilerOptions: CompilerOptions, host: ReadBuildProgramHost): EmitAndSemanticDiagnosticsBuilderProgram | undefined; function createIncrementalCompilerHost(options: CompilerOptions, system?: System): CompilerHost; interface IncrementalProgramOptions { rootNames: ReadonlyArray; From 2953574ebaaf61bc785f36d191fe4441491e76b5 Mon Sep 17 00:00:00 2001 From: Andrew Casey Date: Fri, 21 Jun 2019 14:48:22 -0700 Subject: [PATCH 14/27] Use getEncodedSyntacticClassifications --- src/server/session.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/session.ts b/src/server/session.ts index 8e5ca896c2b..d663ca09249 100644 --- a/src/server/session.ts +++ b/src/server/session.ts @@ -882,8 +882,8 @@ namespace ts.server { } private getEncodedSyntacticClassifications(args: protocol.EncodedSyntacticClassificationsRequestArgs) { - const { file, project } = this.getFileAndProject(args); - return project.getLanguageService().getEncodedSyntacticClassifications(file, args); + const { file, languageService } = this.getFileAndLanguageServiceForSyntacticOperation(args); + return languageService.getEncodedSyntacticClassifications(file, args); } private getEncodedSemanticClassifications(args: protocol.EncodedSemanticClassificationsRequestArgs) { From 96fcf1e0c0778e4cd40756dc779949c53f3710df Mon Sep 17 00:00:00 2001 From: Andrew Casey Date: Fri, 21 Jun 2019 14:55:29 -0700 Subject: [PATCH 15/27] Update API baseline --- tests/baselines/reference/api/tsserverlibrary.d.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index cbab57b0644..69c60446f5e 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -6414,6 +6414,19 @@ declare namespace ts.server.protocol { */ body?: string[]; } + /** + * Arguments for EncodedSyntacticClassificationsRequest request. + */ + interface EncodedSyntacticClassificationsRequestArgs extends FileRequestArgs { + /** + * Start position of the span. + */ + start: number; + /** + * Length of the span. + */ + length: number; + } /** * Arguments for EncodedSemanticClassificationsRequest request. */ @@ -9075,6 +9088,7 @@ declare namespace ts.server { private updateErrorCheck; private cleanProjects; private cleanup; + private getEncodedSyntacticClassifications; private getEncodedSemanticClassifications; private getProject; private getConfigFileAndProject; From 897fb3a2a66c0631c4a991f50e69d9fa7768c955 Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Tue, 25 Jun 2019 12:56:51 -0700 Subject: [PATCH 16/27] Handle making sure that two less thans are never converted into >> --- src/services/formatting/rules.ts | 13 +++++++++++++ tests/cases/fourslash/formattingDoubleLessThan.ts | 8 ++++++++ 2 files changed, 21 insertions(+) create mode 100644 tests/cases/fourslash/formattingDoubleLessThan.ts diff --git a/src/services/formatting/rules.ts b/src/services/formatting/rules.ts index 38792d448e4..84ee38f0f30 100644 --- a/src/services/formatting/rules.ts +++ b/src/services/formatting/rules.ts @@ -229,6 +229,7 @@ namespace ts.formatting { rule("NoSpaceBeforeNonNullAssertionOperator", anyToken, SyntaxKind.ExclamationToken, [isNonJsxSameLineTokenContext, isNonNullAssertionContext], RuleAction.Delete), rule("NoSpaceAfterNewKeywordOnConstructorSignature", SyntaxKind.NewKeyword, SyntaxKind.OpenParenToken, [isNonJsxSameLineTokenContext, isConstructorSignatureContext], RuleAction.Delete), + rule("SpaceLessThanAndNonJSXTypeAnnotation", SyntaxKind.LessThanToken, SyntaxKind.LessThanToken, [isNonJsxSameLineTokenContext], RuleAction.Space), ]; // These rules are applied after high priority @@ -349,6 +350,18 @@ namespace ts.formatting { ]; } + /** + * A rule takes a two tokens (left/right) and a particular context + * for which you're meant to look at them. You then declare what should the + * whitespace annotation be between these tokens via the action param. + * + * @param debugName Name to print + * @param left The left side of the comparison + * @param right The right side of the comparison + * @param context A set of filters to narrow down the space in which this formatter rule applies + * @param action a declaration of the expected whitespace + * @param flags whether the rule deletes a line or not, defaults to no-op + */ function rule( debugName: string, left: SyntaxKind | ReadonlyArray | TokenRange, diff --git a/tests/cases/fourslash/formattingDoubleLessThan.ts b/tests/cases/fourslash/formattingDoubleLessThan.ts new file mode 100644 index 00000000000..033203b01e3 --- /dev/null +++ b/tests/cases/fourslash/formattingDoubleLessThan.ts @@ -0,0 +1,8 @@ +/// +// https://github.com/microsoft/TypeScript/issues/14589 + +/////*1*/if (foo < bar) {} + +format.document(); +goTo.marker("1") +verify.currentLineContentIs(`if (foo < bar) { }`) From 392d7750956bb4a3a908d79cc12dda4e0025d750 Mon Sep 17 00:00:00 2001 From: Klaus Meinhardt Date: Wed, 26 Jun 2019 23:42:07 +0200 Subject: [PATCH 17/27] allow const-assertion on aliased enum symbol (#32110) Fixes: #32087 --- src/compiler/checker.ts | 5 ++- .../reference/constAssertionOnEnum.js | 33 ++++++++++++++++ .../reference/constAssertionOnEnum.symbols | 36 ++++++++++++++++++ .../reference/constAssertionOnEnum.types | 38 +++++++++++++++++++ .../typeAssertions/constAssertionOnEnum.ts | 18 +++++++++ 5 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 tests/baselines/reference/constAssertionOnEnum.js create mode 100644 tests/baselines/reference/constAssertionOnEnum.symbols create mode 100644 tests/baselines/reference/constAssertionOnEnum.types create mode 100644 tests/cases/conformance/expressions/typeAssertions/constAssertionOnEnum.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 64bf09d8b37..cf614ee2013 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -22510,7 +22510,10 @@ namespace ts { case SyntaxKind.ElementAccessExpression: const expr = (node).expression; if (isIdentifier(expr)) { - const symbol = getSymbolAtLocation(expr); + let symbol = getSymbolAtLocation(expr); + if (symbol && symbol.flags & SymbolFlags.Alias) { + symbol = resolveAlias(symbol); + } return !!(symbol && (symbol.flags & SymbolFlags.Enum) && getEnumKind(symbol) === EnumKind.Literal); } } diff --git a/tests/baselines/reference/constAssertionOnEnum.js b/tests/baselines/reference/constAssertionOnEnum.js new file mode 100644 index 00000000000..47d7888148c --- /dev/null +++ b/tests/baselines/reference/constAssertionOnEnum.js @@ -0,0 +1,33 @@ +//// [tests/cases/conformance/expressions/typeAssertions/constAssertionOnEnum.ts] //// + +//// [enum.ts] +export enum Foo { + A, + B, +} + +//// [test.ts] +import {Foo} from './enum'; + +enum Bar { + A, + B, +} +let foo = Foo.A as const; +let bar = Bar.A as const; + +//// [enum.js] +export var Foo; +(function (Foo) { + Foo[Foo["A"] = 0] = "A"; + Foo[Foo["B"] = 1] = "B"; +})(Foo || (Foo = {})); +//// [test.js] +import { Foo } from './enum'; +var Bar; +(function (Bar) { + Bar[Bar["A"] = 0] = "A"; + Bar[Bar["B"] = 1] = "B"; +})(Bar || (Bar = {})); +let foo = Foo.A; +let bar = Bar.A; diff --git a/tests/baselines/reference/constAssertionOnEnum.symbols b/tests/baselines/reference/constAssertionOnEnum.symbols new file mode 100644 index 00000000000..dbd7a2e393a --- /dev/null +++ b/tests/baselines/reference/constAssertionOnEnum.symbols @@ -0,0 +1,36 @@ +=== tests/cases/conformance/expressions/typeAssertions/enum.ts === +export enum Foo { +>Foo : Symbol(Foo, Decl(enum.ts, 0, 0)) + + A, +>A : Symbol(Foo.A, Decl(enum.ts, 0, 17)) + + B, +>B : Symbol(Foo.B, Decl(enum.ts, 1, 6)) +} + +=== tests/cases/conformance/expressions/typeAssertions/test.ts === +import {Foo} from './enum'; +>Foo : Symbol(Foo, Decl(test.ts, 0, 8)) + +enum Bar { +>Bar : Symbol(Bar, Decl(test.ts, 0, 27)) + + A, +>A : Symbol(Bar.A, Decl(test.ts, 2, 10)) + + B, +>B : Symbol(Bar.B, Decl(test.ts, 3, 6)) +} +let foo = Foo.A as const; +>foo : Symbol(foo, Decl(test.ts, 6, 3)) +>Foo.A : Symbol(Foo.A, Decl(enum.ts, 0, 17)) +>Foo : Symbol(Foo, Decl(test.ts, 0, 8)) +>A : Symbol(Foo.A, Decl(enum.ts, 0, 17)) + +let bar = Bar.A as const; +>bar : Symbol(bar, Decl(test.ts, 7, 3)) +>Bar.A : Symbol(Bar.A, Decl(test.ts, 2, 10)) +>Bar : Symbol(Bar, Decl(test.ts, 0, 27)) +>A : Symbol(Bar.A, Decl(test.ts, 2, 10)) + diff --git a/tests/baselines/reference/constAssertionOnEnum.types b/tests/baselines/reference/constAssertionOnEnum.types new file mode 100644 index 00000000000..7f31959173a --- /dev/null +++ b/tests/baselines/reference/constAssertionOnEnum.types @@ -0,0 +1,38 @@ +=== tests/cases/conformance/expressions/typeAssertions/enum.ts === +export enum Foo { +>Foo : Foo + + A, +>A : Foo.A + + B, +>B : Foo.B +} + +=== tests/cases/conformance/expressions/typeAssertions/test.ts === +import {Foo} from './enum'; +>Foo : typeof Foo + +enum Bar { +>Bar : Bar + + A, +>A : Bar.A + + B, +>B : Bar.B +} +let foo = Foo.A as const; +>foo : Foo.A +>Foo.A as const : Foo.A +>Foo.A : Foo.A +>Foo : typeof Foo +>A : Foo.A + +let bar = Bar.A as const; +>bar : Bar.A +>Bar.A as const : Bar.A +>Bar.A : Bar.A +>Bar : typeof Bar +>A : Bar.A + diff --git a/tests/cases/conformance/expressions/typeAssertions/constAssertionOnEnum.ts b/tests/cases/conformance/expressions/typeAssertions/constAssertionOnEnum.ts new file mode 100644 index 00000000000..4012be3fec7 --- /dev/null +++ b/tests/cases/conformance/expressions/typeAssertions/constAssertionOnEnum.ts @@ -0,0 +1,18 @@ +// @strict: true +// @target: esnext + +// @filename: enum.ts +export enum Foo { + A, + B, +} + +// @filename: test.ts +import {Foo} from './enum'; + +enum Bar { + A, + B, +} +let foo = Foo.A as const; +let bar = Bar.A as const; \ No newline at end of file From 2d785c8c91fb1f770907fa3b14337349b82753df Mon Sep 17 00:00:00 2001 From: Andrew Casey Date: Wed, 26 Jun 2019 15:09:30 -0700 Subject: [PATCH 18/27] Make args types internal --- src/server/protocol.ts | 2 ++ .../reference/api/tsserverlibrary.d.ts | 26 ------------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/src/server/protocol.ts b/src/server/protocol.ts index a23efb4ef29..d4ad6e7f0f1 100644 --- a/src/server/protocol.ts +++ b/src/server/protocol.ts @@ -777,6 +777,7 @@ namespace ts.server.protocol { /** * Arguments for EncodedSyntacticClassificationsRequest request. */ + /** @internal */ export interface EncodedSyntacticClassificationsRequestArgs extends FileRequestArgs { /** * Start position of the span. @@ -799,6 +800,7 @@ namespace ts.server.protocol { /** * Arguments for EncodedSemanticClassificationsRequest request. */ + /** @internal */ export interface EncodedSemanticClassificationsRequestArgs extends FileRequestArgs { /** * Start position of the span. diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index 69c60446f5e..618f1c1263d 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -6414,32 +6414,6 @@ declare namespace ts.server.protocol { */ body?: string[]; } - /** - * Arguments for EncodedSyntacticClassificationsRequest request. - */ - interface EncodedSyntacticClassificationsRequestArgs extends FileRequestArgs { - /** - * Start position of the span. - */ - start: number; - /** - * Length of the span. - */ - length: number; - } - /** - * Arguments for EncodedSemanticClassificationsRequest request. - */ - interface EncodedSemanticClassificationsRequestArgs extends FileRequestArgs { - /** - * Start position of the span. - */ - start: number; - /** - * Length of the span. - */ - length: number; - } /** * Arguments in document highlight request; include: filesToSearch, file, * line, offset. From 1479bb6bc8cde73927dae5e932e72e320b54e843 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 26 Jun 2019 15:38:45 -0700 Subject: [PATCH 19/27] Check if triggering PR is in triggered set only if triggered pr exists (otherwise is master sync) --- scripts/update-experimental-branches.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update-experimental-branches.js b/scripts/update-experimental-branches.js index b734c8a6fd8..92567b9c89b 100644 --- a/scripts/update-experimental-branches.js +++ b/scripts/update-experimental-branches.js @@ -18,7 +18,7 @@ async function main() { if (!prnums.length) { return; // No enlisted PRs, nothing to update } - if (!prnums.some(n => n === triggeredPR)) { + if (triggeredPR && !prnums.some(n => n === triggeredPR)) { return; // Only have work to do for enlisted PRs } console.log(`Performing experimental branch updating and merging for pull requests ${prnums.join(", ")}`); From b3d55d0cd83dfc5dd9b34c9fddba39ac9d58ea45 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 26 Jun 2019 16:01:51 -0700 Subject: [PATCH 20/27] Add throw on not rebaseable to unmatched PRs, too --- scripts/update-experimental-branches.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/update-experimental-branches.js b/scripts/update-experimental-branches.js index 92567b9c89b..8b1d1b0f54f 100644 --- a/scripts/update-experimental-branches.js +++ b/scripts/update-experimental-branches.js @@ -51,9 +51,8 @@ async function main() { issue_number: num, body: `This PR is configured as an experiment, and currently has rebase conflicts with master - please rebase onto master and fix the conflicts.` }); - throw new Error(`Rebase conflict detected in PR ${num} with master`); } - return; // A PR is currently in conflict, give up + throw new Error(`Rebase conflict detected in PR ${num} with master`); // A PR is currently in conflict, give up } runSequence([ ["git", ["fetch", "origin", `pull/${num}/head:${num}`]], From 8454ef114dee42e445ee538f8e084ccaefad5136 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com> Date: Wed, 26 Jun 2019 16:04:46 -0700 Subject: [PATCH 21/27] JSDoc:Treat tokens between backticks as comments even `@`, which would otherwise start a new tag. --- src/compiler/parser.ts | 21 +++++++++-- .../jsdocParseMatchingBackticks.symbols | 30 ++++++++++++++++ .../jsdocParseMatchingBackticks.types | 35 +++++++++++++++++++ .../jsdoc/jsdocParseMatchingBackticks.ts | 20 +++++++++++ 4 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 tests/baselines/reference/jsdocParseMatchingBackticks.symbols create mode 100644 tests/baselines/reference/jsdocParseMatchingBackticks.types create mode 100644 tests/cases/conformance/jsdoc/jsdocParseMatchingBackticks.ts diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index e56ff98846e..d9d2f761595 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -6431,6 +6431,7 @@ namespace ts { BeginningOfLine, SawAsterisk, SavingComments, + SavingBackticks, // NOTE: Only used when parsing tag comments } const enum PropertyLikeParse { @@ -6691,18 +6692,23 @@ namespace ts { case SyntaxKind.NewLineTrivia: if (state >= JSDocState.SawAsterisk) { state = JSDocState.BeginningOfLine; + // don't use pushComment here because we want to keep the margin unchanged comments.push(scanner.getTokenText()); } indent = 0; break; case SyntaxKind.AtToken: + if (state === JSDocState.SavingBackticks) { + comments.push(scanner.getTokenText()); + break; + } scanner.setTextPos(scanner.getTextPos() - 1); // falls through case SyntaxKind.EndOfFileToken: // Done break loop; case SyntaxKind.WhitespaceTrivia: - if (state === JSDocState.SavingComments) { + if (state === JSDocState.SavingComments || state === JSDocState.SavingBackticks) { pushComment(scanner.getTokenText()); } else { @@ -6724,6 +6730,15 @@ namespace ts { } pushComment(scanner.getTokenText()); break; + case SyntaxKind.BacktickToken: + if (state === JSDocState.SavingBackticks) { + state = JSDocState.SavingComments; + } + else { + state = JSDocState.SavingBackticks; + } + pushComment(scanner.getTokenText()); + break; case SyntaxKind.AsteriskToken: if (state === JSDocState.BeginningOfLine) { // leading asterisks start recording on the *next* (non-whitespace) token @@ -6734,7 +6749,9 @@ namespace ts { // record the * as a comment // falls through default: - state = JSDocState.SavingComments; // leading identifiers start recording as well + if (state !== JSDocState.SavingBackticks) { + state = JSDocState.SavingComments; // leading identifiers start recording as well + } pushComment(scanner.getTokenText()); break; } diff --git a/tests/baselines/reference/jsdocParseMatchingBackticks.symbols b/tests/baselines/reference/jsdocParseMatchingBackticks.symbols new file mode 100644 index 00000000000..83bd81113aa --- /dev/null +++ b/tests/baselines/reference/jsdocParseMatchingBackticks.symbols @@ -0,0 +1,30 @@ +=== tests/cases/conformance/jsdoc/jsdocParseMatchingBackticks.js === +/** + * `@param` initial at-param is OK in title comment + * @param {string} x hi there `@param` + * @param {string} y hi there `@ * param + * this is the margin + * so we'll drop everything before it + `@param` @param {string} z hello??? + * `@param` @param {string} alpha hello??? + * `@ * param` @param {string} beta hello??? + * @param {string} gamma + */ +export function f(x, y, z, alpha, beta, gamma) { +>f : Symbol(f, Decl(jsdocParseMatchingBackticks.js, 0, 0)) +>x : Symbol(x, Decl(jsdocParseMatchingBackticks.js, 11, 18)) +>y : Symbol(y, Decl(jsdocParseMatchingBackticks.js, 11, 20)) +>z : Symbol(z, Decl(jsdocParseMatchingBackticks.js, 11, 23)) +>alpha : Symbol(alpha, Decl(jsdocParseMatchingBackticks.js, 11, 26)) +>beta : Symbol(beta, Decl(jsdocParseMatchingBackticks.js, 11, 33)) +>gamma : Symbol(gamma, Decl(jsdocParseMatchingBackticks.js, 11, 39)) + + return x + y + z + alpha + beta + gamma +>x : Symbol(x, Decl(jsdocParseMatchingBackticks.js, 11, 18)) +>y : Symbol(y, Decl(jsdocParseMatchingBackticks.js, 11, 20)) +>z : Symbol(z, Decl(jsdocParseMatchingBackticks.js, 11, 23)) +>alpha : Symbol(alpha, Decl(jsdocParseMatchingBackticks.js, 11, 26)) +>beta : Symbol(beta, Decl(jsdocParseMatchingBackticks.js, 11, 33)) +>gamma : Symbol(gamma, Decl(jsdocParseMatchingBackticks.js, 11, 39)) +} + diff --git a/tests/baselines/reference/jsdocParseMatchingBackticks.types b/tests/baselines/reference/jsdocParseMatchingBackticks.types new file mode 100644 index 00000000000..8127e836df4 --- /dev/null +++ b/tests/baselines/reference/jsdocParseMatchingBackticks.types @@ -0,0 +1,35 @@ +=== tests/cases/conformance/jsdoc/jsdocParseMatchingBackticks.js === +/** + * `@param` initial at-param is OK in title comment + * @param {string} x hi there `@param` + * @param {string} y hi there `@ * param + * this is the margin + * so we'll drop everything before it + `@param` @param {string} z hello??? + * `@param` @param {string} alpha hello??? + * `@ * param` @param {string} beta hello??? + * @param {string} gamma + */ +export function f(x, y, z, alpha, beta, gamma) { +>f : (x: string, y: string, z: string, alpha: string, beta: string, gamma: string) => string +>x : string +>y : string +>z : string +>alpha : string +>beta : string +>gamma : string + + return x + y + z + alpha + beta + gamma +>x + y + z + alpha + beta + gamma : string +>x + y + z + alpha + beta : string +>x + y + z + alpha : string +>x + y + z : string +>x + y : string +>x : string +>y : string +>z : string +>alpha : string +>beta : string +>gamma : string +} + diff --git a/tests/cases/conformance/jsdoc/jsdocParseMatchingBackticks.ts b/tests/cases/conformance/jsdoc/jsdocParseMatchingBackticks.ts new file mode 100644 index 00000000000..942ee98d52f --- /dev/null +++ b/tests/cases/conformance/jsdoc/jsdocParseMatchingBackticks.ts @@ -0,0 +1,20 @@ +// @noEmit: true +// @allowJs: true +// @checkJs: true +// @strict: true +// @Filename: jsdocParseMatchingBackticks.js + +/** + * `@param` initial at-param is OK in title comment + * @param {string} x hi there `@param` + * @param {string} y hi there `@ * param + * this is the margin + * so we'll drop everything before it + `@param` @param {string} z hello??? + * `@param` @param {string} alpha hello??? + * `@ * param` @param {string} beta hello??? + * @param {string} gamma + */ +export function f(x, y, z, alpha, beta, gamma) { + return x + y + z + alpha + beta + gamma +} From 2362dd4facb2e2f55a663f1b2b556a1773490eb3 Mon Sep 17 00:00:00 2001 From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com> Date: Thu, 27 Jun 2019 08:49:56 -0700 Subject: [PATCH 22/27] Add fourslash test of jsdoc backtick parsing --- .../fourslash/quickInfoJSDocBackticks.ts | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 tests/cases/fourslash/quickInfoJSDocBackticks.ts diff --git a/tests/cases/fourslash/quickInfoJSDocBackticks.ts b/tests/cases/fourslash/quickInfoJSDocBackticks.ts new file mode 100644 index 00000000000..16ddce5a939 --- /dev/null +++ b/tests/cases/fourslash/quickInfoJSDocBackticks.ts @@ -0,0 +1,25 @@ +/// + +// @noEmit: true +// @allowJs: true +// @checkJs: true +// @strict: true +// @Filename: jsdocParseMatchingBackticks.js + +/////** +//// * `@param` initial at-param is OK in title comment +//// * @param {string} x hi there `@param` +//// * @param {string} y hi there `@ * param +//// * this is the margin +//// */ +////export function f(x, y) { +//// return x/*x*/ + y/*y*/ +////} +////f/*f*/ + +goTo.marker("f"); +verify.quickInfoIs("function f(x: string, y: string): string", "`@param` initial at-param is OK in title comment"); +goTo.marker("x"); +verify.quickInfoIs("(parameter) x: string", "hi there `@param`"); +goTo.marker("y"); +verify.quickInfoIs("(parameter) y: string", "hi there `@ * param\nthis is the margin"); From 9832899372e9afc3955b68745d68a1238e614a4d Mon Sep 17 00:00:00 2001 From: TypeScript Bot Date: Thu, 27 Jun 2019 10:09:38 -0700 Subject: [PATCH 23/27] Update user baselines (#32136) --- tests/baselines/reference/docker/azure-sdk.log | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/baselines/reference/docker/azure-sdk.log b/tests/baselines/reference/docker/azure-sdk.log index 196af60dd3d..9cb070c1089 100644 --- a/tests/baselines/reference/docker/azure-sdk.log +++ b/tests/baselines/reference/docker/azure-sdk.log @@ -25,6 +25,8 @@ XX of XX: [@azure/storage-queue] completed successfully in ? seconds XX of XX: [@azure/template] completed successfully in ? seconds [@azure/abort-controller] started XX of XX: [@azure/abort-controller] completed successfully in ? seconds +[@azure/core-asynciterator-polyfill] started +XX of XX: [@azure/core-asynciterator-polyfill] completed successfully in ? seconds [@azure/core-http] started XX of XX: [@azure/core-http] completed successfully in ? seconds [@azure/core-paging] started @@ -43,9 +45,10 @@ XX of XX: [@azure/keyvault-keys] completed successfully in ? seconds XX of XX: [@azure/keyvault-secrets] completed successfully in ? seconds [@azure/core-amqp] started -SUCCESS (15) +SUCCESS (16) ================================ @azure/abort-controller (? seconds) +@azure/core-asynciterator-polyfill (? seconds) @azure/core-http (? seconds) @azure/core-paging (? seconds) @azure/cosmos (? seconds) From 2af8ac73ffccbb0588218ad2bcedfe93041be269 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Thu, 27 Jun 2019 15:29:22 -0700 Subject: [PATCH 24/27] Add xterm test to docker suite (#32149) --- .gitignore | 1 + src/testRunner/externalCompileRunner.ts | 10 +++++++--- tests/baselines/reference/docker/xterm.js.log | 10 ++++++++++ tests/cases/docker/xterm.js/Dockerfile | 14 ++++++++++++++ 4 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 tests/baselines/reference/docker/xterm.js.log create mode 100644 tests/cases/docker/xterm.js/Dockerfile diff --git a/.gitignore b/.gitignore index 04c397bb7e3..a906e2cf7d5 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ tests/webTestServer.js.map tests/webhost/*.d.ts tests/webhost/webtsc.js tests/cases/**/*.js +!tests/cases/docker/*.js/ tests/cases/**/*.js.map *.config scripts/debug.bat diff --git a/src/testRunner/externalCompileRunner.ts b/src/testRunner/externalCompileRunner.ts index 4e1575ca47d..4e2cb0041d1 100644 --- a/src/testRunner/externalCompileRunner.ts +++ b/src/testRunner/externalCompileRunner.ts @@ -157,7 +157,7 @@ ${sanitizeDockerfileOutput(result.stderr.toString())}`; } function sanitizeDockerfileOutput(result: string): string { - return stripAbsoluteImportPaths(sanitizeTimestamps(stripRushStageNumbers(stripANSIEscapes(normalizeNewlines(result))))); + return stripAbsoluteImportPaths(sanitizeTimestamps(sanitizeVersionSpecifiers(stripRushStageNumbers(stripANSIEscapes(normalizeNewlines(result)))))); } function normalizeNewlines(result: string): string { @@ -176,10 +176,14 @@ function sanitizeTimestamps(result: string): string { return result.replace(/\[\d?\d:\d\d:\d\d (A|P)M\]/g, "[XX:XX:XX XM]") .replace(/\d+(\.\d+)? seconds?/g, "? seconds") .replace(/\d+(\.\d+)? minutes?/g, "") - .replace(/\d+(\.\d+)?s/g, "?s") - .replace(/\d+.\d+.\d+-insiders.\d\d\d\d\d\d\d\d/g, "X.X.X-insiders.xxxxxxxx"); + .replace(/\d+(\.\d+)?s/g, "?s"); } +function sanitizeVersionSpecifiers(result: string): string { + return result + .replace(/\d+.\d+.\d+-insiders.\d\d\d\d\d\d\d\d/g, "X.X.X-insiders.xxxxxxxx") + .replace(/@\d+\.\d+\.\d+/g, "@X.X.X"); +} /** * Import types and some other error messages use absolute paths in errors as they have no context to be written relative to; diff --git a/tests/baselines/reference/docker/xterm.js.log b/tests/baselines/reference/docker/xterm.js.log new file mode 100644 index 00000000000..5eb25dc4da0 --- /dev/null +++ b/tests/baselines/reference/docker/xterm.js.log @@ -0,0 +1,10 @@ +Exit Code: 0 +Standard output: + +> xterm@X.X.X build /xtermjs +> tsc -b ./tsconfig.all.json + + + + +Standard error: diff --git a/tests/cases/docker/xterm.js/Dockerfile b/tests/cases/docker/xterm.js/Dockerfile new file mode 100644 index 00000000000..179459d280e --- /dev/null +++ b/tests/cases/docker/xterm.js/Dockerfile @@ -0,0 +1,14 @@ +# node-pty doesn't build on node 12 right now, so we lock to 8 - the version xterm itself tests against :( +FROM node:8 +RUN git clone https://github.com/xtermjs/xterm.js.git /xtermjs +WORKDIR /xtermjs +RUN git pull +COPY --from=typescript/typescript /typescript/typescript-*.tgz /typescript.tgz +RUN mkdir /typescript +RUN tar -xzvf /typescript.tgz -C /typescript +RUN npm i typescript@/typescript/package +RUN npm install +# Set entrypoint back to bash (`node` base image made it `node`) +ENTRYPOINT [ "/bin/bash", "-c" , "exec \"${@:0}\";"] +# Build +CMD npm run build \ No newline at end of file From 6760a03cec69a1b2238ff8c4824493a5e1e7875f Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 28 Jun 2019 13:22:25 -0700 Subject: [PATCH 25/27] Add vscode docker test (#32152) * Add vscode docker test * Remove PID-log line * Update user baselines (#18) --- src/testRunner/externalCompileRunner.ts | 29 ++++++-- .../baselines/reference/docker/azure-sdk.log | 12 ---- .../reference/docker/office-ui-fabric.log | 71 ------------------- tests/baselines/reference/docker/vscode.log | 34 +++++++++ tests/baselines/reference/docker/xterm.js.log | 1 - tests/cases/docker/vscode/Dockerfile | 19 +++++ 6 files changed, 77 insertions(+), 89 deletions(-) create mode 100644 tests/baselines/reference/docker/vscode.log create mode 100644 tests/cases/docker/vscode/Dockerfile diff --git a/src/testRunner/externalCompileRunner.ts b/src/testRunner/externalCompileRunner.ts index 4e2cb0041d1..1a027f975da 100644 --- a/src/testRunner/externalCompileRunner.ts +++ b/src/testRunner/externalCompileRunner.ts @@ -157,7 +157,15 @@ ${sanitizeDockerfileOutput(result.stderr.toString())}`; } function sanitizeDockerfileOutput(result: string): string { - return stripAbsoluteImportPaths(sanitizeTimestamps(sanitizeVersionSpecifiers(stripRushStageNumbers(stripANSIEscapes(normalizeNewlines(result)))))); + return [ + normalizeNewlines, + stripANSIEscapes, + stripRushStageNumbers, + sanitizeVersionSpecifiers, + sanitizeTimestamps, + sanitizeUnimportantGulpOutput, + stripAbsoluteImportPaths, + ].reduce((result, f) => f(result), result); } function normalizeNewlines(result: string): string { @@ -172,17 +180,28 @@ function stripRushStageNumbers(result: string): string { return result.replace(/\d+ of \d+:/g, "XX of XX:"); } +/** + * Gulp's output order within a `parallel` block is nondeterministic (and there's no way to configure it to execute in series), + * so we purge as much of the gulp output as we can + */ +function sanitizeUnimportantGulpOutput(result: string): string { + return result.replace(/^.*(\] (Starting)|(Finished)).*$/gm, "") // task start/end messages (nondeterministic order) + .replace(/^.*\] Respawned to PID: \d+.*$/gm, "") // PID of child is OS and system-load dependent (likely stableish in a container but still dangerous) + .replace(/\n+/g, "\n"); +} + function sanitizeTimestamps(result: string): string { return result.replace(/\[\d?\d:\d\d:\d\d (A|P)M\]/g, "[XX:XX:XX XM]") - .replace(/\d+(\.\d+)? seconds?/g, "? seconds") - .replace(/\d+(\.\d+)? minutes?/g, "") - .replace(/\d+(\.\d+)?s/g, "?s"); + .replace(/\[\d?\d:\d\d:\d\d\]/g, "[XX:XX:XX]") + .replace(/\d+(\.\d+)? sec(onds?)?/g, "? seconds") + .replace(/\d+(\.\d+)? min(utes?)?/g, "") + .replace(/\d+(\.\d+)?( m)?s/g, "?s"); } function sanitizeVersionSpecifiers(result: string): string { return result .replace(/\d+.\d+.\d+-insiders.\d\d\d\d\d\d\d\d/g, "X.X.X-insiders.xxxxxxxx") - .replace(/@\d+\.\d+\.\d+/g, "@X.X.X"); + .replace(/([@v])\d+\.\d+\.\d+/g, "$1X.X.X"); } /** diff --git a/tests/baselines/reference/docker/azure-sdk.log b/tests/baselines/reference/docker/azure-sdk.log index 9cb070c1089..0069c7e433e 100644 --- a/tests/baselines/reference/docker/azure-sdk.log +++ b/tests/baselines/reference/docker/azure-sdk.log @@ -1,14 +1,9 @@ Exit Code: 1 Standard output: - Rush Multi-Project Build Tool 5.7.3 - https://rushjs.io - - Starting "rush rebuild" - Executing a maximum of 1 simultaneous processes... - [@azure/cosmos] started XX of XX: [@azure/cosmos] completed successfully in ? seconds [@azure/service-bus] started @@ -44,7 +39,6 @@ XX of XX: [@azure/keyvault-keys] completed successfully in ? seconds [@azure/keyvault-secrets] started XX of XX: [@azure/keyvault-secrets] completed successfully in ? seconds [@azure/core-amqp] started - SUCCESS (16) ================================ @azure/abort-controller (? seconds) @@ -64,18 +58,15 @@ SUCCESS (16) @azure/template (? seconds) testhub (? seconds) ================================ - SUCCESS WITH WARNINGS (1) ================================ @azure/service-bus (? seconds) Warning: You have changed the public API signature for this project. Updating review/service-bus.api.md ================================ - BLOCKED (1) ================================ @azure/event-hubs ================================ - FAILURE (1) ================================ @azure/core-amqp (? seconds) @@ -85,8 +76,6 @@ src/errors.ts(586,20): error TS7053: Element implicitly has an 'any' type becaus src/errors.ts(607,34): error TS7053: Element implicitly has an 'any' type because expression of type 'any' can't be used to index type 'typeof SystemErrorConditionMapper'. src/errors.ts(608,20): error TS7053: Element implicitly has an 'any' type because expression of type 'any' can't be used to index type 'typeof ConditionErrorNameMapper'. ================================ - - Error: Project(s) failed to build rush rebuild - Errors! ( ? seconds) @@ -95,7 +84,6 @@ rush rebuild - Errors! ( ? seconds) Standard error: Your version of Node.js (12.4.0) has not been tested with this release of Rush. The Rush team will not accept issue reports for it. Please consider upgrading Rush or downgrading Node.js. XX of XX: [@azure/service-bus] completed with warnings in ? seconds - XX of XX: [@azure/core-amqp] failed to build! XX of XX: [@azure/event-hubs] blocked by [@azure/core-amqp]! [@azure/core-amqp] Returned error code: 2 diff --git a/tests/baselines/reference/docker/office-ui-fabric.log b/tests/baselines/reference/docker/office-ui-fabric.log index 370ba398f01..3657e61b3be 100644 --- a/tests/baselines/reference/docker/office-ui-fabric.log +++ b/tests/baselines/reference/docker/office-ui-fabric.log @@ -1,14 +1,9 @@ Exit Code: 1 Standard output: - Rush Multi-Project Build Tool 5.6.0 - https://rushjs.io - - Starting "rush rebuild" - Executing a maximum of 1 simultaneous processes... - [@uifabric/prettier-rules] started XX of XX: [@uifabric/prettier-rules] completed successfully in ? seconds [@uifabric/tslint-rules] started @@ -36,9 +31,7 @@ XX of XX: [@uifabric/file-type-icons] completed successfully in ? seconds [@uifabric/foundation] started ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions. ● createFactory › passes componentProps without userProps - RangeError: Invalid array length - 189 | for (const props of allProps) { 190 | classNames.push(props && props.className); > 191 | assign(finalProps, ...(props as any)); @@ -46,16 +39,12 @@ ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed 192 | } 193 | 194 | finalProps.className = mergeStyles(defaultStyles, classNames); - at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22) at _constructFinalProps (src/slots.tsx:191:11) at result (src/slots.tsx:88:24) at Object. (src/slots.test.tsx:205:73) - ● createFactory › passes userProp string as child - RangeError: Invalid array length - 189 | for (const props of allProps) { 190 | classNames.push(props && props.className); > 191 | assign(finalProps, ...(props as any)); @@ -63,16 +52,12 @@ ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed 192 | } 193 | 194 | finalProps.className = mergeStyles(defaultStyles, classNames); - at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22) at _constructFinalProps (src/slots.tsx:191:11) at result (src/slots.tsx:88:24) at Object. (src/slots.test.tsx:210:76) - ● createFactory › passes userProp integer as child - RangeError: Invalid array length - 189 | for (const props of allProps) { 190 | classNames.push(props && props.className); > 191 | assign(finalProps, ...(props as any)); @@ -80,16 +65,12 @@ ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed 192 | } 193 | 194 | finalProps.className = mergeStyles(defaultStyles, classNames); - at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22) at _constructFinalProps (src/slots.tsx:191:11) at result (src/slots.tsx:88:24) at Object. (src/slots.test.tsx:220:76) - ● createFactory › passes userProp string as defaultProp - RangeError: Invalid array length - 189 | for (const props of allProps) { 190 | classNames.push(props && props.className); > 191 | assign(finalProps, ...(props as any)); @@ -97,16 +78,12 @@ ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed 192 | } 193 | 194 | finalProps.className = mergeStyles(defaultStyles, classNames); - at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22) at _constructFinalProps (src/slots.tsx:191:11) at result (src/slots.tsx:88:24) at Object. (src/slots.test.tsx:225:92) - ● createFactory › passes userProp integer as defaultProp - RangeError: Invalid array length - 189 | for (const props of allProps) { 190 | classNames.push(props && props.className); > 191 | assign(finalProps, ...(props as any)); @@ -114,16 +91,12 @@ ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed 192 | } 193 | 194 | finalProps.className = mergeStyles(defaultStyles, classNames); - at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22) at _constructFinalProps (src/slots.tsx:191:11) at result (src/slots.tsx:88:24) at Object. (src/slots.test.tsx:235:92) - ● createFactory › merges userProps over componentProps - RangeError: Invalid array length - 189 | for (const props of allProps) { 190 | classNames.push(props && props.className); > 191 | assign(finalProps, ...(props as any)); @@ -131,16 +104,12 @@ ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed 192 | } 193 | 194 | finalProps.className = mergeStyles(defaultStyles, classNames); - at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22) at _constructFinalProps (src/slots.tsx:191:11) at result (src/slots.tsx:88:24) at Object. (src/slots.test.tsx:245:84) - ● createFactory › renders div and userProp integer as children - RangeError: Invalid array length - 189 | for (const props of allProps) { 190 | classNames.push(props && props.className); > 191 | assign(finalProps, ...(props as any)); @@ -148,16 +117,12 @@ ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed 192 | } 193 | 194 | finalProps.className = mergeStyles(defaultStyles, classNames); - at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22) at _constructFinalProps (src/slots.tsx:191:11) at result (src/slots.tsx:88:24) at Object. (src/slots.test.tsx:255:86) - ● createFactory › renders div and userProp string as children - RangeError: Invalid array length - 189 | for (const props of allProps) { 190 | classNames.push(props && props.className); > 191 | assign(finalProps, ...(props as any)); @@ -165,16 +130,12 @@ ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed 192 | } 193 | 194 | finalProps.className = mergeStyles(defaultStyles, classNames); - at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22) at _constructFinalProps (src/slots.tsx:191:11) at result (src/slots.tsx:88:24) at Object. (src/slots.test.tsx:266:86) - ● createFactory › renders userProp span function without component props - RangeError: Invalid array length - 189 | for (const props of allProps) { 190 | classNames.push(props && props.className); > 191 | assign(finalProps, ...(props as any)); @@ -182,16 +143,12 @@ ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed 192 | } 193 | 194 | finalProps.className = mergeStyles(defaultStyles, classNames); - at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22) at _constructFinalProps (src/slots.tsx:191:11) at result (src/slots.tsx:88:24) at Object. (src/slots.test.tsx:288:61) - ● createFactory › renders userProp span function with component props - RangeError: Invalid array length - 189 | for (const props of allProps) { 190 | classNames.push(props && props.className); > 191 | assign(finalProps, ...(props as any)); @@ -199,16 +156,12 @@ ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed 192 | } 193 | 194 | finalProps.className = mergeStyles(defaultStyles, classNames); - at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22) at _constructFinalProps (src/slots.tsx:191:11) at result (src/slots.tsx:88:24) at Object. (src/slots.test.tsx:301:61) - ● createFactory › renders userProp span component with component props - RangeError: Invalid array length - 189 | for (const props of allProps) { 190 | classNames.push(props && props.className); > 191 | assign(finalProps, ...(props as any)); @@ -216,16 +169,12 @@ ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed 192 | } 193 | 194 | finalProps.className = mergeStyles(defaultStyles, classNames); - at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22) at _constructFinalProps (src/slots.tsx:191:11) at result (src/slots.tsx:88:24) at Object. (src/slots.test.tsx:314:61) - ● createFactory › passes props and type arguments to userProp function - RangeError: Invalid array length - 189 | for (const props of allProps) { 190 | classNames.push(props && props.className); > 191 | assign(finalProps, ...(props as any)); @@ -233,16 +182,12 @@ ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed 192 | } 193 | 194 | finalProps.className = mergeStyles(defaultStyles, classNames); - at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22) at _constructFinalProps (src/slots.tsx:191:11) at result (src/slots.tsx:88:24) at Object. (src/slots.test.tsx:334:43) - ● getSlots › creates slots and passes merged props to them - RangeError: Invalid array length - 189 | for (const props of allProps) { 190 | classNames.push(props && props.className); > 191 | assign(finalProps, ...(props as any)); @@ -250,14 +195,12 @@ ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed 192 | } 193 | 194 | finalProps.className = mergeStyles(defaultStyles, classNames); - at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22) at _constructFinalProps (src/slots.tsx:191:11) at result (src/slots.tsx:88:24) at _renderSlot (src/slots.tsx:221:100) at Object.slot [as testSlot1] (src/slots.tsx:142:16) at Object. (src/slots.test.tsx:399:24) - [XX:XX:XX XM] x Error detected while running 'jest' [XX:XX:XX XM] x ------------------------------------ [XX:XX:XX XM] x Error: Command failed: /usr/local/bin/node /office-ui-fabric-react/common/temp/node_modules/jest/bin/jest.js --config /office-ui-fabric-react/packages/foundation/jest.config.js --passWithNoTests --colors @@ -273,7 +216,6 @@ ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed XX of XX: [@uifabric/icons] completed successfully in ? seconds [@uifabric/webpack-utils] started XX of XX: [@uifabric/webpack-utils] completed successfully in ? seconds - SUCCESS (8) ================================ @uifabric/build (? seconds) @@ -285,28 +227,21 @@ SUCCESS (8) @uifabric/tslint-rules (? seconds) @uifabric/webpack-utils (? seconds) ================================ - SUCCESS WITH WARNINGS (6) ================================ @uifabric/codepen-loader (? seconds) ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions. - @uifabric/jest-serializer-merge-styles (? seconds) ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions. - @uifabric/merge-styles (? seconds) ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions. - @uifabric/set-version (? seconds) ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions. - @uifabric/styling (? seconds) ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions. - @uifabric/utilities (? seconds) ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions. ================================ - BLOCKED (27) ================================ @uifabric/api-docs @@ -337,14 +272,12 @@ theming-designer todo-app vr-tests ================================ - FAILURE (1) ================================ @uifabric/foundation (? seconds) ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=2.7.0 <4.0.0). Please do not report issues in ts-jest if you are using unsupported versions. ● createFactory › passes componentProps without userProps RangeError: Invalid array length - 189 | for (const props of allProps) { 190 | classNames.push(props && props.className); > 191 | assign(finalProps, ...(props as any)); @@ -354,7 +287,6 @@ ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed [...179 lines omitted...] 193 | 194 | finalProps.className = mergeStyles(defaultStyles, classNames); - at Object.__spreadArrays (../../common/temp/node_modules/.registry.npmjs.org/tslib/1.10.0/node_modules/tslib/tslib.js:182:22) at _constructFinalProps (src/slots.tsx:191:11) at result (src/slots.tsx:88:24) @@ -373,8 +305,6 @@ ts-jest[versions] (WARN) Version X.X.X-insiders.xxxxxxxx of typescript installed [XX:XX:XX XM] x finished 'build' in ?s with errors [XX:XX:XX XM] x Error previously detected. See above for error messages. ================================ - - Error: Project(s) failed to build rush rebuild - Errors! ( ? seconds) @@ -388,7 +318,6 @@ XX of XX: [@uifabric/merge-styles] completed with warnings in ? seconds XX of XX: [@uifabric/jest-serializer-merge-styles] completed with warnings in ? seconds XX of XX: [@uifabric/utilities] completed with warnings in ? seconds XX of XX: [@uifabric/styling] completed with warnings in ? seconds - XX of XX: [@uifabric/foundation] failed to build! XX of XX: [@uifabric/experiments] blocked by [@uifabric/foundation]! XX of XX: [@uifabric/fabric-website] blocked by [@uifabric/foundation]! diff --git a/tests/baselines/reference/docker/vscode.log b/tests/baselines/reference/docker/vscode.log new file mode 100644 index 00000000000..8f23cb6719d --- /dev/null +++ b/tests/baselines/reference/docker/vscode.log @@ -0,0 +1,34 @@ +Exit Code: 1 +Standard output: +yarn run vX.X.X +$ gulp compile --max_old_space_size=4095 +[XX:XX:XX] Node flags detected: --max_old_space_size=4095 +[XX:XX:XX] Using gulpfile /vscode/gulpfile.js +[XX:XX:XX] Error: /vscode/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts(560,5): Type 'null' is not assignable to type 'string'. +[XX:XX:XX] Error: /vscode/src/vs/base/browser/ui/menu/menubar.ts(742,7): Type '"underline" | null' is not assignable to type 'string'. + Type 'null' is not assignable to type 'string'. +[XX:XX:XX] Error: /vscode/src/vs/editor/browser/controller/textAreaInput.ts(208,33): Property 'locale' does not exist on type 'CompositionEvent'. +[XX:XX:XX] Error: /vscode/src/vs/editor/browser/controller/textAreaInput.ts(225,33): Property 'locale' does not exist on type 'CompositionEvent'. +[XX:XX:XX] Error: /vscode/src/vs/workbench/browser/parts/titlebar/titlebarPart.ts(560,5): Type 'null' is not assignable to type 'string'. +[XX:XX:XX] Error: /vscode/src/vs/base/browser/ui/menu/menubar.ts(742,7): Type '"underline" | null' is not assignable to type 'string'. + Type 'null' is not assignable to type 'string'. +[XX:XX:XX] Error: /vscode/src/vs/editor/browser/controller/textAreaInput.ts(208,33): Property 'locale' does not exist on type 'CompositionEvent'. +[XX:XX:XX] Error: /vscode/src/vs/editor/browser/controller/textAreaInput.ts(225,33): Property 'locale' does not exist on type 'CompositionEvent'. +info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command. + + + +Standard error: +[XX:XX:XX] 'compile' errored after +[XX:XX:XX] Error: Found 4 errors + at Stream. (/vscode/build/lib/reporter.js:74:29) + at _end (/vscode/node_modules/through/index.js:65:9) + at Stream.stream.end (/vscode/node_modules/through/index.js:74:5) + at Stream.onend (internal/streams/legacy.js:42:10) + at Stream.emit (events.js:203:15) + at Stream.EventEmitter.emit (domain.js:466:23) + at drain (/vscode/node_modules/through/index.js:34:23) + at Stream.stream.queue.stream.push (/vscode/node_modules/through/index.js:45:5) + at Stream.end (/vscode/node_modules/through/index.js:15:35) + at _end (/vscode/node_modules/through/index.js:65:9) +error Command failed with exit code 1. diff --git a/tests/baselines/reference/docker/xterm.js.log b/tests/baselines/reference/docker/xterm.js.log index 5eb25dc4da0..6024f04e09d 100644 --- a/tests/baselines/reference/docker/xterm.js.log +++ b/tests/baselines/reference/docker/xterm.js.log @@ -6,5 +6,4 @@ Standard output: - Standard error: diff --git a/tests/cases/docker/vscode/Dockerfile b/tests/cases/docker/vscode/Dockerfile new file mode 100644 index 00000000000..d20e2e8d622 --- /dev/null +++ b/tests/cases/docker/vscode/Dockerfile @@ -0,0 +1,19 @@ +# vscode only supports node 8 :( +FROM node:10 +RUN apt-get update +RUN apt-get install libsecret-1-dev libx11-dev libxkbfile-dev -y +RUN npm i -g yarn +RUN git clone https://github.com/microsoft/vscode.git /vscode +WORKDIR /vscode +RUN git pull +COPY --from=typescript/typescript /typescript/typescript-*.tgz /typescript.tgz +RUN mkdir /typescript +RUN tar -xzvf /typescript.tgz -C /typescript +WORKDIR /vscode/build +RUN yarn add typescript@/typescript/package +WORKDIR /vscode +RUN yarn add typescript@/typescript/package +RUN yarn +ENTRYPOINT [ "yarn" ] +# Build +CMD [ "compile" ] \ No newline at end of file From b4a1a5996f632a811fadaeba5008acf4acbde383 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 28 Jun 2019 13:23:15 -0700 Subject: [PATCH 26/27] Rework declaration emit visibility calculation for namespaces (#32156) * Rework declaration visibility for namespaces * Accept skipped baselines --- src/compiler/transformers/declarations.ts | 95 +++++++++---- .../reference/aliasInaccessibleModule.js | 1 + .../reference/aliasInaccessibleModule2.js | 1 + ...eTypeAnnotationVisibilityErrorAccessors.js | 5 +- ...ationVisibilityErrorParameterOfFunction.js | 15 +- ...tionVisibilityErrorReturnTypeOfFunction.js | 15 +- ...eTypeAnnotationVisibilityErrorTypeAlias.js | 10 +- ...ypeAnnotationVisibilityErrorTypeLiteral.js | 15 +- ...ationVisibilityErrorVariableDeclaration.js | 15 +- tests/baselines/reference/declInput-2.js | 7 +- ...eclarationEmitDestructuringPrivacyError.js | 3 +- .../declarationEmitExpressionInExtends5.js | 9 +- ...nFunctionTypeNonlocalShouldNotBeAnError.js | 3 +- ...rtNamespaceDeclarationRetainsVisibility.js | 32 +++++ ...espaceDeclarationRetainsVisibility.symbols | 27 ++++ ...amespaceDeclarationRetainsVisibility.types | 19 +++ .../getEmitOutputWithEmitterErrors.baseline | 3 +- .../reference/privacyAccessorDeclFile.js | 60 ++++---- .../privacyCheckTypeOfInvisibleModuleError.js | 3 +- ...rivacyCheckTypeOfInvisibleModuleNoError.js | 3 +- .../privacyClassExtendsClauseDeclFile.js | 25 ++-- .../privacyClassImplementsClauseDeclFile.js | 27 ++-- .../privacyFunctionParameterDeclFile.js | 108 +++++++------- .../privacyFunctionReturnTypeDeclFile.js | 132 +++++++++--------- tests/baselines/reference/privacyGloImport.js | 19 +-- .../reference/privacyGloImportParseErrors.js | 37 ++--- tests/baselines/reference/privacyImport.js | 19 +-- .../privacyInterfaceExtendsClauseDeclFile.js | 27 ++-- .../privacyTypeParameterOfFunctionDeclFile.js | 48 ++++--- .../privacyTypeParametersOfClassDeclFile.js | 20 +-- ...rivacyTypeParametersOfInterfaceDeclFile.js | 24 ++-- .../baselines/reference/privacyVarDeclFile.js | 108 +++++++------- .../reference/symbolDeclarationEmit12.js | 3 +- .../reference/typeFromPropertyAssignment29.js | 3 +- ...rtNamespaceDeclarationRetainsVisibility.ts | 14 ++ 35 files changed, 568 insertions(+), 387 deletions(-) create mode 100644 tests/baselines/reference/exportNamespaceDeclarationRetainsVisibility.js create mode 100644 tests/baselines/reference/exportNamespaceDeclarationRetainsVisibility.symbols create mode 100644 tests/baselines/reference/exportNamespaceDeclarationRetainsVisibility.types create mode 100644 tests/cases/compiler/exportNamespaceDeclarationRetainsVisibility.ts diff --git a/src/compiler/transformers/declarations.ts b/src/compiler/transformers/declarations.ts index 4f68c36d919..bb939f7d4f1 100644 --- a/src/compiler/transformers/declarations.ts +++ b/src/compiler/transformers/declarations.ts @@ -190,6 +190,10 @@ namespace ts { } } + function createEmptyExports() { + return createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, createNamedExports([]), /*moduleSpecifier*/ undefined); + } + function transformRoot(node: Bundle): Bundle; function transformRoot(node: SourceFile): SourceFile; function transformRoot(node: SourceFile | Bundle): SourceFile | Bundle; @@ -277,7 +281,7 @@ namespace ts { refs.forEach(referenceVisitor); const emittedImports = filter(combinedStatements, isAnyImportSyntax); if (isExternalModule(node) && (!resultHasExternalModuleIndicator || (needsScopeFixMarker && !resultHasScopeMarker))) { - combinedStatements = setTextRange(createNodeArray([...combinedStatements, createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, createNamedExports([]), /*moduleSpecifier*/ undefined)]), combinedStatements); + combinedStatements = setTextRange(createNodeArray([...combinedStatements, createEmptyExports()]), combinedStatements); } const updated = updateSourceFileNode(node, combinedStatements, /*isDeclarationFile*/ true, references, getFileReferencesForUsedTypeReferences(), node.hasNoDefaultLib, getLibReferences()); updated.exportedModulesFromDeclarationEmit = exportedModulesFromDeclarationEmit; @@ -670,7 +674,7 @@ namespace ts { } const priorNeedsDeclare = needsDeclare; needsDeclare = i.parent && isSourceFile(i.parent) && !(isExternalModule(i.parent) && isBundledEmit); - const result = transformTopLevelDeclaration(i, /*privateDeclaration*/ true); + const result = transformTopLevelDeclaration(i); needsDeclare = priorNeedsDeclare; lateStatementReplacementMap.set("" + getOriginalNodeId(i), result); } @@ -685,12 +689,12 @@ namespace ts { if (lateStatementReplacementMap.has(key)) { const result = lateStatementReplacementMap.get(key); lateStatementReplacementMap.delete(key); - if (result && isSourceFile(statement.parent)) { + if (result) { if (isArray(result) ? some(result, needsScopeMarker) : needsScopeMarker(result)) { // Top-level declarations in .d.ts files are always considered exported even without a modifier unless there's an export assignment or specifier needsScopeFixMarker = true; } - if (isArray(result) ? some(result, isExternalModuleIndicator) : isExternalModuleIndicator(result)) { + if (isSourceFile(statement.parent) && (isArray(result) ? some(result, isExternalModuleIndicator) : isExternalModuleIndicator(result))) { resultHasExternalModuleIndicator = true; } } @@ -939,8 +943,8 @@ namespace ts { case SyntaxKind.ExportDeclaration: { if (isSourceFile(input.parent)) { resultHasExternalModuleIndicator = true; - resultHasScopeMarker = true; } + resultHasScopeMarker = true; // Always visible if the parent node isn't dropped for being not visible // Rewrite external module names if necessary return updateExportDeclaration(input, /*decorators*/ undefined, input.modifiers, input.exportClause, rewriteModuleSpecifier(input, input.moduleSpecifier)); @@ -949,8 +953,8 @@ namespace ts { // Always visible if the parent node isn't dropped for being not visible if (isSourceFile(input.parent)) { resultHasExternalModuleIndicator = true; - resultHasScopeMarker = true; } + resultHasScopeMarker = true; if (input.expression.kind === SyntaxKind.Identifier) { return input; } @@ -973,7 +977,19 @@ namespace ts { return input; } - function transformTopLevelDeclaration(input: LateVisibilityPaintedStatement, isPrivate?: boolean) { + function stripExportModifiers(statement: Statement): Statement { + if (isImportEqualsDeclaration(statement) || hasModifier(statement, ModifierFlags.Default)) { + // `export import` statements should remain as-is, as imports are _not_ implicitly exported in an ambient namespace + // Likewise, `export default` classes and the like and just be `default`, so we preserve their `export` modifiers, too + return statement; + } + const clone = getMutableClone(statement); + const modifiers = createModifiersFromModifierFlags(getModifierFlags(statement) & (ModifierFlags.All ^ ModifierFlags.Export)); + clone.modifiers = modifiers.length ? createNodeArray(modifiers) : undefined; + return clone; + } + + function transformTopLevelDeclaration(input: LateVisibilityPaintedStatement) { if (shouldStripInternal(input)) return; switch (input.kind) { case SyntaxKind.ImportEqualsDeclaration: { @@ -1006,7 +1022,7 @@ namespace ts { return cleanup(updateTypeAliasDeclaration( input, /*decorators*/ undefined, - ensureModifiers(input, isPrivate), + ensureModifiers(input), input.name, visitNodes(input.typeParameters, visitDeclarationSubtree, isTypeParameterDeclaration), visitNode(input.type, visitDeclarationSubtree, isTypeNode) @@ -1015,7 +1031,7 @@ namespace ts { return cleanup(updateInterfaceDeclaration( input, /*decorators*/ undefined, - ensureModifiers(input, isPrivate), + ensureModifiers(input), input.name, ensureTypeParams(input, input.typeParameters), transformHeritageClauses(input.heritageClauses), @@ -1027,7 +1043,7 @@ namespace ts { const clean = cleanup(updateFunctionDeclaration( input, /*decorators*/ undefined, - ensureModifiers(input, isPrivate), + ensureModifiers(input), /*asteriskToken*/ undefined, input.name, ensureTypeParams(input, input.typeParameters), @@ -1052,7 +1068,7 @@ namespace ts { const varDecl = createVariableDeclaration(unescapeLeadingUnderscores(p.escapedName), type, /*initializer*/ undefined); return createVariableStatement(/*modifiers*/ undefined, createVariableDeclarationList([varDecl])); }); - const namespaceDecl = createModuleDeclaration(/*decorators*/ undefined, ensureModifiers(input, isPrivate), input.name!, createModuleBlock(declarations), NodeFlags.Namespace); + const namespaceDecl = createModuleDeclaration(/*decorators*/ undefined, ensureModifiers(input), input.name!, createModuleBlock(declarations), NodeFlags.Namespace); if (!hasModifier(clean, ModifierFlags.Default)) { return [clean, namespaceDecl]; @@ -1086,7 +1102,9 @@ namespace ts { namespaceDecl.name ); - resultHasExternalModuleIndicator = true; + if (isSourceFile(input.parent)) { + resultHasExternalModuleIndicator = true; + } resultHasScopeMarker = true; return [cleanDeclaration, namespaceDeclaration, exportDefaultDeclaration]; @@ -1099,10 +1117,32 @@ namespace ts { needsDeclare = false; const inner = input.body; if (inner && inner.kind === SyntaxKind.ModuleBlock) { + const oldNeedsScopeFix = needsScopeFixMarker; + const oldHasScopeFix = resultHasScopeMarker; + resultHasScopeMarker = false; + needsScopeFixMarker = false; const statements = visitNodes(inner.statements, visitDeclarationStatements); - const body = updateModuleBlock(inner, transformAndReplaceLatePaintedStatements(statements)); + let lateStatements = transformAndReplaceLatePaintedStatements(statements); + if (input.flags & NodeFlags.Ambient) { + needsScopeFixMarker = false; // If it was `declare`'d everything is implicitly exported already, ignore late printed "privates" + } + // With the final list of statements, there are 3 possibilities: + // 1. There's an export assignment or export declaration in the namespace - do nothing + // 2. Everything is exported and there are no export assignments or export declarations - strip all export modifiers + // 3. Some things are exported, some are not, and there's no marker - add an empty marker + if (!isGlobalScopeAugmentation(input) && !hasScopeMarker(lateStatements) && !resultHasScopeMarker) { + if (needsScopeFixMarker) { + lateStatements = createNodeArray([...lateStatements, createEmptyExports()]); + } + else { + lateStatements = visitNodes(lateStatements, stripExportModifiers); + } + } + const body = updateModuleBlock(inner, lateStatements); needsDeclare = previousNeedsDeclare; - const mods = ensureModifiers(input, isPrivate); + needsScopeFixMarker = oldNeedsScopeFix; + resultHasScopeMarker = oldHasScopeFix; + const mods = ensureModifiers(input); return cleanup(updateModuleDeclaration( input, /*decorators*/ undefined, @@ -1113,7 +1153,7 @@ namespace ts { } else { needsDeclare = previousNeedsDeclare; - const mods = ensureModifiers(input, isPrivate); + const mods = ensureModifiers(input); needsDeclare = false; visitNode(inner, visitDeclarationStatements); // eagerly transform nested namespaces (the nesting doesn't need any elision or painting done) @@ -1130,7 +1170,7 @@ namespace ts { } } case SyntaxKind.ClassDeclaration: { - const modifiers = createNodeArray(ensureModifiers(input, isPrivate)); + const modifiers = createNodeArray(ensureModifiers(input)); const typeParameters = ensureTypeParams(input, input.typeParameters); const ctor = getFirstConstructorWithBody(input); let parameterProperties: ReadonlyArray | undefined; @@ -1224,10 +1264,10 @@ namespace ts { } } case SyntaxKind.VariableStatement: { - return cleanup(transformVariableStatement(input, isPrivate)); + return cleanup(transformVariableStatement(input)); } case SyntaxKind.EnumDeclaration: { - return cleanup(updateEnumDeclaration(input, /*decorators*/ undefined, createNodeArray(ensureModifiers(input, isPrivate)), input.name, createNodeArray(mapDefined(input.members, m => { + return cleanup(updateEnumDeclaration(input, /*decorators*/ undefined, createNodeArray(ensureModifiers(input)), input.name, createNodeArray(mapDefined(input.members, m => { if (shouldStripInternal(m)) return; // Rewrite enum values to their constants, if available const constValue = resolver.getConstantValue(m); @@ -1255,11 +1295,11 @@ namespace ts { } } - function transformVariableStatement(input: VariableStatement, privateDeclaration?: boolean) { + function transformVariableStatement(input: VariableStatement) { if (!forEach(input.declarationList.declarations, getBindingNameVisible)) return; const nodes = visitNodes(input.declarationList.declarations, visitDeclarationSubtree); if (!length(nodes)) return; - return updateVariableStatement(input, createNodeArray(ensureModifiers(input, privateDeclaration)), updateVariableDeclarationList(input.declarationList, nodes)); + return updateVariableStatement(input, createNodeArray(ensureModifiers(input)), updateVariableDeclarationList(input.declarationList, nodes)); } function recreateBindingPattern(d: BindingPattern): VariableDeclaration[] { @@ -1306,28 +1346,25 @@ namespace ts { return isExportAssignment(node) || isExportDeclaration(node); } - function hasScopeMarker(node: Node) { - if (isModuleBlock(node)) { - return some(node.statements, isScopeMarker); - } - return false; + function hasScopeMarker(statements: ReadonlyArray) { + return some(statements, isScopeMarker); } - function ensureModifiers(node: Node, privateDeclaration?: boolean): ReadonlyArray | undefined { + function ensureModifiers(node: Node): ReadonlyArray | undefined { const currentFlags = getModifierFlags(node); - const newFlags = ensureModifierFlags(node, privateDeclaration); + const newFlags = ensureModifierFlags(node); if (currentFlags === newFlags) { return node.modifiers; } return createModifiersFromModifierFlags(newFlags); } - function ensureModifierFlags(node: Node, privateDeclaration?: boolean): ModifierFlags { + function ensureModifierFlags(node: Node): ModifierFlags { let mask = ModifierFlags.All ^ (ModifierFlags.Public | ModifierFlags.Async); // No async modifiers in declaration files let additions = (needsDeclare && !isAlwaysType(node)) ? ModifierFlags.Ambient : ModifierFlags.None; const parentIsFile = node.parent.kind === SyntaxKind.SourceFile; if (!parentIsFile || (isBundledEmit && parentIsFile && isExternalModule(node.parent as SourceFile))) { - mask ^= ((privateDeclaration || (isBundledEmit && parentIsFile) || hasScopeMarker(node.parent) ? 0 : ModifierFlags.Export) | ModifierFlags.Ambient); + mask ^= ModifierFlags.Ambient; additions = ModifierFlags.None; } return maskModifierFlags(node, mask, additions); diff --git a/tests/baselines/reference/aliasInaccessibleModule.js b/tests/baselines/reference/aliasInaccessibleModule.js index 66a59a9f0ee..d27cac1f8e7 100644 --- a/tests/baselines/reference/aliasInaccessibleModule.js +++ b/tests/baselines/reference/aliasInaccessibleModule.js @@ -16,4 +16,5 @@ declare module M { module N { } export import X = N; + export {}; } diff --git a/tests/baselines/reference/aliasInaccessibleModule2.js b/tests/baselines/reference/aliasInaccessibleModule2.js index 324581ce622..89b7e66c962 100644 --- a/tests/baselines/reference/aliasInaccessibleModule2.js +++ b/tests/baselines/reference/aliasInaccessibleModule2.js @@ -31,4 +31,5 @@ declare module M { } import R = N; export import X = R; + export {}; } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js index 20d784489d9..60181761533 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorAccessors.js @@ -264,13 +264,13 @@ var m; declare module m { class private1 { } - class public1 { + export class public1 { } module m2 { class public2 { } } - class c { + export class c { readonly foo1: private1; readonly foo2: private1; foo3: private1; @@ -287,4 +287,5 @@ declare module m { foo114: m2.public2; foo115: m2.public2; } + export {}; } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js index 4e1edd7fe39..3fb6308392e 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorParameterOfFunction.js @@ -111,16 +111,17 @@ var m; declare module m { class private1 { } - class public1 { + export class public1 { } - function foo3(param: private1): void; - function foo4(param?: private1): void; - function foo13(param: public1): void; - function foo14(param?: public1): void; + export function foo3(param: private1): void; + export function foo4(param?: private1): void; + export function foo13(param: public1): void; + export function foo14(param?: public1): void; module m2 { class public2 { } } - function foo113(param: m2.public2): void; - function foo114(param?: m2.public2): void; + export function foo113(param: m2.public2): void; + export function foo114(param?: m2.public2): void; + export {}; } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js index 8a2437a2ac4..a4fcbc3d5cb 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorReturnTypeOfFunction.js @@ -129,16 +129,17 @@ var m; declare module m { class private1 { } - class public1 { + export class public1 { } - function foo3(): private1; - function foo4(): private1; - function foo13(): public1; - function foo14(): public1; + export function foo3(): private1; + export function foo4(): private1; + export function foo13(): public1; + export function foo14(): public1; module m2 { class public2 { } } - function foo113(): m2.public2; - function foo114(): m2.public2; + export function foo113(): m2.public2; + export function foo114(): m2.public2; + export {}; } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js index fd39a6e20d9..387e002c251 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeAlias.js @@ -95,11 +95,12 @@ interface Window { } declare module M { type W = Window | string; - module N { + export module N { class Window { } var p: W; } + export {}; } declare module M1 { type W = Window | string; @@ -118,7 +119,8 @@ declare module M2 { class public1 { } } - type t2 = private1; - type t12 = public1; - type t112 = m3.public1; + export type t2 = private1; + export type t12 = public1; + export type t112 = m3.public1; + export {}; } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js index ecb3e035e2a..b3ba6a4ee52 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorTypeLiteral.js @@ -71,7 +71,7 @@ declare module m { class public1 { } } - var x: { + export var x: { x: private1; y: m2.public1; (): m2.public1[]; @@ -79,12 +79,12 @@ declare module m { [n: number]: private1; [s: string]: m2.public1; }; - var x2: { + export var x2: { x: private1; y: m2.public1; method(): private1; }; - var x3: { + export var x3: { (): m2.public1[]; [s: string]: m2.public1; [n: number]: private1; @@ -92,8 +92,9 @@ declare module m { y: m2.public1; method(): private1; }; - var y: (a: private1) => m2.public1; - var y2: (a: private1) => m2.public1; - var z: new (a: private1) => m2.public1; - var z2: new (a: private1) => m2.public1; + export var y: (a: private1) => m2.public1; + export var y2: (a: private1) => m2.public1; + export var z: new (a: private1) => m2.public1; + export var z2: new (a: private1) => m2.public1; + export {}; } diff --git a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js index 6bdcedae7d7..51e1f8db822 100644 --- a/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js +++ b/tests/baselines/reference/declFileTypeAnnotationVisibilityErrorVariableDeclaration.js @@ -72,16 +72,17 @@ var m; declare module m { class private1 { } - class public1 { + export class public1 { } - var k: private1; - var l: private1; - var k2: public1; - var l2: public1; + export var k: private1; + export var l: private1; + export var k2: public1; + export var l2: public1; module m2 { class public2 { } } - var k3: m2.public2; - var l3: m2.public2; + export var k3: m2.public2; + export var l3: m2.public2; + export {}; } diff --git a/tests/baselines/reference/declInput-2.js b/tests/baselines/reference/declInput-2.js index f1f23b7f22e..95800d8a602 100644 --- a/tests/baselines/reference/declInput-2.js +++ b/tests/baselines/reference/declInput-2.js @@ -54,13 +54,13 @@ var M; declare module M { class C { } - class E { + export class E { } - interface I1 { + export interface I1 { } interface I2 { } - class D { + export class D { private c; m1: number; m2: string; @@ -75,4 +75,5 @@ declare module M { m262(i: I2): void; m3(): C; } + export {}; } diff --git a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js b/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js index dc037d7db11..794f14417b9 100644 --- a/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js +++ b/tests/baselines/reference/declarationEmitDestructuringPrivacyError.js @@ -22,5 +22,6 @@ var m; declare module m { class c { } - var x: number, y: c, z: number; + export var x: number, y: c, z: number; + export {}; } diff --git a/tests/baselines/reference/declarationEmitExpressionInExtends5.js b/tests/baselines/reference/declarationEmitExpressionInExtends5.js index 03fd1c9ea11..f19d0c8862c 100644 --- a/tests/baselines/reference/declarationEmitExpressionInExtends5.js +++ b/tests/baselines/reference/declarationEmitExpressionInExtends5.js @@ -59,12 +59,13 @@ var Test; //// [declarationEmitExpressionInExtends5.d.ts] declare namespace Test { - interface IFace { + export interface IFace { } - class SomeClass implements IFace { + export class SomeClass implements IFace { } const Derived_base: new () => IFace; - class Derived extends Derived_base { + export class Derived extends Derived_base { } - function getClass(): new () => T; + export function getClass(): new () => T; + export {}; } diff --git a/tests/baselines/reference/declarationFunctionTypeNonlocalShouldNotBeAnError.js b/tests/baselines/reference/declarationFunctionTypeNonlocalShouldNotBeAnError.js index 88343a7d08e..a51f4f14593 100644 --- a/tests/baselines/reference/declarationFunctionTypeNonlocalShouldNotBeAnError.js +++ b/tests/baselines/reference/declarationFunctionTypeNonlocalShouldNotBeAnError.js @@ -21,7 +21,8 @@ var foo; //// [declarationFunctionTypeNonlocalShouldNotBeAnError.d.ts] declare namespace foo { function bar(): void; - const obj: { + export const obj: { bar: typeof bar; }; + export {}; } diff --git a/tests/baselines/reference/exportNamespaceDeclarationRetainsVisibility.js b/tests/baselines/reference/exportNamespaceDeclarationRetainsVisibility.js new file mode 100644 index 00000000000..2f68257c25c --- /dev/null +++ b/tests/baselines/reference/exportNamespaceDeclarationRetainsVisibility.js @@ -0,0 +1,32 @@ +//// [exportNamespaceDeclarationRetainsVisibility.ts] +namespace X { + interface A { + kind: 'a'; + } + + interface B { + kind: 'b'; + } + + export type C = A | B; +} + +export = X; + +//// [exportNamespaceDeclarationRetainsVisibility.js] +"use strict"; +exports.__esModule = true; + + +//// [exportNamespaceDeclarationRetainsVisibility.d.ts] +declare namespace X { + interface A { + kind: 'a'; + } + interface B { + kind: 'b'; + } + export type C = A | B; + export {}; +} +export = X; diff --git a/tests/baselines/reference/exportNamespaceDeclarationRetainsVisibility.symbols b/tests/baselines/reference/exportNamespaceDeclarationRetainsVisibility.symbols new file mode 100644 index 00000000000..af62dd23d5d --- /dev/null +++ b/tests/baselines/reference/exportNamespaceDeclarationRetainsVisibility.symbols @@ -0,0 +1,27 @@ +=== tests/cases/compiler/exportNamespaceDeclarationRetainsVisibility.ts === +namespace X { +>X : Symbol(X, Decl(exportNamespaceDeclarationRetainsVisibility.ts, 0, 0)) + + interface A { +>A : Symbol(A, Decl(exportNamespaceDeclarationRetainsVisibility.ts, 0, 13)) + + kind: 'a'; +>kind : Symbol(A.kind, Decl(exportNamespaceDeclarationRetainsVisibility.ts, 1, 17)) + } + + interface B { +>B : Symbol(B, Decl(exportNamespaceDeclarationRetainsVisibility.ts, 3, 5)) + + kind: 'b'; +>kind : Symbol(B.kind, Decl(exportNamespaceDeclarationRetainsVisibility.ts, 5, 17)) + } + + export type C = A | B; +>C : Symbol(C, Decl(exportNamespaceDeclarationRetainsVisibility.ts, 7, 5)) +>A : Symbol(A, Decl(exportNamespaceDeclarationRetainsVisibility.ts, 0, 13)) +>B : Symbol(B, Decl(exportNamespaceDeclarationRetainsVisibility.ts, 3, 5)) +} + +export = X; +>X : Symbol(X, Decl(exportNamespaceDeclarationRetainsVisibility.ts, 0, 0)) + diff --git a/tests/baselines/reference/exportNamespaceDeclarationRetainsVisibility.types b/tests/baselines/reference/exportNamespaceDeclarationRetainsVisibility.types new file mode 100644 index 00000000000..69422a8458c --- /dev/null +++ b/tests/baselines/reference/exportNamespaceDeclarationRetainsVisibility.types @@ -0,0 +1,19 @@ +=== tests/cases/compiler/exportNamespaceDeclarationRetainsVisibility.ts === +namespace X { + interface A { + kind: 'a'; +>kind : "a" + } + + interface B { + kind: 'b'; +>kind : "b" + } + + export type C = A | B; +>C : C +} + +export = X; +>X : any + diff --git a/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline b/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline index 7ad60f361bb..580bd65b66a 100644 --- a/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline +++ b/tests/baselines/reference/getEmitOutputWithEmitterErrors.baseline @@ -15,6 +15,7 @@ FileName : /tests/cases/fourslash/inputFile.d.ts declare module M { class C { } - var foo: C; + export var foo: C; + export {}; } diff --git a/tests/baselines/reference/privacyAccessorDeclFile.js b/tests/baselines/reference/privacyAccessorDeclFile.js index 8a3a7b2d2de..a7eb6296f5c 100644 --- a/tests/baselines/reference/privacyAccessorDeclFile.js +++ b/tests/baselines/reference/privacyAccessorDeclFile.js @@ -3606,9 +3606,9 @@ export declare class publicClassWithPrivateModuleSetAccessorTypes { export declare module publicModule { class privateClass { } - class publicClass { + export class publicClass { } - class publicClassWithWithPrivateGetAccessorTypes { + export class publicClassWithWithPrivateGetAccessorTypes { static readonly myPublicStaticMethod: privateClass; private static readonly myPrivateStaticMethod; readonly myPublicMethod: privateClass; @@ -3618,7 +3618,7 @@ export declare module publicModule { readonly myPublicMethod1: privateClass; private readonly myPrivateMethod1; } - class publicClassWithWithPublicGetAccessorTypes { + export class publicClassWithWithPublicGetAccessorTypes { static readonly myPublicStaticMethod: publicClass; private static readonly myPrivateStaticMethod; readonly myPublicMethod: publicClass; @@ -3628,35 +3628,36 @@ export declare module publicModule { readonly myPublicMethod1: publicClass; private readonly myPrivateMethod1; } - class publicClassWithWithPrivateSetAccessorTypes { + export class publicClassWithWithPrivateSetAccessorTypes { static myPublicStaticMethod: privateClass; private static myPrivateStaticMethod; myPublicMethod: privateClass; private myPrivateMethod; } - class publicClassWithWithPublicSetAccessorTypes { + export class publicClassWithWithPublicSetAccessorTypes { static myPublicStaticMethod: publicClass; private static myPrivateStaticMethod; myPublicMethod: publicClass; private myPrivateMethod; } - class publicClassWithPrivateModuleGetAccessorTypes { + export class publicClassWithPrivateModuleGetAccessorTypes { static readonly myPublicStaticMethod: privateModule.publicClass; readonly myPublicMethod: privateModule.publicClass; static readonly myPublicStaticMethod1: privateModule.publicClass; readonly myPublicMethod1: privateModule.publicClass; } - class publicClassWithPrivateModuleSetAccessorTypes { + export class publicClassWithPrivateModuleSetAccessorTypes { static myPublicStaticMethod: privateModule.publicClass; myPublicMethod: privateModule.publicClass; } + export {}; } declare module privateModule { class privateClass { } - class publicClass { + export class publicClass { } - class publicClassWithWithPrivateGetAccessorTypes { + export class publicClassWithWithPrivateGetAccessorTypes { static readonly myPublicStaticMethod: privateClass; private static readonly myPrivateStaticMethod; readonly myPublicMethod: privateClass; @@ -3666,7 +3667,7 @@ declare module privateModule { readonly myPublicMethod1: privateClass; private readonly myPrivateMethod1; } - class publicClassWithWithPublicGetAccessorTypes { + export class publicClassWithWithPublicGetAccessorTypes { static readonly myPublicStaticMethod: publicClass; private static readonly myPrivateStaticMethod; readonly myPublicMethod: publicClass; @@ -3676,28 +3677,29 @@ declare module privateModule { readonly myPublicMethod1: publicClass; private readonly myPrivateMethod1; } - class publicClassWithWithPrivateSetAccessorTypes { + export class publicClassWithWithPrivateSetAccessorTypes { static myPublicStaticMethod: privateClass; private static myPrivateStaticMethod; myPublicMethod: privateClass; private myPrivateMethod; } - class publicClassWithWithPublicSetAccessorTypes { + export class publicClassWithWithPublicSetAccessorTypes { static myPublicStaticMethod: publicClass; private static myPrivateStaticMethod; myPublicMethod: publicClass; private myPrivateMethod; } - class publicClassWithPrivateModuleGetAccessorTypes { + export class publicClassWithPrivateModuleGetAccessorTypes { static readonly myPublicStaticMethod: privateModule.publicClass; readonly myPublicMethod: privateModule.publicClass; static readonly myPublicStaticMethod1: publicClass; readonly myPublicMethod1: publicClass; } - class publicClassWithPrivateModuleSetAccessorTypes { + export class publicClassWithPrivateModuleSetAccessorTypes { static myPublicStaticMethod: privateModule.publicClass; myPublicMethod: privateModule.publicClass; } + export {}; } export {}; //// [privacyAccessorDeclFile_GlobalFile.d.ts] @@ -3722,14 +3724,14 @@ declare class publicClassInGlobalWithWithPublicSetAccessorTypes { declare module publicModuleInGlobal { class privateClass { } - class publicClass { + export class publicClass { } module privateModule { class privateClass { } - class publicClass { + export class publicClass { } - class publicClassWithWithPrivateGetAccessorTypes { + export class publicClassWithWithPrivateGetAccessorTypes { static readonly myPublicStaticMethod: privateClass; private static readonly myPrivateStaticMethod; readonly myPublicMethod: privateClass; @@ -3739,7 +3741,7 @@ declare module publicModuleInGlobal { readonly myPublicMethod1: privateClass; private readonly myPrivateMethod1; } - class publicClassWithWithPublicGetAccessorTypes { + export class publicClassWithWithPublicGetAccessorTypes { static readonly myPublicStaticMethod: publicClass; private static readonly myPrivateStaticMethod; readonly myPublicMethod: publicClass; @@ -3749,30 +3751,31 @@ declare module publicModuleInGlobal { readonly myPublicMethod1: publicClass; private readonly myPrivateMethod1; } - class publicClassWithWithPrivateSetAccessorTypes { + export class publicClassWithWithPrivateSetAccessorTypes { static myPublicStaticMethod: privateClass; private static myPrivateStaticMethod; myPublicMethod: privateClass; private myPrivateMethod; } - class publicClassWithWithPublicSetAccessorTypes { + export class publicClassWithWithPublicSetAccessorTypes { static myPublicStaticMethod: publicClass; private static myPrivateStaticMethod; myPublicMethod: publicClass; private myPrivateMethod; } - class publicClassWithPrivateModuleGetAccessorTypes { + export class publicClassWithPrivateModuleGetAccessorTypes { static readonly myPublicStaticMethod: privateModule.publicClass; readonly myPublicMethod: privateModule.publicClass; static readonly myPublicStaticMethod1: publicClass; readonly myPublicMethod1: publicClass; } - class publicClassWithPrivateModuleSetAccessorTypes { + export class publicClassWithPrivateModuleSetAccessorTypes { static myPublicStaticMethod: privateModule.publicClass; myPublicMethod: privateModule.publicClass; } + export {}; } - class publicClassWithWithPrivateGetAccessorTypes { + export class publicClassWithWithPrivateGetAccessorTypes { static readonly myPublicStaticMethod: privateClass; private static readonly myPrivateStaticMethod; readonly myPublicMethod: privateClass; @@ -3782,7 +3785,7 @@ declare module publicModuleInGlobal { readonly myPublicMethod1: privateClass; private readonly myPrivateMethod1; } - class publicClassWithWithPublicGetAccessorTypes { + export class publicClassWithWithPublicGetAccessorTypes { static readonly myPublicStaticMethod: publicClass; private static readonly myPrivateStaticMethod; readonly myPublicMethod: publicClass; @@ -3792,26 +3795,27 @@ declare module publicModuleInGlobal { readonly myPublicMethod1: publicClass; private readonly myPrivateMethod1; } - class publicClassWithWithPrivateSetAccessorTypes { + export class publicClassWithWithPrivateSetAccessorTypes { static myPublicStaticMethod: privateClass; private static myPrivateStaticMethod; myPublicMethod: privateClass; private myPrivateMethod; } - class publicClassWithWithPublicSetAccessorTypes { + export class publicClassWithWithPublicSetAccessorTypes { static myPublicStaticMethod: publicClass; private static myPrivateStaticMethod; myPublicMethod: publicClass; private myPrivateMethod; } - class publicClassWithPrivateModuleGetAccessorTypes { + export class publicClassWithPrivateModuleGetAccessorTypes { static readonly myPublicStaticMethod: privateModule.publicClass; readonly myPublicMethod: privateModule.publicClass; static readonly myPublicStaticMethod1: privateModule.publicClass; readonly myPublicMethod1: privateModule.publicClass; } - class publicClassWithPrivateModuleSetAccessorTypes { + export class publicClassWithPrivateModuleSetAccessorTypes { static myPublicStaticMethod: privateModule.publicClass; myPublicMethod: privateModule.publicClass; } + export {}; } diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.js b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.js index ae3e7f350b0..68647309469 100644 --- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.js +++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleError.js @@ -22,5 +22,6 @@ declare module Outer { module Inner { var m: typeof Inner; } - var f: typeof Inner; + export var f: typeof Inner; + export {}; } diff --git a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js index 4a3a1bb08bc..7c84bb003b8 100644 --- a/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js +++ b/tests/baselines/reference/privacyCheckTypeOfInvisibleModuleNoError.js @@ -22,5 +22,6 @@ declare module Outer { module Inner { var m: number; } - var f: typeof Inner; + export var f: typeof Inner; + export {}; } diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js index f761fe3ae4d..b07f94ea376 100644 --- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js +++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.js @@ -368,30 +368,32 @@ var publicClassExtendingPublicClassInGlobal = /** @class */ (function (_super) { //// [privacyClassExtendsClauseDeclFile_externalModule.d.ts] export declare module publicModule { - class publicClassInPublicModule { + export class publicClassInPublicModule { private f1; } class privateClassInPublicModule { } - class publicClassExtendingPublicClassInModule extends publicClassInPublicModule { + export class publicClassExtendingPublicClassInModule extends publicClassInPublicModule { } - class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { + export class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { } - class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { + export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { } + export {}; } declare module privateModule { - class publicClassInPrivateModule { + export class publicClassInPrivateModule { private f1; } class privateClassInPrivateModule { } - class publicClassExtendingPublicClassInModule extends publicClassInPrivateModule { + export class publicClassExtendingPublicClassInModule extends publicClassInPrivateModule { } - class publicClassExtendingPrivateClassInModule extends privateClassInPrivateModule { + export class publicClassExtendingPrivateClassInModule extends privateClassInPrivateModule { } - class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { + export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { } + export {}; } export declare class publicClass { private f1; @@ -407,15 +409,16 @@ export declare class publicClassExtendingFromPrivateModuleClass extends privateM export {}; //// [privacyClassExtendsClauseDeclFile_GlobalFile.d.ts] declare module publicModuleInGlobal { - class publicClassInPublicModule { + export class publicClassInPublicModule { private f1; } class privateClassInPublicModule { } - class publicClassExtendingPublicClassInModule extends publicClassInPublicModule { + export class publicClassExtendingPublicClassInModule extends publicClassInPublicModule { } - class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { + export class publicClassExtendingPrivateClassInModule extends privateClassInPublicModule { } + export {}; } declare class publicClassInGlobal { } diff --git a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js index 615a03fe07d..988210f57f2 100644 --- a/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js +++ b/tests/baselines/reference/privacyClassImplementsClauseDeclFile.js @@ -242,30 +242,32 @@ var publicClassImplementingPublicInterfaceInGlobal = /** @class */ (function () //// [privacyClassImplementsClauseDeclFile_externalModule.d.ts] export declare module publicModule { - interface publicInterfaceInPublicModule { + export interface publicInterfaceInPublicModule { } interface privateInterfaceInPublicModule { } - class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule { + export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule { } - class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { + export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { } - class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { + export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { } - class publicClassImplementingPrivateAndPublicInterface implements privateInterfaceInPublicModule, publicInterfaceInPublicModule { + export class publicClassImplementingPrivateAndPublicInterface implements privateInterfaceInPublicModule, publicInterfaceInPublicModule { } + export {}; } declare module privateModule { - interface publicInterfaceInPrivateModule { + export interface publicInterfaceInPrivateModule { } interface privateInterfaceInPrivateModule { } - class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPrivateModule { + export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPrivateModule { } - class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPrivateModule { + export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPrivateModule { } - class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { + export class publicClassImplementingFromPrivateModuleInterface implements privateModule.publicInterfaceInPrivateModule { } + export {}; } export interface publicInterface { } @@ -280,14 +282,15 @@ export declare class publicClassImplementingFromPrivateModuleInterface implement export {}; //// [privacyClassImplementsClauseDeclFile_GlobalFile.d.ts] declare module publicModuleInGlobal { - interface publicInterfaceInPublicModule { + export interface publicInterfaceInPublicModule { } interface privateInterfaceInPublicModule { } - class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule { + export class publicClassImplementingPublicInterfaceInModule implements publicInterfaceInPublicModule { } - class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { + export class publicClassImplementingPrivateInterfaceInModule implements privateInterfaceInPublicModule { } + export {}; } interface publicInterfaceInGlobal { } diff --git a/tests/baselines/reference/privacyFunctionParameterDeclFile.js b/tests/baselines/reference/privacyFunctionParameterDeclFile.js index e287ef7c3d5..3ba73184890 100644 --- a/tests/baselines/reference/privacyFunctionParameterDeclFile.js +++ b/tests/baselines/reference/privacyFunctionParameterDeclFile.js @@ -1334,19 +1334,19 @@ export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(par export declare module publicModule { class privateClass { } - class publicClass { + export class publicClass { } - interface publicInterfaceWithPrivateParmeterTypes { + export interface publicInterfaceWithPrivateParmeterTypes { new (param: privateClass): publicClass; (param: privateClass): publicClass; myMethod(param: privateClass): void; } - interface publicInterfaceWithPublicParmeterTypes { + export interface publicInterfaceWithPublicParmeterTypes { new (param: publicClass): publicClass; (param: publicClass): publicClass; myMethod(param: publicClass): void; } - class publicClassWithWithPrivateParmeterTypes { + export class publicClassWithWithPrivateParmeterTypes { private param1; param2: privateClass; static myPublicStaticMethod(param: privateClass): void; @@ -1355,7 +1355,7 @@ export declare module publicModule { private myPrivateMethod; constructor(param: privateClass, param1: privateClass, param2: privateClass); } - class publicClassWithWithPublicParmeterTypes { + export class publicClassWithWithPublicParmeterTypes { private param1; param2: publicClass; static myPublicStaticMethod(param: publicClass): void; @@ -1364,41 +1364,42 @@ export declare module publicModule { private myPrivateMethod; constructor(param: publicClass, param1: publicClass, param2: publicClass); } - function publicFunctionWithPrivateParmeterTypes(param: privateClass): void; - function publicFunctionWithPublicParmeterTypes(param: publicClass): void; - function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; - function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; - interface publicInterfaceWithPrivateModuleParameterTypes { + export function publicFunctionWithPrivateParmeterTypes(param: privateClass): void; + export function publicFunctionWithPublicParmeterTypes(param: publicClass): void; + export function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + export function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + export interface publicInterfaceWithPrivateModuleParameterTypes { new (param: privateModule.publicClass): publicClass; (param: privateModule.publicClass): publicClass; myMethod(param: privateModule.publicClass): void; } - class publicClassWithPrivateModuleParameterTypes { + export class publicClassWithPrivateModuleParameterTypes { private param1; param2: privateModule.publicClass; static myPublicStaticMethod(param: privateModule.publicClass): void; myPublicMethod(param: privateModule.publicClass): void; constructor(param: privateModule.publicClass, param1: privateModule.publicClass, param2: privateModule.publicClass); } - function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; - function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + export function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + export {}; } declare module privateModule { class privateClass { } - class publicClass { + export class publicClass { } - interface publicInterfaceWithPrivateParmeterTypes { + export interface publicInterfaceWithPrivateParmeterTypes { new (param: privateClass): publicClass; (param: privateClass): publicClass; myMethod(param: privateClass): void; } - interface publicInterfaceWithPublicParmeterTypes { + export interface publicInterfaceWithPublicParmeterTypes { new (param: publicClass): publicClass; (param: publicClass): publicClass; myMethod(param: publicClass): void; } - class publicClassWithWithPrivateParmeterTypes { + export class publicClassWithWithPrivateParmeterTypes { private param1; param2: privateClass; static myPublicStaticMethod(param: privateClass): void; @@ -1407,7 +1408,7 @@ declare module privateModule { private myPrivateMethod; constructor(param: privateClass, param1: privateClass, param2: privateClass); } - class publicClassWithWithPublicParmeterTypes { + export class publicClassWithWithPublicParmeterTypes { private param1; param2: publicClass; static myPublicStaticMethod(param: publicClass): void; @@ -1416,24 +1417,25 @@ declare module privateModule { private myPrivateMethod; constructor(param: publicClass, param1: publicClass, param2: publicClass); } - function publicFunctionWithPrivateParmeterTypes(param: privateClass): void; - function publicFunctionWithPublicParmeterTypes(param: publicClass): void; - function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; - function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; - interface publicInterfaceWithPrivateModuleParameterTypes { + export function publicFunctionWithPrivateParmeterTypes(param: privateClass): void; + export function publicFunctionWithPublicParmeterTypes(param: publicClass): void; + export function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + export function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + export interface publicInterfaceWithPrivateModuleParameterTypes { new (param: privateModule.publicClass): publicClass; (param: privateModule.publicClass): publicClass; myMethod(param: privateModule.publicClass): void; } - class publicClassWithPrivateModuleParameterTypes { + export class publicClassWithPrivateModuleParameterTypes { private param1; param2: privateModule.publicClass; static myPublicStaticMethod(param: privateModule.publicClass): void; myPublicMethod(param: privateModule.publicClass): void; constructor(param: privateModule.publicClass, param1: privateModule.publicClass, param2: privateModule.publicClass); } - function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; - function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + export function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + export {}; } export {}; //// [privacyFunctionParameterDeclFile_GlobalFile.d.ts] @@ -1458,24 +1460,24 @@ declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(param: pub declare module publicModuleInGlobal { class privateClass { } - class publicClass { + export class publicClass { } module privateModule { class privateClass { } - class publicClass { + export class publicClass { } - interface publicInterfaceWithPrivateParmeterTypes { + export interface publicInterfaceWithPrivateParmeterTypes { new (param: privateClass): publicClass; (param: privateClass): publicClass; myMethod(param: privateClass): void; } - interface publicInterfaceWithPublicParmeterTypes { + export interface publicInterfaceWithPublicParmeterTypes { new (param: publicClass): publicClass; (param: publicClass): publicClass; myMethod(param: publicClass): void; } - class publicClassWithWithPrivateParmeterTypes { + export class publicClassWithWithPrivateParmeterTypes { private param1; param2: privateClass; static myPublicStaticMethod(param: privateClass): void; @@ -1484,7 +1486,7 @@ declare module publicModuleInGlobal { private myPrivateMethod; constructor(param: privateClass, param1: privateClass, param2: privateClass); } - class publicClassWithWithPublicParmeterTypes { + export class publicClassWithWithPublicParmeterTypes { private param1; param2: publicClass; static myPublicStaticMethod(param: publicClass): void; @@ -1493,36 +1495,37 @@ declare module publicModuleInGlobal { private myPrivateMethod; constructor(param: publicClass, param1: publicClass, param2: publicClass); } - function publicFunctionWithPrivateParmeterTypes(param: privateClass): void; - function publicFunctionWithPublicParmeterTypes(param: publicClass): void; - function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; - function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; - interface publicInterfaceWithPrivateModuleParameterTypes { + export function publicFunctionWithPrivateParmeterTypes(param: privateClass): void; + export function publicFunctionWithPublicParmeterTypes(param: publicClass): void; + export function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + export function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + export interface publicInterfaceWithPrivateModuleParameterTypes { new (param: privateModule.publicClass): publicClass; (param: privateModule.publicClass): publicClass; myMethod(param: privateModule.publicClass): void; } - class publicClassWithPrivateModuleParameterTypes { + export class publicClassWithPrivateModuleParameterTypes { private param1; param2: privateModule.publicClass; static myPublicStaticMethod(param: privateModule.publicClass): void; myPublicMethod(param: privateModule.publicClass): void; constructor(param: privateModule.publicClass, param1: privateModule.publicClass, param2: privateModule.publicClass); } - function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; - function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + export function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + export {}; } - interface publicInterfaceWithPrivateParmeterTypes { + export interface publicInterfaceWithPrivateParmeterTypes { new (param: privateClass): publicClass; (param: privateClass): publicClass; myMethod(param: privateClass): void; } - interface publicInterfaceWithPublicParmeterTypes { + export interface publicInterfaceWithPublicParmeterTypes { new (param: publicClass): publicClass; (param: publicClass): publicClass; myMethod(param: publicClass): void; } - class publicClassWithWithPrivateParmeterTypes { + export class publicClassWithWithPrivateParmeterTypes { private param1; param2: privateClass; static myPublicStaticMethod(param: privateClass): void; @@ -1531,7 +1534,7 @@ declare module publicModuleInGlobal { private myPrivateMethod; constructor(param: privateClass, param1: privateClass, param2: privateClass); } - class publicClassWithWithPublicParmeterTypes { + export class publicClassWithWithPublicParmeterTypes { private param1; param2: publicClass; static myPublicStaticMethod(param: publicClass): void; @@ -1540,22 +1543,23 @@ declare module publicModuleInGlobal { private myPrivateMethod; constructor(param: publicClass, param1: publicClass, param2: publicClass); } - function publicFunctionWithPrivateParmeterTypes(param: privateClass): void; - function publicFunctionWithPublicParmeterTypes(param: publicClass): void; - function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; - function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; - interface publicInterfaceWithPrivateModuleParameterTypes { + export function publicFunctionWithPrivateParmeterTypes(param: privateClass): void; + export function publicFunctionWithPublicParmeterTypes(param: publicClass): void; + export function publicAmbientFunctionWithPrivateParmeterTypes(param: privateClass): void; + export function publicAmbientFunctionWithPublicParmeterTypes(param: publicClass): void; + export interface publicInterfaceWithPrivateModuleParameterTypes { new (param: privateModule.publicClass): publicClass; (param: privateModule.publicClass): publicClass; myMethod(param: privateModule.publicClass): void; } - class publicClassWithPrivateModuleParameterTypes { + export class publicClassWithPrivateModuleParameterTypes { private param1; param2: privateModule.publicClass; static myPublicStaticMethod(param: privateModule.publicClass): void; myPublicMethod(param: privateModule.publicClass): void; constructor(param: privateModule.publicClass, param1: privateModule.publicClass, param2: privateModule.publicClass); } - function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; - function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + export function publicFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + export function publicAmbientFunctionWithPrivateModuleParameterTypes(param: privateModule.publicClass): void; + export {}; } diff --git a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js index 79b144d815e..e59e9800ee7 100644 --- a/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js +++ b/tests/baselines/reference/privacyFunctionReturnTypeDeclFile.js @@ -2341,21 +2341,21 @@ export declare function publicAmbientFunctionWithPrivateModuleParameterTypes(): export declare module publicModule { class privateClass { } - class publicClass { + export class publicClass { } - interface publicInterfaceWithPrivateParmeterTypes { + export interface publicInterfaceWithPrivateParmeterTypes { new (): privateClass; (): privateClass; [x: number]: privateClass; myMethod(): privateClass; } - interface publicInterfaceWithPublicParmeterTypes { + export interface publicInterfaceWithPublicParmeterTypes { new (): publicClass; (): publicClass; [x: number]: publicClass; myMethod(): publicClass; } - class publicClassWithWithPrivateParmeterTypes { + export class publicClassWithWithPrivateParmeterTypes { static myPublicStaticMethod(): privateClass; private static myPrivateStaticMethod; myPublicMethod(): privateClass; @@ -2365,7 +2365,7 @@ export declare module publicModule { myPublicMethod1(): privateClass; private myPrivateMethod1; } - class publicClassWithWithPublicParmeterTypes { + export class publicClassWithWithPublicParmeterTypes { static myPublicStaticMethod(): publicClass; private static myPrivateStaticMethod; myPublicMethod(): publicClass; @@ -2375,46 +2375,47 @@ export declare module publicModule { myPublicMethod1(): publicClass; private myPrivateMethod1; } - function publicFunctionWithPrivateParmeterTypes(): privateClass; - function publicFunctionWithPublicParmeterTypes(): publicClass; - function publicFunctionWithPrivateParmeterTypes1(): privateClass; - function publicFunctionWithPublicParmeterTypes1(): publicClass; - function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; - function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; - interface publicInterfaceWithPrivateModuleParameterTypes { + export function publicFunctionWithPrivateParmeterTypes(): privateClass; + export function publicFunctionWithPublicParmeterTypes(): publicClass; + export function publicFunctionWithPrivateParmeterTypes1(): privateClass; + export function publicFunctionWithPublicParmeterTypes1(): publicClass; + export function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; + export function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; + export interface publicInterfaceWithPrivateModuleParameterTypes { new (): privateModule.publicClass; (): privateModule.publicClass; [x: number]: privateModule.publicClass; myMethod(): privateModule.publicClass; } - class publicClassWithPrivateModuleParameterTypes { + export class publicClassWithPrivateModuleParameterTypes { static myPublicStaticMethod(): privateModule.publicClass; myPublicMethod(): privateModule.publicClass; static myPublicStaticMethod1(): privateModule.publicClass; myPublicMethod1(): privateModule.publicClass; } - function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; - function publicFunctionWithPrivateModuleParameterTypes1(): privateModule.publicClass; - function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + export function publicFunctionWithPrivateModuleParameterTypes1(): privateModule.publicClass; + export function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + export {}; } declare module privateModule { class privateClass { } - class publicClass { + export class publicClass { } - interface publicInterfaceWithPrivateParmeterTypes { + export interface publicInterfaceWithPrivateParmeterTypes { new (): privateClass; (): privateClass; [x: number]: privateClass; myMethod(): privateClass; } - interface publicInterfaceWithPublicParmeterTypes { + export interface publicInterfaceWithPublicParmeterTypes { new (): publicClass; (): publicClass; [x: number]: publicClass; myMethod(): publicClass; } - class publicClassWithWithPrivateParmeterTypes { + export class publicClassWithWithPrivateParmeterTypes { static myPublicStaticMethod(): privateClass; private static myPrivateStaticMethod; myPublicMethod(): privateClass; @@ -2424,7 +2425,7 @@ declare module privateModule { myPublicMethod1(): privateClass; private myPrivateMethod1; } - class publicClassWithWithPublicParmeterTypes { + export class publicClassWithWithPublicParmeterTypes { static myPublicStaticMethod(): publicClass; private static myPrivateStaticMethod; myPublicMethod(): publicClass; @@ -2434,27 +2435,28 @@ declare module privateModule { myPublicMethod1(): publicClass; private myPrivateMethod1; } - function publicFunctionWithPrivateParmeterTypes(): privateClass; - function publicFunctionWithPublicParmeterTypes(): publicClass; - function publicFunctionWithPrivateParmeterTypes1(): privateClass; - function publicFunctionWithPublicParmeterTypes1(): publicClass; - function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; - function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; - interface publicInterfaceWithPrivateModuleParameterTypes { + export function publicFunctionWithPrivateParmeterTypes(): privateClass; + export function publicFunctionWithPublicParmeterTypes(): publicClass; + export function publicFunctionWithPrivateParmeterTypes1(): privateClass; + export function publicFunctionWithPublicParmeterTypes1(): publicClass; + export function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; + export function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; + export interface publicInterfaceWithPrivateModuleParameterTypes { new (): privateModule.publicClass; (): privateModule.publicClass; [x: number]: privateModule.publicClass; myMethod(): privateModule.publicClass; } - class publicClassWithPrivateModuleParameterTypes { + export class publicClassWithPrivateModuleParameterTypes { static myPublicStaticMethod(): privateModule.publicClass; myPublicMethod(): privateModule.publicClass; static myPublicStaticMethod1(): publicClass; myPublicMethod1(): publicClass; } - function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; - function publicFunctionWithPrivateModuleParameterTypes1(): publicClass; - function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + export function publicFunctionWithPrivateModuleParameterTypes1(): publicClass; + export function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + export {}; } export {}; //// [privacyFunctionReturnTypeDeclFile_GlobalFile.d.ts] @@ -2482,26 +2484,26 @@ declare function publicAmbientFunctionWithPublicParmeterTypesInGlobal(): publicC declare module publicModuleInGlobal { class privateClass { } - class publicClass { + export class publicClass { } module privateModule { class privateClass { } - class publicClass { + export class publicClass { } - interface publicInterfaceWithPrivateParmeterTypes { + export interface publicInterfaceWithPrivateParmeterTypes { new (): privateClass; (): privateClass; [x: number]: privateClass; myMethod(): privateClass; } - interface publicInterfaceWithPublicParmeterTypes { + export interface publicInterfaceWithPublicParmeterTypes { new (): publicClass; (): publicClass; [x: number]: publicClass; myMethod(): publicClass; } - class publicClassWithWithPrivateParmeterTypes { + export class publicClassWithWithPrivateParmeterTypes { static myPublicStaticMethod(): privateClass; private static myPrivateStaticMethod; myPublicMethod(): privateClass; @@ -2511,7 +2513,7 @@ declare module publicModuleInGlobal { myPublicMethod1(): privateClass; private myPrivateMethod1; } - class publicClassWithWithPublicParmeterTypes { + export class publicClassWithWithPublicParmeterTypes { static myPublicStaticMethod(): publicClass; private static myPrivateStaticMethod; myPublicMethod(): publicClass; @@ -2521,41 +2523,42 @@ declare module publicModuleInGlobal { myPublicMethod1(): publicClass; private myPrivateMethod1; } - function publicFunctionWithPrivateParmeterTypes(): privateClass; - function publicFunctionWithPublicParmeterTypes(): publicClass; - function publicFunctionWithPrivateParmeterTypes1(): privateClass; - function publicFunctionWithPublicParmeterTypes1(): publicClass; - function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; - function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; - interface publicInterfaceWithPrivateModuleParameterTypes { + export function publicFunctionWithPrivateParmeterTypes(): privateClass; + export function publicFunctionWithPublicParmeterTypes(): publicClass; + export function publicFunctionWithPrivateParmeterTypes1(): privateClass; + export function publicFunctionWithPublicParmeterTypes1(): publicClass; + export function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; + export function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; + export interface publicInterfaceWithPrivateModuleParameterTypes { new (): privateModule.publicClass; (): privateModule.publicClass; [x: number]: privateModule.publicClass; myMethod(): privateModule.publicClass; } - class publicClassWithPrivateModuleParameterTypes { + export class publicClassWithPrivateModuleParameterTypes { static myPublicStaticMethod(): privateModule.publicClass; myPublicMethod(): privateModule.publicClass; static myPublicStaticMethod1(): publicClass; myPublicMethod1(): publicClass; } - function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; - function publicFunctionWithPrivateModuleParameterTypes1(): publicClass; - function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + export function publicFunctionWithPrivateModuleParameterTypes1(): publicClass; + export function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + export {}; } - interface publicInterfaceWithPrivateParmeterTypes { + export interface publicInterfaceWithPrivateParmeterTypes { new (): privateClass; (): privateClass; [x: number]: privateClass; myMethod(): privateClass; } - interface publicInterfaceWithPublicParmeterTypes { + export interface publicInterfaceWithPublicParmeterTypes { new (): publicClass; (): publicClass; [x: number]: publicClass; myMethod(): publicClass; } - class publicClassWithWithPrivateParmeterTypes { + export class publicClassWithWithPrivateParmeterTypes { static myPublicStaticMethod(): privateClass; private static myPrivateStaticMethod; myPublicMethod(): privateClass; @@ -2565,7 +2568,7 @@ declare module publicModuleInGlobal { myPublicMethod1(): privateClass; private myPrivateMethod1; } - class publicClassWithWithPublicParmeterTypes { + export class publicClassWithWithPublicParmeterTypes { static myPublicStaticMethod(): publicClass; private static myPrivateStaticMethod; myPublicMethod(): publicClass; @@ -2575,25 +2578,26 @@ declare module publicModuleInGlobal { myPublicMethod1(): publicClass; private myPrivateMethod1; } - function publicFunctionWithPrivateParmeterTypes(): privateClass; - function publicFunctionWithPublicParmeterTypes(): publicClass; - function publicFunctionWithPrivateParmeterTypes1(): privateClass; - function publicFunctionWithPublicParmeterTypes1(): publicClass; - function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; - function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; - interface publicInterfaceWithPrivateModuleParameterTypes { + export function publicFunctionWithPrivateParmeterTypes(): privateClass; + export function publicFunctionWithPublicParmeterTypes(): publicClass; + export function publicFunctionWithPrivateParmeterTypes1(): privateClass; + export function publicFunctionWithPublicParmeterTypes1(): publicClass; + export function publicAmbientFunctionWithPrivateParmeterTypes(): privateClass; + export function publicAmbientFunctionWithPublicParmeterTypes(): publicClass; + export interface publicInterfaceWithPrivateModuleParameterTypes { new (): privateModule.publicClass; (): privateModule.publicClass; [x: number]: privateModule.publicClass; myMethod(): privateModule.publicClass; } - class publicClassWithPrivateModuleParameterTypes { + export class publicClassWithPrivateModuleParameterTypes { static myPublicStaticMethod(): privateModule.publicClass; myPublicMethod(): privateModule.publicClass; static myPublicStaticMethod1(): privateModule.publicClass; myPublicMethod1(): privateModule.publicClass; } - function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; - function publicFunctionWithPrivateModuleParameterTypes1(): privateModule.publicClass; - function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + export function publicFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + export function publicFunctionWithPrivateModuleParameterTypes1(): privateModule.publicClass; + export function publicAmbientFunctionWithPrivateModuleParameterTypes(): privateModule.publicClass; + export {}; } diff --git a/tests/baselines/reference/privacyGloImport.js b/tests/baselines/reference/privacyGloImport.js index 3ca1bf812d3..805f651c026 100644 --- a/tests/baselines/reference/privacyGloImport.js +++ b/tests/baselines/reference/privacyGloImport.js @@ -265,7 +265,7 @@ var m2; //// [privacyGloImport.d.ts] declare module m1 { - module m1_M1_public { + export module m1_M1_public { class c1 { } function f1(): c1; @@ -280,17 +280,18 @@ declare module m1 { var v2: c1; } import m1_im1_private = m1_M1_public; - var m1_im1_private_v1_public: typeof m1_im1_private.c1; - var m1_im1_private_v2_public: m1_im1_private.c1; - var m1_im1_private_v3_public: typeof m1_im1_private.f1; - var m1_im1_private_v4_public: m1_im1_private.c1; + export var m1_im1_private_v1_public: typeof m1_im1_private.c1; + export var m1_im1_private_v2_public: m1_im1_private.c1; + export var m1_im1_private_v3_public: typeof m1_im1_private.f1; + export var m1_im1_private_v4_public: m1_im1_private.c1; import m1_im2_private = m1_M2_private; - var m1_im2_private_v1_public: typeof m1_im2_private.c1; - var m1_im2_private_v2_public: m1_im2_private.c1; - var m1_im2_private_v3_public: typeof m1_im2_private.f1; - var m1_im2_private_v4_public: m1_im2_private.c1; + export var m1_im2_private_v1_public: typeof m1_im2_private.c1; + export var m1_im2_private_v2_public: m1_im2_private.c1; + export var m1_im2_private_v3_public: typeof m1_im2_private.f1; + export var m1_im2_private_v4_public: m1_im2_private.c1; export import m1_im1_public = m1_M1_public; export import m1_im2_public = m1_M2_private; + export {}; } declare module glo_M1_public { class c1 { diff --git a/tests/baselines/reference/privacyGloImportParseErrors.js b/tests/baselines/reference/privacyGloImportParseErrors.js index bdf8025a5ed..d41b0b897e7 100644 --- a/tests/baselines/reference/privacyGloImportParseErrors.js +++ b/tests/baselines/reference/privacyGloImportParseErrors.js @@ -245,7 +245,7 @@ var m2; //// [privacyGloImportParseErrors.d.ts] declare module m1 { - module m1_M1_public { + export module m1_M1_public { class c1 { } function f1(): c1; @@ -259,7 +259,7 @@ declare module m1 { var v1: typeof c1; var v2: c1; } - module "m1_M3_public" { + export module "m1_M3_public" { function f1(): any; class c1 { } @@ -269,27 +269,28 @@ declare module m1 { var v2: c1; } import m1_im1_private = m1_M1_public; - var m1_im1_private_v1_public: typeof m1_im1_private.c1; - var m1_im1_private_v2_public: m1_im1_private.c1; - var m1_im1_private_v3_public: typeof m1_im1_private.f1; - var m1_im1_private_v4_public: m1_im1_private.c1; + export var m1_im1_private_v1_public: typeof m1_im1_private.c1; + export var m1_im1_private_v2_public: m1_im1_private.c1; + export var m1_im1_private_v3_public: typeof m1_im1_private.f1; + export var m1_im1_private_v4_public: m1_im1_private.c1; import m1_im2_private = m1_M2_private; - var m1_im2_private_v1_public: typeof m1_im2_private.c1; - var m1_im2_private_v2_public: m1_im2_private.c1; - var m1_im2_private_v3_public: typeof m1_im2_private.f1; - var m1_im2_private_v4_public: m1_im2_private.c1; - var m1_im3_private_v1_public: any; - var m1_im3_private_v2_public: any; - var m1_im3_private_v3_public: any; - var m1_im3_private_v4_public: any; - var m1_im4_private_v1_public: any; - var m1_im4_private_v2_public: any; - var m1_im4_private_v3_public: any; - var m1_im4_private_v4_public: any; + export var m1_im2_private_v1_public: typeof m1_im2_private.c1; + export var m1_im2_private_v2_public: m1_im2_private.c1; + export var m1_im2_private_v3_public: typeof m1_im2_private.f1; + export var m1_im2_private_v4_public: m1_im2_private.c1; + export var m1_im3_private_v1_public: any; + export var m1_im3_private_v2_public: any; + export var m1_im3_private_v3_public: any; + export var m1_im3_private_v4_public: any; + export var m1_im4_private_v1_public: any; + export var m1_im4_private_v2_public: any; + export var m1_im4_private_v3_public: any; + export var m1_im4_private_v4_public: any; export import m1_im1_public = m1_M1_public; export import m1_im2_public = m1_M2_private; export import m1_im3_public = require("m1_M3_public"); export import m1_im4_public = require("m1_M4_private"); + export {}; } declare module glo_M1_public { class c1 { diff --git a/tests/baselines/reference/privacyImport.js b/tests/baselines/reference/privacyImport.js index 0915fc9983b..f15833a079b 100644 --- a/tests/baselines/reference/privacyImport.js +++ b/tests/baselines/reference/privacyImport.js @@ -706,7 +706,7 @@ var m3; //// [privacyImport.d.ts] export declare module m1 { - module m1_M1_public { + export module m1_M1_public { class c1 { } function f1(): c1; @@ -721,17 +721,18 @@ export declare module m1 { var v2: c1; } import m1_im1_private = m1_M1_public; - var m1_im1_private_v1_public: typeof m1_im1_private.c1; - var m1_im1_private_v2_public: m1_im1_private.c1; - var m1_im1_private_v3_public: typeof m1_im1_private.f1; - var m1_im1_private_v4_public: m1_im1_private.c1; + export var m1_im1_private_v1_public: typeof m1_im1_private.c1; + export var m1_im1_private_v2_public: m1_im1_private.c1; + export var m1_im1_private_v3_public: typeof m1_im1_private.f1; + export var m1_im1_private_v4_public: m1_im1_private.c1; import m1_im2_private = m1_M2_private; - var m1_im2_private_v1_public: typeof m1_im2_private.c1; - var m1_im2_private_v2_public: m1_im2_private.c1; - var m1_im2_private_v3_public: typeof m1_im2_private.f1; - var m1_im2_private_v4_public: m1_im2_private.c1; + export var m1_im2_private_v1_public: typeof m1_im2_private.c1; + export var m1_im2_private_v2_public: m1_im2_private.c1; + export var m1_im2_private_v3_public: typeof m1_im2_private.f1; + export var m1_im2_private_v4_public: m1_im2_private.c1; export import m1_im1_public = m1_M1_public; export import m1_im2_public = m1_M2_private; + export {}; } export declare module glo_M1_public { class c1 { diff --git a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js index f6d0278e0bd..6f9d8036e7f 100644 --- a/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js +++ b/tests/baselines/reference/privacyInterfaceExtendsClauseDeclFile.js @@ -101,30 +101,32 @@ exports.__esModule = true; //// [privacyInterfaceExtendsClauseDeclFile_externalModule.d.ts] export declare module publicModule { - interface publicInterfaceInPublicModule { + export interface publicInterfaceInPublicModule { } interface privateInterfaceInPublicModule { } - interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule { + export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule { } - interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { + export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { } - interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { + export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { } - interface publicInterfaceImplementingPrivateAndPublicInterface extends privateInterfaceInPublicModule, publicInterfaceInPublicModule { + export interface publicInterfaceImplementingPrivateAndPublicInterface extends privateInterfaceInPublicModule, publicInterfaceInPublicModule { } + export {}; } declare module privateModule { - interface publicInterfaceInPrivateModule { + export interface publicInterfaceInPrivateModule { } interface privateInterfaceInPrivateModule { } - interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPrivateModule { + export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPrivateModule { } - interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPrivateModule { + export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPrivateModule { } - interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { + export interface publicInterfaceImplementingFromPrivateModuleInterface extends privateModule.publicInterfaceInPrivateModule { } + export {}; } export interface publicInterface { } @@ -139,14 +141,15 @@ export interface publicInterfaceImplementingFromPrivateModuleInterface extends p export {}; //// [privacyInterfaceExtendsClauseDeclFile_GlobalFile.d.ts] declare module publicModuleInGlobal { - interface publicInterfaceInPublicModule { + export interface publicInterfaceInPublicModule { } interface privateInterfaceInPublicModule { } - interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule { + export interface publicInterfaceImplementingPublicInterfaceInModule extends publicInterfaceInPublicModule { } - interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { + export interface publicInterfaceImplementingPrivateInterfaceInModule extends privateInterfaceInPublicModule { } + export {}; } interface publicInterfaceInGlobal { } diff --git a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js index 32425e9d9a4..bb541a48007 100644 --- a/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js +++ b/tests/baselines/reference/privacyTypeParameterOfFunctionDeclFile.js @@ -872,95 +872,97 @@ export declare function publicFunctionWithPrivateMopduleTypeParameters(): privateClass; (): privateClass; myMethod(): privateClass; } - interface publicInterfaceWithPublicTypeParameters { + export interface publicInterfaceWithPublicTypeParameters { new (): publicClass; (): publicClass; myMethod(): publicClass; } - class publicClassWithWithPrivateTypeParameters { + export class publicClassWithWithPrivateTypeParameters { static myPublicStaticMethod(): void; private static myPrivateStaticMethod; myPublicMethod(): void; private myPrivateMethod; } - class publicClassWithWithPublicTypeParameters { + export class publicClassWithWithPublicTypeParameters { static myPublicStaticMethod(): void; private static myPrivateStaticMethod; myPublicMethod(): void; private myPrivateMethod; } - function publicFunctionWithPrivateTypeParameters(): void; - function publicFunctionWithPublicTypeParameters(): void; - interface publicInterfaceWithPublicTypeParametersWithoutExtends { + export function publicFunctionWithPrivateTypeParameters(): void; + export function publicFunctionWithPublicTypeParameters(): void; + export interface publicInterfaceWithPublicTypeParametersWithoutExtends { new (): publicClass; (): publicClass; myMethod(): publicClass; } - class publicClassWithWithPublicTypeParametersWithoutExtends { + export class publicClassWithWithPublicTypeParametersWithoutExtends { static myPublicStaticMethod(): void; private static myPrivateStaticMethod; myPublicMethod(): void; private myPrivateMethod; } - function publicFunctionWithPublicTypeParametersWithoutExtends(): void; - interface publicInterfaceWithPrivatModuleTypeParameters { + export function publicFunctionWithPublicTypeParametersWithoutExtends(): void; + export interface publicInterfaceWithPrivatModuleTypeParameters { new (): privateModule.publicClass; (): privateModule.publicClass; myMethod(): privateModule.publicClass; } - class publicClassWithWithPrivateModuleTypeParameters { + export class publicClassWithWithPrivateModuleTypeParameters { static myPublicStaticMethod(): void; myPublicMethod(): void; } - function publicFunctionWithPrivateMopduleTypeParameters(): void; + export function publicFunctionWithPrivateMopduleTypeParameters(): void; + export {}; } declare module privateModule { class privateClass { } - class publicClass { + export class publicClass { } - interface publicInterfaceWithPrivateTypeParameters { + export interface publicInterfaceWithPrivateTypeParameters { new (): privateClass; (): privateClass; myMethod(): privateClass; } - interface publicInterfaceWithPublicTypeParameters { + export interface publicInterfaceWithPublicTypeParameters { new (): publicClass; (): publicClass; myMethod(): publicClass; } - class publicClassWithWithPrivateTypeParameters { + export class publicClassWithWithPrivateTypeParameters { static myPublicStaticMethod(): void; private static myPrivateStaticMethod; myPublicMethod(): void; private myPrivateMethod; } - class publicClassWithWithPublicTypeParameters { + export class publicClassWithWithPublicTypeParameters { static myPublicStaticMethod(): void; private static myPrivateStaticMethod; myPublicMethod(): void; private myPrivateMethod; } - function publicFunctionWithPrivateTypeParameters(): void; - function publicFunctionWithPublicTypeParameters(): void; - interface publicInterfaceWithPublicTypeParametersWithoutExtends { + export function publicFunctionWithPrivateTypeParameters(): void; + export function publicFunctionWithPublicTypeParameters(): void; + export interface publicInterfaceWithPublicTypeParametersWithoutExtends { new (): publicClass; (): publicClass; myMethod(): publicClass; } - class publicClassWithWithPublicTypeParametersWithoutExtends { + export class publicClassWithWithPublicTypeParametersWithoutExtends { static myPublicStaticMethod(): void; private static myPrivateStaticMethod; myPublicMethod(): void; private myPrivateMethod; } - function publicFunctionWithPublicTypeParametersWithoutExtends(): void; + export function publicFunctionWithPublicTypeParametersWithoutExtends(): void; + export {}; } export {}; diff --git a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js index bcf4c542fb7..468f656fde1 100644 --- a/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js +++ b/tests/baselines/reference/privacyTypeParametersOfClassDeclFile.js @@ -405,34 +405,36 @@ export declare class publicClassWithTypeParametersFromPrivateModule { + export class publicClassWithPrivateTypeParameters { myMethod(val: T): T; } - class publicClassWithPublicTypeParameters { + export class publicClassWithPublicTypeParameters { myMethod(val: T): T; } - class publicClassWithPublicTypeParametersWithoutExtends { + export class publicClassWithPublicTypeParametersWithoutExtends { myMethod(val: T): T; } - class publicClassWithTypeParametersFromPrivateModule { + export class publicClassWithTypeParametersFromPrivateModule { myMethod(val: T): T; } + export {}; } declare module privateModule { class privateClassInPrivateModule { } - class publicClassInPrivateModule { + export class publicClassInPrivateModule { } - class publicClassWithPrivateTypeParameters { + export class publicClassWithPrivateTypeParameters { myMethod(val: T): T; } - class publicClassWithPublicTypeParameters { + export class publicClassWithPublicTypeParameters { myMethod(val: T): T; } - class publicClassWithPublicTypeParametersWithoutExtends { + export class publicClassWithPublicTypeParametersWithoutExtends { myMethod(val: T): T; } + export {}; } export {}; diff --git a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js index 2a7a83e4577..23a7508c6e2 100644 --- a/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js +++ b/tests/baselines/reference/privacyTypeParametersOfInterfaceDeclFile.js @@ -301,13 +301,13 @@ export interface publicInterfaceWithPrivateModuleTypeParameterConstraints { } - class publicClassInPublicModuleT { + export class publicClassInPublicModuleT { } - interface publicInterfaceWithPrivateTypeParameters { + export interface publicInterfaceWithPrivateTypeParameters { myMethod(val: T): T; myMethod0(): publicClassInPublicModuleT; myMethod1(): privateClassInPublicModuleT; @@ -315,7 +315,7 @@ export declare module publicModule { myMethod3(): publicClassInPublicModuleT; myMethod4(): publicClassInPublicModuleT; } - interface publicInterfaceWithPublicTypeParameters { + export interface publicInterfaceWithPublicTypeParameters { myMethod(val: T): T; myMethod0(): publicClassInPublicModuleT; myMethod1(): privateClassInPublicModuleT; @@ -323,23 +323,24 @@ export declare module publicModule { myMethod3(): publicClassInPublicModuleT; myMethod4(): publicClassInPublicModuleT; } - interface publicInterfaceWithPublicTypeParametersWithoutExtends { + export interface publicInterfaceWithPublicTypeParametersWithoutExtends { myMethod(val: T): T; myMethod0(): publicClassInPublicModuleT; } - interface publicInterfaceWithPrivateModuleTypeParameterConstraints { + export interface publicInterfaceWithPrivateModuleTypeParameterConstraints { } + export {}; } declare module privateModule { class privateClassInPrivateModule { } - class publicClassInPrivateModule { + export class publicClassInPrivateModule { } class privateClassInPrivateModuleT { } - class publicClassInPrivateModuleT { + export class publicClassInPrivateModuleT { } - interface publicInterfaceWithPrivateTypeParameters { + export interface publicInterfaceWithPrivateTypeParameters { myMethod(val: T): T; myMethod0(): publicClassInPrivateModuleT; myMethod1(): privateClassInPrivateModuleT; @@ -347,7 +348,7 @@ declare module privateModule { myMethod3(): publicClassInPrivateModuleT; myMethod4(): publicClassInPrivateModuleT; } - interface publicInterfaceWithPublicTypeParameters { + export interface publicInterfaceWithPublicTypeParameters { myMethod(val: T): T; myMethod0(): publicClassInPrivateModuleT; myMethod1(): privateClassInPrivateModuleT; @@ -355,9 +356,10 @@ declare module privateModule { myMethod3(): publicClassInPrivateModuleT; myMethod4(): publicClassInPrivateModuleT; } - interface publicInterfaceWithPublicTypeParametersWithoutExtends { + export interface publicInterfaceWithPublicTypeParametersWithoutExtends { myMethod(val: T): T; myMethod0(): publicClassInPrivateModuleT; } + export {}; } export {}; diff --git a/tests/baselines/reference/privacyVarDeclFile.js b/tests/baselines/reference/privacyVarDeclFile.js index f32b8707534..76d69b2a2ef 100644 --- a/tests/baselines/reference/privacyVarDeclFile.js +++ b/tests/baselines/reference/privacyVarDeclFile.js @@ -727,76 +727,78 @@ export declare var publicAmbientVarWithPrivateModulePropertyTypes: privateModule export declare module publicModule { class privateClass { } - class publicClass { + export class publicClass { } - interface publicInterfaceWithPrivatePropertyTypes { + export interface publicInterfaceWithPrivatePropertyTypes { myProperty: privateClass; } - interface publicInterfaceWithPublicPropertyTypes { + export interface publicInterfaceWithPublicPropertyTypes { myProperty: publicClass; } - class publicClassWithWithPrivatePropertyTypes { + export class publicClassWithWithPrivatePropertyTypes { static myPublicStaticProperty: privateClass; private static myPrivateStaticProperty; myPublicProperty: privateClass; private myPrivateProperty; } - class publicClassWithWithPublicPropertyTypes { + export class publicClassWithWithPublicPropertyTypes { static myPublicStaticProperty: publicClass; private static myPrivateStaticProperty; myPublicProperty: publicClass; private myPrivateProperty; } - var publicVarWithPrivatePropertyTypes: privateClass; - var publicVarWithPublicPropertyTypes: publicClass; - var publicAmbientVarWithPrivatePropertyTypes: privateClass; - var publicAmbientVarWithPublicPropertyTypes: publicClass; - interface publicInterfaceWithPrivateModulePropertyTypes { + export var publicVarWithPrivatePropertyTypes: privateClass; + export var publicVarWithPublicPropertyTypes: publicClass; + export var publicAmbientVarWithPrivatePropertyTypes: privateClass; + export var publicAmbientVarWithPublicPropertyTypes: publicClass; + export interface publicInterfaceWithPrivateModulePropertyTypes { myProperty: privateModule.publicClass; } - class publicClassWithPrivateModulePropertyTypes { + export class publicClassWithPrivateModulePropertyTypes { static myPublicStaticProperty: privateModule.publicClass; myPublicProperty: privateModule.publicClass; } - var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; - var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; + export var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + export {}; } declare module privateModule { class privateClass { } - class publicClass { + export class publicClass { } - interface publicInterfaceWithPrivatePropertyTypes { + export interface publicInterfaceWithPrivatePropertyTypes { myProperty: privateClass; } - interface publicInterfaceWithPublicPropertyTypes { + export interface publicInterfaceWithPublicPropertyTypes { myProperty: publicClass; } - class publicClassWithWithPrivatePropertyTypes { + export class publicClassWithWithPrivatePropertyTypes { static myPublicStaticProperty: privateClass; private static myPrivateStaticProperty; myPublicProperty: privateClass; private myPrivateProperty; } - class publicClassWithWithPublicPropertyTypes { + export class publicClassWithWithPublicPropertyTypes { static myPublicStaticProperty: publicClass; private static myPrivateStaticProperty; myPublicProperty: publicClass; private myPrivateProperty; } - var publicVarWithPrivatePropertyTypes: privateClass; - var publicVarWithPublicPropertyTypes: publicClass; - var publicAmbientVarWithPrivatePropertyTypes: privateClass; - var publicAmbientVarWithPublicPropertyTypes: publicClass; - interface publicInterfaceWithPrivateModulePropertyTypes { + export var publicVarWithPrivatePropertyTypes: privateClass; + export var publicVarWithPublicPropertyTypes: publicClass; + export var publicAmbientVarWithPrivatePropertyTypes: privateClass; + export var publicAmbientVarWithPublicPropertyTypes: publicClass; + export interface publicInterfaceWithPrivateModulePropertyTypes { myProperty: privateModule.publicClass; } - class publicClassWithPrivateModulePropertyTypes { + export class publicClassWithPrivateModulePropertyTypes { static myPublicStaticProperty: privateModule.publicClass; myPublicProperty: privateModule.publicClass; } - var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; - var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; + export var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + export {}; } export {}; //// [privacyVarDeclFile_GlobalFile.d.ts] @@ -816,74 +818,76 @@ declare var publicAmbientVarWithPublicPropertyTypesInGlobal: publicClassInGlobal declare module publicModuleInGlobal { class privateClass { } - class publicClass { + export class publicClass { } module privateModule { class privateClass { } - class publicClass { + export class publicClass { } - interface publicInterfaceWithPrivatePropertyTypes { + export interface publicInterfaceWithPrivatePropertyTypes { myProperty: privateClass; } - interface publicInterfaceWithPublicPropertyTypes { + export interface publicInterfaceWithPublicPropertyTypes { myProperty: publicClass; } - class publicClassWithWithPrivatePropertyTypes { + export class publicClassWithWithPrivatePropertyTypes { static myPublicStaticProperty: privateClass; private static myPrivateStaticProperty; myPublicProperty: privateClass; private myPrivateProperty; } - class publicClassWithWithPublicPropertyTypes { + export class publicClassWithWithPublicPropertyTypes { static myPublicStaticProperty: publicClass; private static myPrivateStaticProperty; myPublicProperty: publicClass; private myPrivateProperty; } - var publicVarWithPrivatePropertyTypes: privateClass; - var publicVarWithPublicPropertyTypes: publicClass; - var publicAmbientVarWithPrivatePropertyTypes: privateClass; - var publicAmbientVarWithPublicPropertyTypes: publicClass; - interface publicInterfaceWithPrivateModulePropertyTypes { + export var publicVarWithPrivatePropertyTypes: privateClass; + export var publicVarWithPublicPropertyTypes: publicClass; + export var publicAmbientVarWithPrivatePropertyTypes: privateClass; + export var publicAmbientVarWithPublicPropertyTypes: publicClass; + export interface publicInterfaceWithPrivateModulePropertyTypes { myProperty: privateModule.publicClass; } - class publicClassWithPrivateModulePropertyTypes { + export class publicClassWithPrivateModulePropertyTypes { static myPublicStaticProperty: privateModule.publicClass; myPublicProperty: privateModule.publicClass; } - var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; - var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; + export var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + export {}; } - interface publicInterfaceWithPrivatePropertyTypes { + export interface publicInterfaceWithPrivatePropertyTypes { myProperty: privateClass; } - interface publicInterfaceWithPublicPropertyTypes { + export interface publicInterfaceWithPublicPropertyTypes { myProperty: publicClass; } - class publicClassWithWithPrivatePropertyTypes { + export class publicClassWithWithPrivatePropertyTypes { static myPublicStaticProperty: privateClass; private static myPrivateStaticProperty; myPublicProperty: privateClass; private myPrivateProperty; } - class publicClassWithWithPublicPropertyTypes { + export class publicClassWithWithPublicPropertyTypes { static myPublicStaticProperty: publicClass; private static myPrivateStaticProperty; myPublicProperty: publicClass; private myPrivateProperty; } - var publicVarWithPrivatePropertyTypes: privateClass; - var publicVarWithPublicPropertyTypes: publicClass; - var publicAmbientVarWithPrivatePropertyTypes: privateClass; - var publicAmbientVarWithPublicPropertyTypes: publicClass; - interface publicInterfaceWithPrivateModulePropertyTypes { + export var publicVarWithPrivatePropertyTypes: privateClass; + export var publicVarWithPublicPropertyTypes: publicClass; + export var publicAmbientVarWithPrivatePropertyTypes: privateClass; + export var publicAmbientVarWithPublicPropertyTypes: publicClass; + export interface publicInterfaceWithPrivateModulePropertyTypes { myProperty: privateModule.publicClass; } - class publicClassWithPrivateModulePropertyTypes { + export class publicClassWithPrivateModulePropertyTypes { static myPublicStaticProperty: privateModule.publicClass; myPublicProperty: privateModule.publicClass; } - var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; - var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + export var publicVarWithPrivateModulePropertyTypes: privateModule.publicClass; + export var publicAmbientVarWithPrivateModulePropertyTypes: privateModule.publicClass; + export {}; } diff --git a/tests/baselines/reference/symbolDeclarationEmit12.js b/tests/baselines/reference/symbolDeclarationEmit12.js index d700f9ac510..0b2034e0450 100644 --- a/tests/baselines/reference/symbolDeclarationEmit12.js +++ b/tests/baselines/reference/symbolDeclarationEmit12.js @@ -31,11 +31,12 @@ var M; declare module M { interface I { } - class C { + export class C { [Symbol.iterator]: I; [Symbol.toPrimitive](x: I): void; [Symbol.isConcatSpreadable](): I; readonly [Symbol.toPrimitive]: any; [Symbol.toPrimitive]: I; } + export {}; } diff --git a/tests/baselines/reference/typeFromPropertyAssignment29.js b/tests/baselines/reference/typeFromPropertyAssignment29.js index 8c2750ebb6d..3fd21be5e3a 100644 --- a/tests/baselines/reference/typeFromPropertyAssignment29.js +++ b/tests/baselines/reference/typeFromPropertyAssignment29.js @@ -219,7 +219,8 @@ declare namespace Ns { namespace ExpandoNamespace { var p6: number; } - function foo(): typeof ExpandoNamespace; + export function foo(): typeof ExpandoNamespace; + export {}; } declare var ExpandoExpr2: (n: number) => string; declare var n: number; diff --git a/tests/cases/compiler/exportNamespaceDeclarationRetainsVisibility.ts b/tests/cases/compiler/exportNamespaceDeclarationRetainsVisibility.ts new file mode 100644 index 00000000000..3b92c7f7987 --- /dev/null +++ b/tests/cases/compiler/exportNamespaceDeclarationRetainsVisibility.ts @@ -0,0 +1,14 @@ +// @declaration: true +namespace X { + interface A { + kind: 'a'; + } + + interface B { + kind: 'b'; + } + + export type C = A | B; +} + +export = X; \ No newline at end of file From c25088c6bf3100ea27de8f9481da1db94c161b39 Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Fri, 28 Jun 2019 13:34:46 -0700 Subject: [PATCH 27/27] make prnums for experiments get pulled from GH tags --- scripts/update-experimental-branches.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/scripts/update-experimental-branches.js b/scripts/update-experimental-branches.js index 8b1d1b0f54f..3c25e2f2dc6 100644 --- a/scripts/update-experimental-branches.js +++ b/scripts/update-experimental-branches.js @@ -7,18 +7,23 @@ const { runSequence } = require("./run-sequence"); const triggeredPR = process.env.SOURCE_ISSUE || process.env.SYSTEM_PULLREQUEST_PULLREQUESTNUMBER; /** - * This program should be invoked as `node ./scripts/update-experimental-branches [PR2] [...]` - * The order PR numbers are passed controls the order in which they are merged together. + * This program should be invoked as `node ./scripts/update-experimental-branches ` * TODO: the following is racey - if two experiment-enlisted PRs trigger simultaneously and witness one another in an unupdated state, they'll both produce * a new experimental branch, but each will be missing a change from the other. There's no _great_ way to fix this beyond setting the maximum concurrency * of this task to 1 (so only one job is allowed to update experiments at a time). */ async function main() { - const prnums = process.argv.slice(3); - if (!prnums.length) { - return; // No enlisted PRs, nothing to update - } - if (triggeredPR && !prnums.some(n => n === triggeredPR)) { + const gh = new Octokit({ + auth: process.argv[2] + }); + const prnums = (await gh.issues.listForRepo({ + labels: "typescript@experimental", + sort: "created", + state: "open", + owner: "Microsoft", + repo: "TypeScript", + })).data.filter(i => !!i.pull_request).map(i => i.number); + if (triggeredPR && !prnums.some(n => n === +triggeredPR)) { return; // Only have work to do for enlisted PRs } console.log(`Performing experimental branch updating and merging for pull requests ${prnums.join(", ")}`); @@ -34,9 +39,6 @@ async function main() { ["git", ["remote", "add", "fork", remoteUrl]], // Add the remote fork ]); - const gh = new Octokit({ - auth: process.argv[2] - }); for (const numRaw of prnums) { const num = +numRaw; if (num) {