JoBoEVD/UglifyJS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix export default expression; (#1932)

Browse Source
This commit is contained in:
kzc
2017-05-13 00:56:46 -04:00
committed by Alex Lam S.L
parent 945ba64160
commit 4d8f289eb0
3 changed files with 62 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
lib/parse.js
View File

@@ -2302,39 +2302,39 @@ function parse($TEXT, options) {
if (is("keyword", "default")) {
is_default = true;
next();
}
} else {
exported_names = import_names(false);
exported_names = import_names(false);
if (exported_names) {
if (is("name", "from")) {
next();
if (exported_names) {
if (is("name", "from")) {
next();
var mod_str = S.token;
if (mod_str.type !== 'string') {
unexpected();
}
next();
var mod_str = S.token;
if (mod_str.type !== 'string') {
unexpected();
return new AST_Export({
start: start,
is_default: is_default,
exported_names: exported_names,
module_name: new AST_String({
start: mod_str,
value: mod_str.value,
quote: mod_str.quote,
end: mod_str,
}),
end: prev(),
});
} else {
return new AST_Export({
start: start,
is_default: is_default,
exported_names: exported_names,
end: prev(),
});
}
next();
return new AST_Export({
start: start,
is_default: is_default,
exported_names: exported_names,
module_name: new AST_String({
start: mod_str,
value: mod_str.value,
quote: mod_str.quote,
end: mod_str,
}),
end: prev(),
});
} else {
return new AST_Export({
start: start,
is_default: is_default,
exported_names: exported_names,
end: prev(),
});
}
}

4
lib/transform.js
View File

@@ -239,6 +239,10 @@ TreeTransformer.prototype = new TreeWalker;
self.expression = self.expression.transform(tw);
});
_(AST_Export, function(self, tw){
if (self.exported_value) self.exported_value = self.exported_value.transform(tw);
});
_(AST_TemplateString, function(self, tw) {
for (var i = 0; i < self.segments.length; i++) {
if (!(self.segments[i] instanceof AST_TemplateSegment)) {

31
test/compress/harmony.js
View File

@@ -203,15 +203,42 @@ import_all_statement: {
}
export_statement: {
options = {
evaluate: true,
}
input: {
export default 1;
export default 1 + 2;
export var foo = 4;
export let foo = 6;
export const foo = 6;
export function foo() {};
export class foo { };
}
expect_exact: "export default 1;export var foo=4;export let foo=6;export const foo=6;export function foo(){};export class foo{};"
expect_exact: "export default 3;export var foo=4;export let foo=6;export const foo=6;export function foo(){};export class foo{};"
}
export_default_object_expression: {
options = {
evaluate: true,
}
input: {
export default {
foo: 1 + 2,
bar() { return 4; },
get baz() { return this.foo; },
};
}
expect_exact: "export default{foo:3,bar(){return 4},get baz(){return this.foo}};"
}
export_default_array: {
options = {
evaluate: true,
}
input: {
export default [ 1 + 2, foo ];
}
expect_exact: "export default[3,foo];"
}
export_module_statement: {