fix(43359): emit default exports with named exports that have the same names with types (#44718)

a-tarasyuk · web-flow · commit 719ab0b47721 · 2021-11-12T11:25:52.000-08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -41589,7 +41589,7 @@ namespace ts {
             if (!symbol) {
                 return false;
             }
-            const target = resolveAlias(symbol);
+            const target = getExportSymbolOfValueSymbolIfExported(resolveAlias(symbol));
             if (target === unknownSymbol) {
                 return true;
             }
diff --git a/tests/baselines/reference/defaultNamedExportWithType1.js b/tests/baselines/reference/defaultNamedExportWithType1.js
@@ -0,0 +1,9 @@
+//// [defaultNamedExportWithType1.ts]
+type Foo = number;
+export const Foo = 1;
+export default Foo;
+
+
+//// [defaultNamedExportWithType1.js]
+export const Foo = 1;
+export default Foo;
diff --git a/tests/baselines/reference/defaultNamedExportWithType1.symbols b/tests/baselines/reference/defaultNamedExportWithType1.symbols
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/defaultNamedExportWithType1.ts ===
+type Foo = number;
+>Foo : Symbol(Foo, Decl(defaultNamedExportWithType1.ts, 0, 0), Decl(defaultNamedExportWithType1.ts, 1, 12))
+
+export const Foo = 1;
+>Foo : Symbol(Foo, Decl(defaultNamedExportWithType1.ts, 1, 12))
+
+export default Foo;
+>Foo : Symbol(Foo, Decl(defaultNamedExportWithType1.ts, 0, 0), Decl(defaultNamedExportWithType1.ts, 1, 12))
+
diff --git a/tests/baselines/reference/defaultNamedExportWithType1.types b/tests/baselines/reference/defaultNamedExportWithType1.types
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/defaultNamedExportWithType1.ts ===
+type Foo = number;
+>Foo : number
+
+export const Foo = 1;
+>Foo : 1
+>1 : 1
+
+export default Foo;
+>Foo : number
+
diff --git a/tests/baselines/reference/defaultNamedExportWithType2.js b/tests/baselines/reference/defaultNamedExportWithType2.js
@@ -0,0 +1,9 @@
+//// [defaultNamedExportWithType2.ts]
+type Foo = number;
+const Foo = 1;
+export default Foo;
+
+
+//// [defaultNamedExportWithType2.js]
+const Foo = 1;
+export default Foo;
diff --git a/tests/baselines/reference/defaultNamedExportWithType2.symbols b/tests/baselines/reference/defaultNamedExportWithType2.symbols
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/defaultNamedExportWithType2.ts ===
+type Foo = number;
+>Foo : Symbol(Foo, Decl(defaultNamedExportWithType2.ts, 0, 0), Decl(defaultNamedExportWithType2.ts, 1, 5))
+
+const Foo = 1;
+>Foo : Symbol(Foo, Decl(defaultNamedExportWithType2.ts, 0, 0), Decl(defaultNamedExportWithType2.ts, 1, 5))
+
+export default Foo;
+>Foo : Symbol(Foo, Decl(defaultNamedExportWithType2.ts, 0, 0), Decl(defaultNamedExportWithType2.ts, 1, 5))
+
diff --git a/tests/baselines/reference/defaultNamedExportWithType2.types b/tests/baselines/reference/defaultNamedExportWithType2.types
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/defaultNamedExportWithType2.ts ===
+type Foo = number;
+>Foo : number
+
+const Foo = 1;
+>Foo : 1
+>1 : 1
+
+export default Foo;
+>Foo : number
+
diff --git a/tests/baselines/reference/defaultNamedExportWithType3.js b/tests/baselines/reference/defaultNamedExportWithType3.js
@@ -0,0 +1,9 @@
+//// [defaultNamedExportWithType3.ts]
+interface Foo {}
+export const Foo = {};
+export default Foo;
+
+
+//// [defaultNamedExportWithType3.js]
+export const Foo = {};
+export default Foo;
diff --git a/tests/baselines/reference/defaultNamedExportWithType3.symbols b/tests/baselines/reference/defaultNamedExportWithType3.symbols
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/defaultNamedExportWithType3.ts ===
+interface Foo {}
+>Foo : Symbol(Foo, Decl(defaultNamedExportWithType3.ts, 0, 0), Decl(defaultNamedExportWithType3.ts, 1, 12))
+
+export const Foo = {};
+>Foo : Symbol(Foo, Decl(defaultNamedExportWithType3.ts, 1, 12))
+
+export default Foo;
+>Foo : Symbol(Foo, Decl(defaultNamedExportWithType3.ts, 0, 0), Decl(defaultNamedExportWithType3.ts, 1, 12))
+
diff --git a/tests/baselines/reference/defaultNamedExportWithType3.types b/tests/baselines/reference/defaultNamedExportWithType3.types
@@ -0,0 +1,9 @@
+=== tests/cases/compiler/defaultNamedExportWithType3.ts ===
+interface Foo {}
+export const Foo = {};
+>Foo : {}
+>{} : {}
+
+export default Foo;
+>Foo : Foo
+
diff --git a/tests/baselines/reference/defaultNamedExportWithType4.js b/tests/baselines/reference/defaultNamedExportWithType4.js
@@ -0,0 +1,9 @@
+//// [defaultNamedExportWithType4.ts]
+interface Foo {}
+const Foo = {};
+export default Foo;
+
+
+//// [defaultNamedExportWithType4.js]
+const Foo = {};
+export default Foo;
diff --git a/tests/baselines/reference/defaultNamedExportWithType4.symbols b/tests/baselines/reference/defaultNamedExportWithType4.symbols
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/defaultNamedExportWithType4.ts ===
+interface Foo {}
+>Foo : Symbol(Foo, Decl(defaultNamedExportWithType4.ts, 0, 0), Decl(defaultNamedExportWithType4.ts, 1, 5))
+
+const Foo = {};
+>Foo : Symbol(Foo, Decl(defaultNamedExportWithType4.ts, 0, 0), Decl(defaultNamedExportWithType4.ts, 1, 5))
+
+export default Foo;
+>Foo : Symbol(Foo, Decl(defaultNamedExportWithType4.ts, 0, 0), Decl(defaultNamedExportWithType4.ts, 1, 5))
+
diff --git a/tests/baselines/reference/defaultNamedExportWithType4.types b/tests/baselines/reference/defaultNamedExportWithType4.types
@@ -0,0 +1,9 @@
+=== tests/cases/compiler/defaultNamedExportWithType4.ts ===
+interface Foo {}
+const Foo = {};
+>Foo : {}
+>{} : {}
+
+export default Foo;
+>Foo : Foo
+
diff --git a/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.js b/tests/baselines/reference/duplicateVarsAcrossFileBoundaries.js
@@ -43,6 +43,7 @@ var x = 0;
 var y = "";
 var z = 0;
 //// [duplicateVarsAcrossFileBoundaries_4.js]
+var p = P;
 var q;
 //// [duplicateVarsAcrossFileBoundaries_5.js]
 var p;
diff --git a/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js b/tests/baselines/reference/importDeclWithExportModifierAndExportAssignment.js
@@ -8,6 +8,6 @@ export = x;
 
 //// [importDeclWithExportModifierAndExportAssignment.js]
 "use strict";
-exports.__esModule = true;
 exports.a = void 0;
 exports.a = x.c;
+module.exports = x;
diff --git a/tests/cases/compiler/defaultNamedExportWithType1.ts b/tests/cases/compiler/defaultNamedExportWithType1.ts
@@ -0,0 +1,5 @@
+// @target: esnext
+
+type Foo = number;
+export const Foo = 1;
+export default Foo;
diff --git a/tests/cases/compiler/defaultNamedExportWithType2.ts b/tests/cases/compiler/defaultNamedExportWithType2.ts
@@ -0,0 +1,5 @@
+// @target: esnext
+
+type Foo = number;
+const Foo = 1;
+export default Foo;
diff --git a/tests/cases/compiler/defaultNamedExportWithType3.ts b/tests/cases/compiler/defaultNamedExportWithType3.ts
@@ -0,0 +1,5 @@
+// @target: esnext
+
+interface Foo {}
+export const Foo = {};
+export default Foo;
diff --git a/tests/cases/compiler/defaultNamedExportWithType4.ts b/tests/cases/compiler/defaultNamedExportWithType4.ts
@@ -0,0 +1,5 @@
+// @target: esnext
+
+interface Foo {}
+const Foo = {};
+export default Foo;

Original file line number	Diff line number	Diff line change
`@@ -41589,7 +41589,7 @@ namespace ts {`
`41589`	`41589`	`if (!symbol) {`
`41590`	`41590`	`return false;`
`41591`	`41591`	`}`
`41592`		`- const target = resolveAlias(symbol);`
	`41592`	`+ const target = getExportSymbolOfValueSymbolIfExported(resolveAlias(symbol));`
`41593`	`41593`	`if (target === unknownSymbol) {`
`41594`	`41594`	`return true;`
`41595`	`41595`	`}`