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

enhance templates (#5131)

Browse Source 
closes #5125
This commit is contained in:
Alex Lam S.L
2021-09-23 11:26:26 +01:00
committed by GitHub
parent 436a29367c
commit f766babf5e
4 changed files with 339 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
lib/compress.js
View File

@@ -4922,11 +4922,9 @@ merge(Compressor.prototype, {
return this;
function decode(str) {
return str.replace(/\\(u\{[^}]*\}?|u[\s\S]{0,4}|x[\s\S]{0,2}|[0-9]+|[\s\S])/g, function(match, seq) {
var s = decode_escape_sequence(seq);
if (typeof s != "string") malformed = true;
return s;
});
str = decode_template(str);
if (typeof str != "string") malformed = true;
return str;
}
});
})(function(node, func) {
@@ -11336,42 +11334,84 @@ merge(Compressor.prototype, {
&& tag.expression.name == "String";
}
function decode_template(str) {
var malformed = false;
str = str.replace(/\\(u\{[^}]*\}?|u[\s\S]{0,4}|x[\s\S]{0,2}|[0-9]+|[\s\S])/g, function(match, seq) {
var ch = decode_escape_sequence(seq);
if (typeof ch == "string") return ch;
malformed = true;
});
if (!malformed) return str;
}
OPT(AST_Template, function(self, compressor) {
if (!compressor.option("templates")) return self;
var tag = self.tag;
if (!tag || is_raw_tag(compressor, tag)) {
var exprs = self.expressions.slice();
var strs = self.strings.slice();
var CHANGED = false;
for (var i = exprs.length; --i >= 0;) {
var node = exprs[i];
var ev = node.evaluate(compressor);
if (ev === node) continue;
if (tag && /\r|\\|`/.test(ev)) continue;
ev = ("" + ev).replace(/\r|\\|`/g, function(s) {
return "\\" + (s == "\r" ? "r" : s);
});
if (ev.length > node.print_to_string().length + 3) continue;
var combined = strs[i] + ev + strs[i + 1];
if (typeof make_node(AST_Template, self, {
expressions: [],
strings: [ combined ],
tag: tag,
}).evaluate(compressor) != typeof make_node(AST_Template, self, {
expressions: [ node ],
strings: strs.slice(i, i + 2),
tag: tag,
}).evaluate(compressor)) continue;
exprs.splice(i, 1);
strs.splice(i, 2, combined);
CHANGED = true;
var exprs = [];
var strs = [];
for (var i = 0, status; i < self.strings.length; i++) {
var str = self.strings[i];
if (!tag) {
var trimmed = decode_template(str);
if (trimmed) str = escape_literal(trimmed);
}
if (i > 0) {
var node = self.expressions[i - 1];
var value = should_join(node);
if (value) {
var prev = strs[strs.length - 1];
var joined = prev + value + str;
var decoded;
if (tag || typeof (decoded = decode_template(joined)) == status) {
strs[strs.length - 1] = decoded ? escape_literal(decoded) : joined;
continue;
}
}
exprs.push(node);
}
strs.push(str);
if (!tag) status = typeof trimmed;
}
if (CHANGED) {
self.expressions = exprs;
self.strings = strs;
if (!tag && strs.length > 1) {
if (strs[0] == "") return make_node(AST_Binary, self, {
operator: "+",
left: exprs[0],
right: make_node(AST_Template, self, {
expressions: exprs.slice(1),
strings: strs.slice(1),
tag: tag,
}).transform(compressor),
}).optimize(compressor);
if (strs[strs.length - 1] == "") return make_node(AST_Binary, self, {
operator: "+",
left: make_node(AST_Template, self, {
expressions: exprs.slice(0, -1),
strings: strs.slice(0, -1),
tag: tag,
}).transform(compressor),
right: exprs[exprs.length - 1],
}).optimize(compressor);
}
self.expressions = exprs;
self.strings = strs;
}
return try_evaluate(compressor, self);
function escape_literal(str) {
return str.replace(/\r|\\|`|\${/g, function(s) {
return "\\" + (s == "\r" ? "r" : s);
});
}
function should_join(node) {
var ev = node.evaluate(compressor);
if (ev === node) return;
if (tag && /\r|\\|`/.test(ev)) return;
ev = escape_literal("" + ev);
if (ev.length > node.print_to_string().length + "${}".length) return;
return ev;
}
});
function is_atomic(lhs, self) {