support export statements properly (#2126)

- mangle & compress correctly with `toplevel`
- retain non-toplevel import/export
- parse & output `export { variable as name }`
- remove extraneous spaces from `beautify`


fixes #2038
fixes #2124
This commit is contained in:
Alex Lam S.L
2017-06-21 00:51:36 +08:00
committed by GitHub
parent 849ba79dee
commit 62d1fbf645
7 changed files with 199 additions and 57 deletions

View File

@@ -1280,7 +1280,6 @@ function OutputStream(options) {
name_import.print(output);
if (i < self.imported_names.length - 1) {
output.print(",");
output.space();
}
});
output.space();
@@ -1296,17 +1295,26 @@ function OutputStream(options) {
output.semicolon();
});
DEFPRINT(AST_NameImport, function(self, output) {
DEFPRINT(AST_NameMapping, function(self, output) {
var is_import = output.parent() instanceof AST_Import;
var definition = self.name.definition();
var names_are_different =
(definition && definition.mangled_name || self.name.name) !==
self.foreign_name.name;
if (names_are_different) {
output.print(self.foreign_name.name);
if (is_import) {
output.print(self.foreign_name.name);
} else {
self.name.print(output);
}
output.space();
output.print("as");
output.space();
self.name.print(output);
if (is_import) {
self.name.print(output);
} else {
output.print(self.foreign_name.name);
}
} else {
self.name.print(output);
}
@@ -1320,24 +1328,20 @@ function OutputStream(options) {
output.space();
}
if (self.exported_names) {
output.space();
if (self.exported_names.length === 1 && self.exported_names[0].name.name === "*") {
self.exported_names[0].print(output);
} else {
output.print("{");
self.exported_names.forEach(function (name_import, i) {
self.exported_names.forEach(function(name_export, i) {
output.space();
name_import.print(output);
name_export.print(output);
if (i < self.exported_names.length - 1) {
output.print(",");
output.space();
}
});
output.space();
output.print("}");
}
output.space();
}
else if (self.exported_value) {
self.exported_value.print(output);