dont mutate

weswigham · weswigham · commit 6de5221dcddf · 2015-11-02T12:53:27.000-08:00
diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
@@ -130,7 +130,7 @@ namespace ts {
                 }
                 else if (isExternalModule(sourceFile)) {
                     noDeclare = true;
-                    write(`declare module "${sourceFile.moduleName}" {`);
+                    write(`declare module "${getModuleName(host, sourceFile)}" {`);
                     writeLine();
                     increaseIndent();
                     emitSourceFile(sourceFile);
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -7,6 +7,10 @@ namespace ts {
         return isExternalModule(sourceFile) || isDeclarationFile(sourceFile);
     }
 
+    export function getModuleName(host: EmitHost, file: SourceFile): string {
+        return file.moduleName || getExternalModuleNameFromPath(host, file.fileName);
+    }
+
     type DependencyGroup = Array<ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration>;
 
     let entities: Map<number> = {
@@ -578,12 +582,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     forEach(host.getSourceFiles(), emitEmitHelpers);
                 }
                 forEach(host.getSourceFiles(), sourceFile => {
-                    if (!isExternalModuleOrDeclarationFile(sourceFile)) {
+                    if ((!isExternalModuleOrDeclarationFile(sourceFile)) || (modulekind && isExternalModule(sourceFile))) {
                         emitSourceFile(sourceFile);
                     }
-                    else if (modulekind && isExternalModule(sourceFile)) {
-                        emitConcatenatedModule(sourceFile);
-                    }
                 });
             }
 
@@ -597,14 +598,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 emit(sourceFile);
             }
 
-            function emitConcatenatedModule(sourceFile: SourceFile): void {
-                currentSourceFile = sourceFile;
-                exportFunctionForFile = undefined;
-                let canonicalName = getExternalModuleNameFromPath(host, sourceFile.fileName);
-                sourceFile.moduleName = sourceFile.moduleName || canonicalName;
-                emit(sourceFile);
-            }
-
             function isUniqueName(name: string): boolean {
                 return !resolver.hasGlobalName(name) &&
                     !hasProperty(currentSourceFile.identifiers, name) &&
@@ -7282,6 +7275,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 write("}"); // execute
             }
 
+            function writeModuleName(node: SourceFile, resolveModuleNames?: boolean): void {
+                let moduleName = node.moduleName;
+                if (moduleName || (resolveModuleNames && (moduleName = getModuleName(host, node)))) {
+                    write(`"${moduleName}", `);
+                }
+            }
+
             function emitSystemModule(node: SourceFile,  resolveModuleNames?: boolean): void {
                 collectExternalModuleInfo(node);
                 // System modules has the following shape
@@ -7297,9 +7297,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 exportFunctionForFile = makeUniqueName("exports");
                 writeLine();
                 write("System.register(");
-                if (node.moduleName) {
-                    write(`"${node.moduleName}", `);
-                }
+                writeModuleName(node, resolveModuleNames);
                 write("[");
 
                 let groupIndices: Map<number> = {};
@@ -7459,9 +7457,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
                 writeLine();
                 write("define(");
-                if (node.moduleName) {
-                    write("\"" + node.moduleName + "\", ");
-                }
+                writeModuleName(node, resolveModuleNames);
                 emitAMDDependencies(node, /*includeNonAmdDependencies*/ true, resolveModuleNames);
                 increaseIndent();
                 let startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true);

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ namespace ts {`
`130`	`130`	`}`
`131`	`131`	`else if (isExternalModule(sourceFile)) {`
`132`	`132`	`noDeclare = true;`
`133`		- write(`declare module "${sourceFile.moduleName}" {`);
	`133`	+ write(`declare module "${getModuleName(host, sourceFile)}" {`);
`134`	`134`	`writeLine();`
`135`	`135`	`increaseIndent();`
`136`	`136`	`emitSourceFile(sourceFile);`