maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix class exports with varrying module emits while targeting es6

Browse source
This commit is contained in:
Wesley Wigham 2015-11-12 19:03:52 -08:00
parent e79253a07c
commit 521a0a160c
1 changed files with 20 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/compiler/emitter.ts
View file

@ -5581,7 +5581,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
} }
// If this is an exported class, but not on the top level (i.e. on an internal // If this is an exported class, but not on the top level (i.e. on an internal
// module), export it // module), export it
if (node.parent.kind !== SyntaxKind.SourceFile) { if (node.parent.kind === SyntaxKind.SourceFile && (node.flags & NodeFlags.Default)) {
// if this is a top level default export of decorated class, write the export after the declaration.
writeLine();
if (thisNodeIsDecorated && modulekind === ModuleKind.ES6) {
write("export default ");
emitDeclarationName(node);
write(";");
}
else if (modulekind === ModuleKind.System) {
write(`${exportFunctionForFile}("default", `);
emitDeclarationName(node);
write(");");
}
else if (modulekind !== ModuleKind.ES6) {
write(`exports.default = `);
emitDeclarationName(node);
write(";");
}
}
else if (node.parent.kind !== SyntaxKind.SourceFile || (modulekind !== ModuleKind.ES6 && !(node.flags & NodeFlags.Default))) {
writeLine(); writeLine();
emitStart(node); emitStart(node);
emitModuleMemberName(node); emitModuleMemberName(node);
@ -5590,32 +5609,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
emitEnd(node); emitEnd(node);
write(";"); write(";");
} }
else if (node.parent.kind === SyntaxKind.SourceFile && (node.flags & NodeFlags.Default) && thisNodeIsDecorated) {
// if this is a top level default export of decorated class, write the export after the declaration.
if (modulekind === ModuleKind.ES6) {
writeLine();
write("export default ");
emitDeclarationName(node);
write(";");
}
else if (modulekind === ModuleKind.System) {
writeLine();
write(`${exportFunctionForFile}("default", `);
emitDeclarationName(node);
write(");");
}
else {
writeLine();
if (languageVersion === ScriptTarget.ES3) {
write(`exports["default"] = `);
}
else {
write(`exports.default = `);
}
emitDeclarationName(node);
write(";");
}
}
} }
function emitClassLikeDeclarationBelowES6(node: ClassLikeDeclaration) { function emitClassLikeDeclarationBelowES6(node: ClassLikeDeclaration) {