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

fix corner case in spreads (#4883)

Browse Source 
fixes #4882
This commit is contained in:
Alex Lam S.L
2021-04-30 15:21:15 +01:00
committed by GitHub
parent d833e66d23
commit 8e4a19ffec
2 changed files with 104 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/compress.js
View File

@@ -11649,13 +11649,23 @@ merge(Compressor.prototype, {
found = true;
var exp = prop.expression;
if (compressor.option("spreads") && exp instanceof AST_Object && all(exp.properties, function(prop) {
return !(prop instanceof AST_ObjectGetter || prop instanceof AST_Spread);
if (prop instanceof AST_ObjectGetter) return false;
if (prop instanceof AST_Spread) return false;
if (prop.key !== "__proto__") return true;
if (prop instanceof AST_ObjectSetter) return true;
return !prop.value.has_side_effects(compressor);
})) {
changed = true;
exp.properties.forEach(function(prop) {
process(prop instanceof AST_ObjectSetter ? make_node(AST_ObjectKeyVal, prop, {
key: prop.key,
value: make_node(AST_Undefined, prop).optimize(compressor)
var key = prop.key;
var setter = prop instanceof AST_ObjectSetter;
if (key === "__proto__") {
if (!setter) return;
key = make_node_from_constant(key, prop);
}
process(setter ? make_node(AST_ObjectKeyVal, prop, {
key: key,
value: make_node(AST_Undefined, prop).optimize(compressor),
}) : prop);
});
} else {
@@ -11695,7 +11705,7 @@ merge(Compressor.prototype, {
if (key instanceof AST_Node) {
found = true;
key = key.evaluate(compressor);
if (key === prop.key) {
if (key === prop.key || key === "__proto__") {
generated = true;
} else {
key = prop.key = "" + key;
@@ -11711,9 +11721,7 @@ merge(Compressor.prototype, {
if (found && !generated && typeof key == "string" && RE_POSITIVE_INTEGER.test(key)) {
generated = true;
if (keys.has(key)) prop = keys.get(key)[0];
prop.key = make_node(AST_Number, prop, {
value: +key
});
prop.key = make_node(AST_Number, prop, { value: +key });
}
}
});