Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(es/minifier): Don't evaluate String.fromCharCode for non-ascii values #6033

Merged
merged 6 commits into from
Oct 4, 2022
Merged

fix(es/minifier): Don't evaluate String.fromCharCode for non-ascii values #6033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7c3369c
Add a test
kdy1 Oct 4, 2022
654e599
Add an exec test
kdy1 Oct 4, 2022
66d90c5
report_change
kdy1 Oct 4, 2022
d66a038
String.charCode
kdy1 Oct 4, 2022
7b59234
PASS
kdy1 Oct 4, 2022
35f612c
Update test refs
kdy1 Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions crates/swc_ecma_minifier/src/compress/optimize/evaluate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,9 @@ where
let v = char_code.floor() as u32;

if let Some(v) = char::from_u32(v) {
if !v.is_ascii() {
return;
}
self.changed = true;
report_change!(
"evaluate: Evaluated `String.charCodeAt({})` as `{}`",
Expand Down
2 changes: 2 additions & 0 deletions crates/swc_ecma_minifier/src/compress/pure/misc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,8 @@ impl Pure<'_> {
})
.unwrap_or_default();

report_change!("Optimized regex");

Some(Expr::Lit(Lit::Regex(Regex {
span: *span,
exp: pattern.into(),
Expand Down
20 changes: 20 additions & 0 deletions crates/swc_ecma_minifier/tests/exec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10110,3 +10110,23 @@ fn issue_5914() {

run_exec_test(src, config, false);
}

#[test]
fn feedback_regex_range() {
let src = r###"
const rtlRegEx = new RegExp(
/* eslint-disable prettier/prettier */
'[' +
String.fromCharCode(0x00591) + '-' + String.fromCharCode(0x008ff) +
String.fromCharCode(0x0fb1d) + '-' + String.fromCharCode(0x0fdff) +
String.fromCharCode(0x0fe70) + '-' + String.fromCharCode(0x0fefc) +
String.fromCharCode(0x10800) + '-' + String.fromCharCode(0x10fff) +
String.fromCharCode(0x1e800) + '-' + String.fromCharCode(0x1efff) +
']'
/* eslint-enable prettier/prettier */
);
console.log('PASS')
"###;

run_default_exec_test(src);
}
11 changes: 11 additions & 0 deletions crates/swc_ecma_minifier/tests/fixture/next/feedback-regex/input.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
export const rtlRegEx = new RegExp(
/* eslint-disable prettier/prettier */
'[' +
String.fromCharCode(0x00591) + '-' + String.fromCharCode(0x008ff) +
String.fromCharCode(0x0fb1d) + '-' + String.fromCharCode(0x0fdff) +
String.fromCharCode(0x0fe70) + '-' + String.fromCharCode(0x0fefc) +
String.fromCharCode(0x10800) + '-' + String.fromCharCode(0x10fff) +
String.fromCharCode(0x1e800) + '-' + String.fromCharCode(0x1efff) +
']'
/* eslint-enable prettier/prettier */
);
1 change: 1 addition & 0 deletions crates/swc_ecma_minifier/tests/fixture/next/feedback-regex/output.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 11 additions & 7 deletions crates/swc_ecma_minifier/tests/fixture/next/react-pdf-renderer/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1557,7 +1557,7 @@
for(var n = e[r], i = void 0, o = 0; i = eL.exec(n.string);){
var a = i.index, u = i[0], l = n.attributes.fontSize, s = n.string.slice(o, a + i[0].length);
eN[u] && eN[u].data ? t.push({
string: s.replace(i, ""),
string: s.replace(i, String.fromCharCode(0xfffc)),
attributes: U.default({}, n.attributes, {
attachment: {
width: l,
Expand Down Expand Up @@ -2233,7 +2233,7 @@
}, k = 0; k < r.children.length; k += 1){
var O, C, P, F = r.children[k];
F.type === T.Image ? o.push({
string: "",
string: String.fromCharCode(0xfffc),
attributes: U.default({}, A, {
attachment: {
width: F.style.width || h,
Expand Down Expand Up @@ -5422,15 +5422,19 @@
"use strict";
var n = r(5318).default;
t.__esModule = !0, t.default = void 0;
var i = r(4354), o = n(r(4573)), a = n(r(9845)), u = function(e) {
var t = (null === (n = (0, i.last)(e)) || void 0 === n ? void 0 : n.runs) || [], r = null === (u = (0, i.last)(t)) || void 0 === u ? void 0 : null === (l = u.attributes) || void 0 === l ? void 0 : l.font;
var i = r(4354), o = n(r(4573)), a = n(r(9845)), u = String.fromCharCode(8230), l = function(e) {
if (!e.encode) return 8230;
var t = e.encode(u)[0];
return parseInt(t[0], 16);
}, s = function(e) {
var t = (null === (n = (0, i.last)(e)) || void 0 === n ? void 0 : n.runs) || [], r = null === (u = (0, i.last)(t)) || void 0 === u ? void 0 : null === (s = u.attributes) || void 0 === s ? void 0 : s.font;
if (r) {
var n, u, l, s, c = e.length - 1, f = r.encode ? parseInt(r.encode("…")[0][0], 16) : 8230, d = r.glyphForCodePoint(f), p = (0, a.default)(d, (0, o.default)(e[c]));
return Object.assign([], e, ((s = {})[c] = p, s));
var n, u, s, c, f = e.length - 1, d = l(r), p = r.glyphForCodePoint(d), h = (0, a.default)(p, (0, o.default)(e[f]));
return Object.assign([], e, ((c = {})[f] = h, c));
}
return e;
};
t.default = u;
t.default = s;
},
7518: function(e, t) {
"use strict";
Expand Down
14 changes: 7 additions & 7 deletions crates/swc_ecma_minifier/tests/fixture/next/syncfusion/933-e9f9a6bf671b96fc/output.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10793,7 +10793,7 @@
}), this.restrict(e), 'HTML' === this.editorMode && this.cleanList(e), 'HTML' === this.editorMode && (8 === e.which && 'Backspace' === e.code || 46 === e.which && 'Delete' === e.code)) {
var range = this.getRange(), startNode = '#text' === range.startContainer.nodeName ? range.startContainer.parentElement : range.startContainer;
if ((0, ej2_base.oq)(startNode, 'pre') && 8 === e.which && 8203 === range.startContainer.textContent.charCodeAt(range.startOffset - 1) || 46 === e.which && 8203 === range.startContainer.textContent.charCodeAt(range.startOffset)) {
var regEx = RegExp("​", 'g'), pointer = 8 === e.which ? range.startOffset - 1 : range.startOffset;
var regEx = RegExp(String.fromCharCode(8203), 'g'), pointer = 8 === e.which ? range.startOffset - 1 : range.startOffset;
range.startContainer.textContent = range.startContainer.textContent.replace(regEx, ''), this.formatter.editorManager.nodeSelection.setCursorPoint(this.contentModule.getDocument(), range.startContainer, pointer);
} else if ('Backspace' === e.code && 8 === e.which && 8203 === range.startContainer.textContent.charCodeAt(0) && range.collapsed) {
var parentEle = range.startContainer.parentElement, index = void 0, i = void 0;
Expand Down Expand Up @@ -12783,7 +12783,7 @@
}
}
}, Formats.prototype.removeCodeContent = function(range) {
var regEx = RegExp("\uFEFF", 'g');
var regEx = RegExp(String.fromCharCode(65279), 'g');
if (!(0, ej2_base.le)(range.endContainer.textContent.match(regEx))) {
var pointer = 65279 === range.endContainer.textContent.charCodeAt(range.endOffset - 1) ? range.endOffset - 2 : range.endOffset;
range.endContainer.textContent = range.endContainer.textContent.replace(regEx, ''), '' === range.endContainer.textContent ? this.parent.nodeSelection.setCursorPoint(this.parent.currentDocument, range.endContainer.parentElement, 0) : this.parent.nodeSelection.setCursorPoint(this.parent.currentDocument, range.endContainer, pointer);
Expand Down Expand Up @@ -14023,7 +14023,7 @@
if (range.collapsed) {
var currentFormatNode = isFormatted.getFormattedNode(range.startContainer, format, endNode), currentSelector = (0, ej2_base.le)(currentFormatNode) ? null : null === currentFormatNode.getAttribute('style') ? currentFormatNode.nodeName : currentFormatNode.nodeName + "[style='" + currentFormatNode.getAttribute('style') + "']";
if (nodes.length > 0) isCollapsed = !0, range = nodeCutter.GetCursorRange(docElement, range, nodes[0]);
else if (3 === range.startContainer.nodeType && (range.startContainer.parentElement.childElementCount > 0 && range.startOffset > 0 && 'br' !== range.startContainer.parentElement.firstElementChild.tagName.toLowerCase() || !(0, ej2_base.le)(currentFormatNode) && currentFormatNode === range.startContainer.parentElement.closest(currentSelector) && 0 != range.startContainer.parentElement.closest(currentSelector).textContent.replace(RegExp("​", 'g'), '').trim().length)) isCollapsed = !0, range = nodeCutter.GetCursorRange(docElement, range, range.startContainer), nodes.push(range.startContainer);
else if (3 === range.startContainer.nodeType && (range.startContainer.parentElement.childElementCount > 0 && range.startOffset > 0 && 'br' !== range.startContainer.parentElement.firstElementChild.tagName.toLowerCase() || !(0, ej2_base.le)(currentFormatNode) && currentFormatNode === range.startContainer.parentElement.closest(currentSelector) && 0 != range.startContainer.parentElement.closest(currentSelector).textContent.replace(RegExp(String.fromCharCode(8203), 'g'), '').trim().length)) isCollapsed = !0, range = nodeCutter.GetCursorRange(docElement, range, range.startContainer), nodes.push(range.startContainer);
else {
var cursorNode = this.insertCursorNode(docElement, domSelection, range, isFormatted, nodeCutter, format, value, endNode);
domSelection.endContainer = domSelection.startContainer = domSelection.getNodeArray(cursorNode, !0);
Expand All @@ -14042,7 +14042,7 @@
var cursorNodes = domSelection.getNodeCollection(range), domNode = new DOMNode(endNode, docElement), cursorFormat = cursorNodes.length > 0 ? cursorNodes.length > 1 && range.startContainer === range.endContainer ? this.getCursorFormat(isFormatted, cursorNodes, format, endNode) : isFormatted.getFormattedNode(cursorNodes[0], format, endNode) : null, cursorNode = null;
if (cursorFormat) {
if (cursorNode = cursorNodes[0], 8203 === cursorFormat.firstChild.textContent.charCodeAt(0) && 3 === cursorFormat.firstChild.nodeType) {
var regEx = RegExp("​", 'g'), emptySpaceNode = void 0;
var regEx = RegExp(String.fromCharCode(8203), 'g'), emptySpaceNode = void 0;
cursorFormat.firstChild === cursorNode ? (cursorNode.textContent = cursorFormat.parentElement && (domNode.isBlockNode(cursorFormat.parentElement) && cursorFormat.parentElement.textContent.length <= 1 ? cursorFormat.parentElement.childElementCount > 1 : 0 === cursorFormat.childElementCount) && (cursorFormat.parentElement.textContent.length > 1 || cursorFormat.parentElement.firstChild && 1 === cursorFormat.parentElement.firstChild.nodeType) ? cursorNode.textContent : cursorNode.textContent.replace(regEx, ''), emptySpaceNode = cursorNode) : (cursorFormat.firstChild.textContent = cursorFormat.firstChild.textContent.replace(regEx, ''), emptySpaceNode = cursorFormat.firstChild);
var pointer = void 0;
if (0 === emptySpaceNode.textContent.length) {
Expand Down Expand Up @@ -15517,7 +15517,7 @@
}, HtmlEditor.prototype.onSelectionRestore = function(e) {
this.parent.isBlur = !1, this.contentRenderer.getEditPanel().focus(), ((0, ej2_base.le)(e.items) || e.items) && this.saveSelection.restore();
}, HtmlEditor.prototype.onKeyUp = function(e) {
var pointer, args = e.args, range = this.parent.getRange(), regEx = RegExp("​", 'g');
var pointer, args = e.args, range = this.parent.getRange(), regEx = RegExp(String.fromCharCode(8203), 'g');
!(0 > [
8,
9,
Expand Down Expand Up @@ -28330,11 +28330,11 @@
return this.getSelectionNodesBr(this.getNodeCollection(range));
}, NodeSelection.prototype.getSelectionNodes = function(nodeCollection) {
nodeCollection = nodeCollection.reverse();
for(var regEx = RegExp("​", 'g'), index = 0; index < nodeCollection.length; index++)(3 !== nodeCollection[index].nodeType || '' === nodeCollection[index].textContent.trim() || 1 === nodeCollection[index].textContent.length && nodeCollection[index].textContent.match(regEx)) && (nodeCollection.splice(index, 1), index--);
for(var regEx = RegExp(String.fromCharCode(8203), 'g'), index = 0; index < nodeCollection.length; index++)(3 !== nodeCollection[index].nodeType || '' === nodeCollection[index].textContent.trim() || 1 === nodeCollection[index].textContent.length && nodeCollection[index].textContent.match(regEx)) && (nodeCollection.splice(index, 1), index--);
return nodeCollection.reverse();
}, NodeSelection.prototype.getSelectionNodesBr = function(nodeCollection) {
nodeCollection = nodeCollection.reverse();
for(var regEx = RegExp("​", 'g'), index = 0; index < nodeCollection.length; index++)'BR' !== nodeCollection[index].nodeName && (3 !== nodeCollection[index].nodeType || '' === nodeCollection[index].textContent.trim() || 1 === nodeCollection[index].textContent.length && nodeCollection[index].textContent.match(regEx)) && (nodeCollection.splice(index, 1), index--);
for(var regEx = RegExp(String.fromCharCode(8203), 'g'), index = 0; index < nodeCollection.length; index++)'BR' !== nodeCollection[index].nodeName && (3 !== nodeCollection[index].nodeType || '' === nodeCollection[index].textContent.trim() || 1 === nodeCollection[index].textContent.length && nodeCollection[index].textContent.match(regEx)) && (nodeCollection.splice(index, 1), index--);
return nodeCollection.reverse();
}, NodeSelection.prototype.getInsertNodeCollection = function(range) {
return this.getInsertNodes(this.getNodeCollection(range));
Expand Down