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

fix export default of anonymous generators and async functions

Browse Source
This commit is contained in:
kzc 2017-12-16 18:20:13 -05:00
parent f8ff349ba7
commit d08dc6cf73
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/parse.js
View File

@ -982,7 +982,7 @@ function parse($TEXT, options) {
} }
}; };
var statement = embed_tokens(function() { var statement = embed_tokens(function(is_export_default) {
handle_regexp(); handle_regexp();
switch (S.token.type) { switch (S.token.type) {
case "string": case "string":
@ -1011,7 +1011,7 @@ function parse($TEXT, options) {
if (S.token.value == "async" && is_token(peek(), "keyword", "function")) { if (S.token.value == "async" && is_token(peek(), "keyword", "function")) {
next(); next();
next(); next();
return function_(AST_Defun, false, true); return function_(AST_Defun, false, true, is_export_default);
} }
if (S.token.value == "import" && !is_token(peek(), "punc", "(")) { if (S.token.value == "import" && !is_token(peek(), "punc", "(")) {
next(); next();
@ -1085,7 +1085,7 @@ function parse($TEXT, options) {
case "function": case "function":
next(); next();
return function_(AST_Defun); return function_(AST_Defun, false, false, is_export_default);
case "if": case "if":
next(); next();
@ -1308,7 +1308,7 @@ function parse($TEXT, options) {
}); });
}; };
var function_ = function(ctor, is_generator_property, is_async) { var function_ = function(ctor, is_generator_property, is_async, is_export_default) {
if (is_generator_property && is_async) croak("generators cannot be async"); if (is_generator_property && is_async) croak("generators cannot be async");
var start = S.token var start = S.token
@ -1319,7 +1319,7 @@ function parse($TEXT, options) {
} }
var name = is("name") ? as_symbol(in_statement ? AST_SymbolDefun : AST_SymbolLambda) : null; var name = is("name") ? as_symbol(in_statement ? AST_SymbolDefun : AST_SymbolLambda) : null;
if (in_statement && !name) if (in_statement && !name && !is_export_default)
unexpected(); unexpected();
if (name && ctor !== AST_Accessor && !(name instanceof AST_SymbolDeclaration)) if (name && ctor !== AST_Accessor && !(name instanceof AST_SymbolDeclaration))
@ -2528,7 +2528,7 @@ function parse($TEXT, options) {
&& is_token(peek(), "punc")) { && is_token(peek(), "punc")) {
exported_value = expression(false); exported_value = expression(false);
semicolon(); semicolon();
} else if ((node = statement()) instanceof AST_Definitions && is_default) { } else if ((node = statement(is_default)) instanceof AST_Definitions && is_default) {
unexpected(node.start); unexpected(node.start);
} else if (node instanceof AST_Definitions || node instanceof AST_Defun || node instanceof AST_DefClass) { } else if (node instanceof AST_Definitions || node instanceof AST_Defun || node instanceof AST_DefClass) {
exported_definition = node; exported_definition = node;

34
test/compress/export.js
View File

@ -262,3 +262,37 @@ trailing_comma: {
} }
expect_exact: "export const a = 1;" expect_exact: "export const a = 1;"
} }
export_default_anonymous_function: {
input: {
export default function () {
foo();
}
}
expect_exact: "export default function(){foo()};"
}
export_default_anonymous_generator: {
input: {
export default function * () {
yield foo();
}
}
expect_exact: "export default function*(){yield foo()};"
}
export_default_anonymous_async_function: {
input: {
export default async function() {
return await foo();
}
}
expect_exact: "export default async function(){return await foo()};"
}
export_default_async_arrow_function: {
input: {
export default async () => await foo();
}
expect_exact: "export default async()=>await foo();"
}