First in UMD global wins

RyanCavanaugh · RyanCavanaugh · commit 0116abdcf2cc · 2016-08-26T08:49:43.000-07:00
Fixes microsoft#9771
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -18763,7 +18763,13 @@ namespace ts {
                     (augmentations || (augmentations = [])).push(file.moduleAugmentations);
                 }
                 if (file.symbol && file.symbol.globalExports) {
-                    mergeSymbolTable(globals, file.symbol.globalExports);
+                    // Merge in UMD exports with first-in-wins semantics (see #9771)
+                    const source = file.symbol.globalExports;
+                    for (const id in source) {
+                        if (!(id in globals)) {
+                            globals[id] = source[id];
+                        }
+                    }
                 }
             });
 
diff --git a/tests/baselines/reference/umdGlobalConflict.js b/tests/baselines/reference/umdGlobalConflict.js
@@ -0,0 +1,23 @@
+//// [tests/cases/compiler/umdGlobalConflict.ts] ////
+
+//// [index.d.ts]
+export as namespace Alpha;
+export var x: string;
+
+//// [index.d.ts]
+export as namespace Alpha;
+export var y: number;
+
+//// [consumer.ts]
+import * as v1 from './v1';
+import * as v2 from './v2';
+
+//// [global.ts]
+// Should be OK, first in wins
+const p: string = Alpha.x;
+
+//// [consumer.js]
+"use strict";
+//// [global.js]
+// Should be OK, first in wins
+var p = Alpha.x;
diff --git a/tests/baselines/reference/umdGlobalConflict.symbols b/tests/baselines/reference/umdGlobalConflict.symbols
@@ -0,0 +1,29 @@
+=== tests/cases/compiler/v1/index.d.ts ===
+export as namespace Alpha;
+>Alpha : Symbol(Alpha, Decl(index.d.ts, 0, 0))
+
+export var x: string;
+>x : Symbol(x, Decl(index.d.ts, 1, 10))
+
+=== tests/cases/compiler/v2/index.d.ts ===
+export as namespace Alpha;
+>Alpha : Symbol(Alpha, Decl(index.d.ts, 0, 0))
+
+export var y: number;
+>y : Symbol(y, Decl(index.d.ts, 1, 10))
+
+=== tests/cases/compiler/consumer.ts ===
+import * as v1 from './v1';
+>v1 : Symbol(v1, Decl(consumer.ts, 0, 6))
+
+import * as v2 from './v2';
+>v2 : Symbol(v2, Decl(consumer.ts, 1, 6))
+
+=== tests/cases/compiler/global.ts ===
+// Should be OK, first in wins
+const p: string = Alpha.x;
+>p : Symbol(p, Decl(global.ts, 1, 5))
+>Alpha.x : Symbol(Alpha.x, Decl(index.d.ts, 1, 10))
+>Alpha : Symbol(Alpha, Decl(index.d.ts, 0, 0))
+>x : Symbol(Alpha.x, Decl(index.d.ts, 1, 10))
+
diff --git a/tests/baselines/reference/umdGlobalConflict.types b/tests/baselines/reference/umdGlobalConflict.types
@@ -0,0 +1,29 @@
+=== tests/cases/compiler/v1/index.d.ts ===
+export as namespace Alpha;
+>Alpha : typeof Alpha
+
+export var x: string;
+>x : string
+
+=== tests/cases/compiler/v2/index.d.ts ===
+export as namespace Alpha;
+>Alpha : typeof 
+
+export var y: number;
+>y : number
+
+=== tests/cases/compiler/consumer.ts ===
+import * as v1 from './v1';
+>v1 : typeof v1
+
+import * as v2 from './v2';
+>v2 : typeof v2
+
+=== tests/cases/compiler/global.ts ===
+// Should be OK, first in wins
+const p: string = Alpha.x;
+>p : string
+>Alpha.x : string
+>Alpha : typeof Alpha
+>x : string
+
diff --git a/tests/cases/compiler/umdGlobalConflict.ts b/tests/cases/compiler/umdGlobalConflict.ts
@@ -0,0 +1,15 @@
+//@filename: v1/index.d.ts
+export as namespace Alpha;
+export var x: string;
+
+//@filename: v2/index.d.ts
+export as namespace Alpha;
+export var y: number;
+
+//@filename: consumer.ts
+import * as v1 from './v1';
+import * as v2 from './v2';
+
+//@filename: global.ts
+// Should be OK, first in wins
+const p: string = Alpha.x;

Original file line number	Diff line number	Diff line change
`@@ -18763,7 +18763,13 @@ namespace ts {`
`18763`	`18763`	`(augmentations \|\| (augmentations = [])).push(file.moduleAugmentations);`
`18764`	`18764`	`}`
`18765`	`18765`	`if (file.symbol && file.symbol.globalExports) {`
`18766`		`- mergeSymbolTable(globals, file.symbol.globalExports);`
	`18766`	`+ // Merge in UMD exports with first-in-wins semantics (see #9771)`
	`18767`	`+ const source = file.symbol.globalExports;`
	`18768`	`+ for (const id in source) {`
	`18769`	`+ if (!(id in globals)) {`
	`18770`	`+ globals[id] = source[id];`
	`18771`	`+ }`
	`18772`	`+ }`
`18767`	`18773`	`}`
`18768`	`18774`	`});`
`18769`	`18775`