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

fix corner case in objects (#5214)

Browse Source 
fixes #5213
This commit is contained in:
Alex Lam S.L
2021-12-09 22:02:22 +00:00
committed by GitHub
parent 9e4c4c995c
commit 57a9519c3d
3 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/compress.js
View File

@@ -12560,7 +12560,8 @@ Compressor.prototype.compress = function(node) {
var found = false;
var generated = false;
var keep_duplicate = compressor.has_directive("use strict");
var keys = new Dictionary();
var keys = [];
var map = new Dictionary();
var values = [];
self.properties.forEach(function(prop) {
if (!(prop instanceof AST_Spread)) return process(prop);
@@ -12603,19 +12604,27 @@ Compressor.prototype.compress = function(node) {
return make_node(AST_Object, self, { properties: values });
function flush() {
keys.each(function(props) {
if (props.length == 1) return values.push(props[0]);
keys.forEach(function(key) {
var props = map.get(key);
switch (props.length) {
case 0:
return;
case 1:
return values.push(props[0]);
}
changed = true;
var tail = keep_duplicate && !generated && props.pop();
values.push(props.length == 1 ? props[0] : make_node(AST_ObjectKeyVal, self, {
key: props[0].key,
value: make_sequence(self, props.map(function(prop) {
return prop.value;
}))
})),
}));
if (tail) values.push(tail);
props.length = 0;
});
keys = new Dictionary();
keys = [];
map = new Dictionary();
}
function process(prop) {
@@ -12631,14 +12640,15 @@ Compressor.prototype.compress = function(node) {
}
if (can_hoist_property(prop)) {
if (prop.value.has_side_effects(compressor)) flush();
keys.add(key, prop);
keys.push(key);
map.add(key, prop);
} else {
flush();
values.push(prop);
}
if (found && !generated && typeof key == "string" && RE_POSITIVE_INTEGER.test(key)) {
generated = true;
if (keys.has(key)) prop = keys.get(key)[0];
if (map.has(key)) prop = map.get(key)[0];
prop.key = make_node(AST_Number, prop, { value: +key });
}
}