Merge pull request microsoft#26751 from Microsoft/declarationEmitWithComposite

sheetalkamat · web-flow · commit d5b7edba8a16 · 2018-08-29T22:55:01.000-07:00
Correctly mark visibile nodes when declaration isnt explicitly turned on but composite is true
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -26356,7 +26356,7 @@ namespace ts {
 
         function checkExportSpecifier(node: ExportSpecifier) {
             checkAliasSymbol(node);
-            if (compilerOptions.declaration) {
+            if (getEmitDeclarations(compilerOptions)) {
                 collectLinkedAliases(node.propertyName || node.name, /*setVisibility*/ true);
             }
             if (!node.parent.parent.moduleSpecifier) {
@@ -26397,7 +26397,7 @@ namespace ts {
             if (node.expression.kind === SyntaxKind.Identifier) {
                 markExportAsReferenced(node);
 
-                if (compilerOptions.declaration) {
+                if (getEmitDeclarations(compilerOptions)) {
                     collectLinkedAliases(node.expression as Identifier, /*setVisibility*/ true);
                 }
             }
diff --git a/tests/baselines/reference/declarationEmitWithComposite.js b/tests/baselines/reference/declarationEmitWithComposite.js
@@ -0,0 +1,17 @@
+//// [test.ts]
+interface Foo {
+    x: number;
+}
+export default Foo;
+
+
+//// [/foo/out/test.js]
+"use strict";
+exports.__esModule = true;
+
+
+//// [/foo/out/test.d.ts]
+interface Foo {
+    x: number;
+}
+export default Foo;
diff --git a/tests/baselines/reference/declarationEmitWithComposite.symbols b/tests/baselines/reference/declarationEmitWithComposite.symbols
@@ -0,0 +1,10 @@
+=== /foo/test.ts ===
+interface Foo {
+>Foo : Symbol(Foo, Decl(test.ts, 0, 0))
+
+    x: number;
+>x : Symbol(Foo.x, Decl(test.ts, 0, 15))
+}
+export default Foo;
+>Foo : Symbol(Foo, Decl(test.ts, 0, 0))
+
diff --git a/tests/baselines/reference/declarationEmitWithComposite.types b/tests/baselines/reference/declarationEmitWithComposite.types
@@ -0,0 +1,8 @@
+=== /foo/test.ts ===
+interface Foo {
+    x: number;
+>x : number
+}
+export default Foo;
+>Foo : Foo
+
diff --git a/tests/cases/compiler/declarationEmitWithComposite.ts b/tests/cases/compiler/declarationEmitWithComposite.ts
@@ -0,0 +1,13 @@
+// @composite: true
+// @fullEmitPaths: true
+
+// @filename: /foo/tsconfig.json
+{
+    "compilerOptions": { "composite": true, "outDir": "out" }
+}
+
+// @filename: /foo/test.ts
+interface Foo {
+    x: number;
+}
+export default Foo;

Original file line number	Diff line number	Diff line change
`@@ -26356,7 +26356,7 @@ namespace ts {`
`26356`	`26356`
`26357`	`26357`	`function checkExportSpecifier(node: ExportSpecifier) {`
`26358`	`26358`	`checkAliasSymbol(node);`
`26359`		`- if (compilerOptions.declaration) {`
	`26359`	`+ if (getEmitDeclarations(compilerOptions)) {`
`26360`	`26360`	`collectLinkedAliases(node.propertyName \|\| node.name, /setVisibility/ true);`
`26361`	`26361`	`}`
`26362`	`26362`	`if (!node.parent.parent.moduleSpecifier) {`
`@@ -26397,7 +26397,7 @@ namespace ts {`
`26397`	`26397`	`if (node.expression.kind === SyntaxKind.Identifier) {`
`26398`	`26398`	`markExportAsReferenced(node);`
`26399`	`26399`
`26400`		`- if (compilerOptions.declaration) {`
	`26400`	`+ if (getEmitDeclarations(compilerOptions)) {`
`26401`	`26401`	`collectLinkedAliases(node.expression as Identifier, /setVisibility/ true);`
`26402`	`26402`	`}`
`26403`	`26403`	`}`