Add name to amd definition in umd module if present (microsoft#18479)

weswigham · web-flow · commit e1ede37ec7ff · 2017-09-14T14:41:56.000-07:00
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
@@ -200,6 +200,7 @@ namespace ts {
          */
         function transformUMDModule(node: SourceFile) {
             const { aliasedModuleNames, unaliasedModuleNames, importAliasNames } = collectAsynchronousDependencies(node, /*includeNonAmdDependencies*/ false);
+            const moduleName = tryGetModuleNameFromFile(node, host, compilerOptions);
             const umdHeader = createFunctionExpression(
                 /*modifiers*/ undefined,
                 /*asteriskToken*/ undefined,
@@ -260,6 +261,8 @@ namespace ts {
                                                 createIdentifier("define"),
                                                 /*typeArguments*/ undefined,
                                                 [
+                                                    // Add the module name (if provided).
+                                                    ...(moduleName ? [moduleName] : []),
                                                     createArrayLiteral([
                                                         createLiteral("require"),
                                                         createLiteral("exports"),
diff --git a/tests/baselines/reference/umdNamedAmdMode.js b/tests/baselines/reference/umdNamedAmdMode.js
@@ -0,0 +1,19 @@
+//// [main.ts]
+/// <amd-module name="a"/>
+export const a = 1;
+
+//// [main.js]
+(function (factory) {
+    if (typeof module === "object" && typeof module.exports === "object") {
+        var v = factory(require, exports);
+        if (v !== undefined) module.exports = v;
+    }
+    else if (typeof define === "function" && define.amd) {
+        define("a", ["require", "exports"], factory);
+    }
+})(function (require, exports) {
+    "use strict";
+    exports.__esModule = true;
+    /// <amd-module name="a"/>
+    exports.a = 1;
+});
diff --git a/tests/baselines/reference/umdNamedAmdMode.symbols b/tests/baselines/reference/umdNamedAmdMode.symbols
@@ -0,0 +1,5 @@
+=== tests/cases/compiler/main.ts ===
+/// <amd-module name="a"/>
+export const a = 1;
+>a : Symbol(a, Decl(main.ts, 1, 12))
+
diff --git a/tests/baselines/reference/umdNamedAmdMode.types b/tests/baselines/reference/umdNamedAmdMode.types
@@ -0,0 +1,6 @@
+=== tests/cases/compiler/main.ts ===
+/// <amd-module name="a"/>
+export const a = 1;
+>a : 1
+>1 : 1
+
diff --git a/tests/cases/compiler/umdNamedAmdMode.ts b/tests/cases/compiler/umdNamedAmdMode.ts
@@ -0,0 +1,4 @@
+// @module: umd
+// @filename: main.ts
+/// <amd-module name="a"/>
+export const a = 1;
