microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-15 11:35:42 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

dont mutate

Browse Source
This commit is contained in:
Wesley Wigham 2015-11-02 12:53:27 -08:00
parent f06627f780
commit 6de5221dcd
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/declarationEmitter.ts
View File

@ -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);

32
src/compiler/emitter.ts
View File

@ -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);