microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-17 11:24:29 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

In ES6 use "export var x" for internal modules and enums instead of an after the fact "export {x};"

Browse Source
This commit is contained in:
Mohamed Hegazy
2015-03-24 21:54:36 -07:00
parent ab5c09a9a6
commit bc51dd1e77
15 changed files with 26 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/compiler/emitter.ts
View File

@@ -3487,6 +3487,9 @@ module ts {
if (!(node.flags & NodeFlags.Export) || isES6ExportedDeclaration(node)) {
emitStart(node);
if (isES6ExportedDeclaration(node)) {
write("export ");
}
write("var ");
emit(node.name);
emitEnd(node);
@@ -3512,10 +3515,7 @@ module ts {
emitModuleMemberName(node);
write(" = {}));");
emitEnd(node);
if (isES6ExportedDeclaration(node)) {
emitES6NamedExportForDeclaration(node);
}
else if (node.flags & NodeFlags.Export) {
if (!isES6ExportedDeclaration(node) && node.flags & NodeFlags.Export) {
writeLine();
emitStart(node);
write("var ");
@@ -3580,6 +3580,9 @@ module ts {
}
emitStart(node);
if (isES6ExportedDeclaration(node)) {
write("export ");
}
write("var ");
emit(node.name);
write(";");
@@ -3628,23 +3631,11 @@ module ts {
emitModuleMemberName(node);
write(" = {}));");
emitEnd(node);
if (isES6ExportedDeclaration(node)) {
emitES6NamedExportForDeclaration(node);
}
else if (languageVersion < ScriptTarget.ES6 && node.name.kind === SyntaxKind.Identifier && node.parent === currentSourceFile) {
if (!isES6ExportedDeclaration(node) && node.name.kind === SyntaxKind.Identifier && node.parent === currentSourceFile) {
emitExportMemberAssignments(<Identifier>node.name);
}
}
function emitES6NamedExportForDeclaration(node: Declaration) {
writeLine();
emitStart(node);
write("export { ");
emit(node.name);
write(" };");
emitEnd(node);
}
function emitRequire(moduleName: Expression) {
if (moduleName.kind === SyntaxKind.StringLiteral) {
write("require(");