Merge pull request microsoft#6044 from weswigham/redeclared-export-type

weswigham · weswigham · commit 5ee09579747e · 2015-12-11T16:15:22.000-08:00
Exempt one type declaration from the redeclared export check - Fix microsoft#6043
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -14295,7 +14295,7 @@ namespace ts {
                     }
                     const { declarations, flags } = exports[id];
                     // ECMA262: 15.2.1.1 It is a Syntax Error if the ExportedNames of ModuleItemList contains any duplicate entries. (TS Exceptions: namespaces, function overloads, enums, and interfaces)
-                    if (!(flags & (SymbolFlags.Namespace | SymbolFlags.Interface | SymbolFlags.Enum)) && declarations.length > 1) {
+                    if (!(flags & (SymbolFlags.Namespace | SymbolFlags.Interface | SymbolFlags.Enum)) && (flags & SymbolFlags.TypeAlias ? declarations.length - 1 : declarations.length) > 1) {
                         const exportedDeclarations: Declaration[] = filter(declarations, isNotOverload);
                         if (exportedDeclarations.length > 1) {
                             for (const declaration of exportedDeclarations) {
diff --git a/tests/baselines/reference/typeAliasExport.js b/tests/baselines/reference/typeAliasExport.js
@@ -0,0 +1,8 @@
+//// [typeAliasExport.ts]
+declare module "a" {
+  export default 0
+  export var a;
+  export type a = typeof a;
+}
+
+//// [typeAliasExport.js]
diff --git a/tests/baselines/reference/typeAliasExport.symbols b/tests/baselines/reference/typeAliasExport.symbols
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/typeAliasExport.ts ===
+declare module "a" {
+  export default 0
+  export var a;
+>a : Symbol(a, Decl(typeAliasExport.ts, 2, 12), Decl(typeAliasExport.ts, 2, 15))
+
+  export type a = typeof a;
+>a : Symbol(a, Decl(typeAliasExport.ts, 2, 12), Decl(typeAliasExport.ts, 2, 15))
+>a : Symbol(a, Decl(typeAliasExport.ts, 2, 12), Decl(typeAliasExport.ts, 2, 15))
+}
diff --git a/tests/baselines/reference/typeAliasExport.types b/tests/baselines/reference/typeAliasExport.types
@@ -0,0 +1,10 @@
+=== tests/cases/compiler/typeAliasExport.ts ===
+declare module "a" {
+  export default 0
+  export var a;
+>a : any
+
+  export type a = typeof a;
+>a : any
+>a : any
+}
diff --git a/tests/cases/compiler/typeAliasExport.ts b/tests/cases/compiler/typeAliasExport.ts
@@ -0,0 +1,5 @@
+declare module "a" {
+  export default 0
+  export var a;
+  export type a = typeof a;
+}

Original file line number	Diff line number	Diff line change
`@@ -14295,7 +14295,7 @@ namespace ts {`
`14295`	`14295`	`}`
`14296`	`14296`	`const { declarations, flags } = exports[id];`
`14297`	`14297`	`// ECMA262: 15.2.1.1 It is a Syntax Error if the ExportedNames of ModuleItemList contains any duplicate entries. (TS Exceptions: namespaces, function overloads, enums, and interfaces)`
`14298`		`- if (!(flags & (SymbolFlags.Namespace \| SymbolFlags.Interface \| SymbolFlags.Enum)) && declarations.length > 1) {`
	`14298`	`+ if (!(flags & (SymbolFlags.Namespace \| SymbolFlags.Interface \| SymbolFlags.Enum)) && (flags & SymbolFlags.TypeAlias ? declarations.length - 1 : declarations.length) > 1) {`
`14299`	`14299`	`const exportedDeclarations: Declaration[] = filter(declarations, isNotOverload);`
`14300`	`14300`	`if (exportedDeclarations.length > 1) {`
`14301`	`14301`	`for (const declaration of exportedDeclarations) {`