From 573418fc96edbf3f2c5e1a0c4e83a68b4c80b4e1 Mon Sep 17 00:00:00 2001 From: Austaras Date: Tue, 27 Sep 2022 13:50:35 +0800 Subject: [PATCH] fix(es/resolver): Use a separate mark for the name of `FnExpr` (#5959) --- .../quagga2/1.4.2/1/output.mangleOnly.js | 146 +++++------ .../output.mangleOnly.js | 16 +- .../output.mangleOnly.js | 232 +++++++++--------- .../output.mangleOnly.js | 128 +++++----- .../next/wrap-contracts/output.mangleOnly.js | 28 +-- .../collapse_rhs_lhs_2/output.js | 5 +- .../collapse_rhs_lhs_2/output.mangleOnly.js | 6 +- .../collapse_vars/issue_2313_2/output.js | 10 +- .../issue_2313_2/output.mangleOnly.js | 6 +- .../issue_1709/output.mangleOnly.js | 24 +- .../issue_1715_4/output.mangleOnly.js | 2 +- .../output.mangleOnly.js | 10 +- .../output.mangleOnly.js | 10 +- .../inverted_var/output.mangleOnly.js | 69 +++--- .../duplicate_lambda_arg_name/output.js | 8 +- .../output.mangleOnly.js | 8 +- .../src/resolver/mod.rs | 18 +- .../tests/resolver/class/nested/var/output.js | 6 +- .../export/default/fn_decl/scope/output.js | 4 +- .../tests/resolver/fn_expr/scope/output.js | 4 +- .../tests/resolver/issues/271/output.js | 4 +- .../tests/resolver/issues/292/1/output.js | 10 +- .../tests/resolver/issues/292/2/output.js | 10 +- .../tests/resolver/issues/438/output.js | 6 +- .../tests/resolver/minifier/15/output.js | 8 +- .../tests/resolver/minifier/16/output.js | 14 +- 26 files changed, 388 insertions(+), 404 deletions(-) diff --git a/crates/swc_ecma_minifier/tests/fixture/issues/quagga2/1.4.2/1/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/fixture/issues/quagga2/1.4.2/1/output.mangleOnly.js index 04cbd7b40168..a546fdaa2a99 100644 --- a/crates/swc_ecma_minifier/tests/fixture/issues/quagga2/1.4.2/1/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/fixture/issues/quagga2/1.4.2/1/output.mangleOnly.js @@ -276,7 +276,7 @@ a.rad = e / n.length; a.vec = o.clone([ Math.cos(a.rad), - Math.sin(a.rad), + Math.sin(a.rad) ]); } function f() { @@ -578,7 +578,7 @@ var i = []; var u = 0; var c = 0; - function t(t, n) { + function f(t, n) { var a; var o; var i; @@ -616,12 +616,12 @@ o = []; c = u; o.push(e[c]); - while((c = t(c, true)) !== null){ + while((c = f(c, true)) !== null){ o.push(e[c]); } if (u > 0) { c = u; - while((c = t(c, false)) !== null){ + while((c = f(c, false)) !== null){ o.push(e[c]); } } @@ -1082,21 +1082,21 @@ return r; }, max: function t(e) { - var t = 0; - for(var r = 0; r < e.length; r++){ - if (e[r] > t) { - t = e[r]; + var r = 0; + for(var n = 0; n < e.length; n++){ + if (e[n] > r) { + r = e[n]; } } - return t; + return r; }, sum: function t(e) { var r = e.length; - var t = 0; + var n = 0; while(r--){ - t += e[r]; + n += e[r]; } - return t; + return n; } }; }, @@ -1280,7 +1280,7 @@ l.rad = x > _ ? x - _ : x; l.vec = p.clone([ Math.cos(x), - Math.sin(x), + Math.sin(x) ]); m.push(l); } @@ -1367,7 +1367,7 @@ } l.putImageData(v, n.x, n.y); } - }, + } ]); return t; })(); @@ -1516,7 +1516,7 @@ [ -1, 1 - ], + ] ], create: function t(e, r) { var n = e.data; @@ -1729,7 +1729,7 @@ Math.cos(e), Math.sin(e), -Math.sin(e), - Math.cos(e), + Math.cos(e) ]); for(r = 0; r < t.length; r++){ i = t[r]; @@ -1779,7 +1779,7 @@ [ c, v - ], + ] ]; if (true && d.debug.boxFromPatches.showTransformedBox) { s["a"].drawPath(h, { @@ -1993,12 +1993,12 @@ ]), n["clone"]([ r + y.size.x, - a + y.size.y, + a + y.size.y ]), n["clone"]([ r, a + y.size.y - ]), + ]) ], moments: c, rad: i, @@ -4909,7 +4909,7 @@ this.tryEntries = [ { tryLoc: "root" - }, + } ]; t.forEach(E, this); this.reset(true); @@ -5971,7 +5971,7 @@ } return r; } - }, + } ], [ { key: "Exception", @@ -5982,7 +5982,7 @@ PatternNotFoundException: "Pattern could not be found!" }; } - }, + } ]); return t; })(); @@ -6888,7 +6888,7 @@ 1, 1, 2 - ], + ] ]); M()(m()(t), "SINGLE_CODE_ERROR", 0.64); M()(m()(t), "AVG_CODE_ERROR", 0.3); @@ -7219,7 +7219,7 @@ } return i / o; } - }, + } ]); return r; })(P); @@ -7416,7 +7416,7 @@ 1, 1, 3 - ], + ] ]; var G = [ 0, @@ -7741,7 +7741,7 @@ format: this.FORMAT }); } - }, + } ]); return r; })(P); @@ -7820,7 +7820,7 @@ 0x0a8, 0x0a2, 0x08a, - 0x02a, + 0x02a ]); var tr = 0x094; var tn = (function(t) { @@ -7853,7 +7853,7 @@ 0, 0, 0, - 0, + 0 ]); var a = 0; var o = false; @@ -7967,7 +7967,7 @@ 0, 0, 0, - 0, + 0 ]); var a = []; r = this._findStart(); @@ -8008,7 +8008,7 @@ format: this.FORMAT }; } - }, + } ]); return r; })(P); @@ -8089,7 +8089,7 @@ a.code = o; return a; } - }, + } ]); return r; })(ta); @@ -8138,7 +8138,7 @@ 65, 66, 67, - 68, + 68 ]; var tp = [ 0x003, @@ -8160,7 +8160,7 @@ 0x01a, 0x029, 0x00b, - 0x00e, + 0x00e ]; var tg = [ 0x01a, @@ -8441,7 +8441,7 @@ format: this.FORMAT }; } - }, + } ]); return r; })(P); @@ -8496,7 +8496,7 @@ } return null; } - }, + } ]); return r; })(Q); @@ -8568,7 +8568,7 @@ } return a; } - }, + } ]); return r; })(Q); @@ -8656,7 +8656,7 @@ start: s.start }; } - }, + } ]); return r; })(Q); @@ -8695,7 +8695,7 @@ 3, 10, 9, - 5, + 5 ]; function tL(t) { for(var e = 0; e < 10; e++){ @@ -8780,7 +8780,7 @@ start: s.start }; } - }, + } ]); return r; })(Q); @@ -8875,7 +8875,7 @@ 21, 22, 26 - ], + ] ]); M()(m()(t), "STOP_PATTERN", [ (1 / 6) * 7, @@ -8883,7 +8883,7 @@ (1 / 6) * 7, (1 / 6) * 7, (1 / 6) * 7, - (1 / 6) * 7, + (1 / 6) * 7 ]); M()(m()(t), "FORMAT", "upc_e"); return t; @@ -8995,7 +8995,7 @@ } return null; } - }, + } ]); return r; })(Q); @@ -9122,7 +9122,7 @@ tY, tZ, tY - ], + ] ]); M()(m()(n), "MAX_CORRECTION_FACTOR", 5); M()(m()(n), "FORMAT", "i2of5"); @@ -9329,7 +9329,7 @@ 0, 0, 0 - ], + ] ]; var u = null; while(a < o){ @@ -9391,7 +9391,7 @@ format: this.FORMAT }; } - }, + } ]); return r; })(P); @@ -9428,14 +9428,14 @@ t2, t1, t1, - t1, + t1 ]; var t4 = [ t2, t1, t1, t1, - t2, + t2 ]; var t5 = [ [ @@ -9443,71 +9443,71 @@ t1, t2, t2, - t1, + t1 ], [ t2, t1, t1, t1, - t2, + t2 ], [ t1, t2, t1, t1, - t2, + t2 ], [ t2, t2, t1, t1, - t1, + t1 ], [ t1, t1, t2, t1, - t2, + t2 ], [ t2, t1, t2, t1, - t1, + t1 ], [ t1, t2, t2, t1, - t1, + t1 ], [ t1, t1, t1, t2, - t2, + t2 ], [ t2, t1, t1, t2, - t1, + t1 ], [ t1, t2, t1, t2, - t1, - ], + t1 + ] ]; var t6 = t3.reduce(function(t, e) { return t + e; @@ -9737,7 +9737,7 @@ format: this.FORMAT }; } - }, + } ]); return r; })(P); @@ -9818,7 +9818,7 @@ 0x1da, 0x1d6, 0x132, - 0x15e, + 0x15e ]); var ea = 0x15e; var eo = (function(t) { @@ -9883,7 +9883,7 @@ 0, 0, 0, - 0, + 0 ]); var a = 0; var o = false; @@ -10025,7 +10025,7 @@ 0, 0, 0, - 0, + 0 ]); var a = []; var o = this._nextSet(this._row, r.end); @@ -10069,7 +10069,7 @@ format: this.FORMAT }; } - }, + } ]); return r; })(P); @@ -10164,7 +10164,7 @@ a.code = i; return a; } - }, + } ]); return r; })(ta); @@ -10280,7 +10280,7 @@ { node: n.dom.pattern, prop: e.debug.showPattern - }, + } ]; for(t = 0; t < r.length; t++){ if (r[t].prop === true) { @@ -10318,7 +10318,7 @@ { x: (t[3][0] - t[2][0]) / 2 + t[2][0], y: (t[3][1] - t[2][1]) / 2 + t[2][1] - }, + } ]; } function l(t) { @@ -10681,7 +10681,7 @@ "height", "facingMode", "aspectRatio", - "deviceId", + "deviceId" ]); if (typeof t.minAspectRatio !== "undefined" && t.minAspectRatio > 0) { e.aspectRatio = t.minAspectRatio; @@ -10983,12 +10983,12 @@ ]), Object(eJ["clone"])([ n.size.x, - n.size.y, + n.size.y ]), Object(eJ["clone"])([ n.size.x, 0 - ]), + ]) ]; e2["a"].init(n, r); return { @@ -11786,7 +11786,7 @@ e = __factorySource__; } t = new Blob([ - "(" + rC.toString() + ")(" + e + ");", + "(" + rC.toString() + ")(" + e + ");" ], { type: "text/javascript" }); @@ -12057,8 +12057,8 @@ Object(eJ["clone"])(this.context.boxSize[0]), Object(eJ["clone"])(this.context.boxSize[1]), Object(eJ["clone"])(this.context.boxSize[2]), - Object(eJ["clone"])(this.context.boxSize[3]), - ], + Object(eJ["clone"])(this.context.boxSize[3]) + ] ]; } }, @@ -12235,7 +12235,7 @@ } rk(e, r); } - }, + } ]); return t; })(); diff --git a/crates/swc_ecma_minifier/tests/fixture/next/31077/static/chunks/1606726a.10299989c08cb523/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/fixture/next/31077/static/chunks/1606726a.10299989c08cb523/output.mangleOnly.js index e862d2431e31..e2f81e482971 100644 --- a/crates/swc_ecma_minifier/tests/fixture/next/31077/static/chunks/1606726a.10299989c08cb523/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/fixture/next/31077/static/chunks/1606726a.10299989c08cb523/output.mangleOnly.js @@ -51,7 +51,7 @@ s.webkit = "webkitFontSmoothing" in document.documentElement.style; s.webkit_version = s.webkit && +(/\bAppleWebKit\/(\d+)/.exec(navigator.userAgent) || [ 0, - 0, + 0 ])[1]; } var u = function(e) { @@ -4644,19 +4644,19 @@ rc.prototype.locals = function e(t) { var r, n = true; for(var o = 0; o < this.members.length; o++){ - var e = this.members[o].localsInner(t); - if (!e.length) { + var i = this.members[o].localsInner(t); + if (!i.length) { continue; } if (!r) { - r = e; + r = i; } else { if (n) { r = r.slice(); n = false; } - for(var i = 0; i < e.length; i++){ - r.push(e[i]); + for(var s = 0; s < i.length; s++){ + r.push(i[s]); } } } @@ -4866,7 +4866,7 @@ }); if (e.cursorWrapper) { t.push(ra.create(e.state.doc, [ - e.cursorWrapper.deco, + e.cursorWrapper.deco ])); } return rc.from(t); @@ -5226,5 +5226,5 @@ } } } - }, + } ]); diff --git a/crates/swc_ecma_minifier/tests/fixture/next/33265/static/chunks/d6e1aeb5-38a8d7ae57119c23/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/fixture/next/33265/static/chunks/d6e1aeb5-38a8d7ae57119c23/output.mangleOnly.js index ea1bc6797533..6e92775f761c 100644 --- a/crates/swc_ecma_minifier/tests/fixture/next/33265/static/chunks/d6e1aeb5-38a8d7ae57119c23/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/fixture/next/33265/static/chunks/d6e1aeb5-38a8d7ae57119c23/output.mangleOnly.js @@ -75,7 +75,7 @@ "fullscreenEnabled", "fullscreenchange", "fullscreenerror", - "fullscreen", + "fullscreen" ], [ "webkitRequestFullscreen", @@ -84,7 +84,7 @@ "webkitFullscreenEnabled", "webkitfullscreenchange", "webkitfullscreenerror", - "-webkit-full-screen", + "-webkit-full-screen" ], [ "mozRequestFullScreen", @@ -93,7 +93,7 @@ "mozFullScreenEnabled", "mozfullscreenchange", "mozfullscreenerror", - "-moz-full-screen", + "-moz-full-screen" ], [ "msRequestFullscreen", @@ -102,8 +102,8 @@ "msFullscreenEnabled", "MSFullscreenChange", "MSFullscreenError", - "-ms-fullscreen", - ], + "-ms-fullscreen" + ] ]; var j = F[0]; var H; @@ -537,7 +537,7 @@ "left", "right", "top", - "width", + "width" ].forEach(function(e) { if (t[e] !== undefined) { i[e] = t[e]; @@ -2153,7 +2153,7 @@ [ "setIntervalIds_", "clearInterval" - ], + ] ].forEach(function(e) { var i = e[0], r = e[1]; t[i].forEach(function(e, i) { @@ -2302,7 +2302,7 @@ "MEDIA_ERR_NETWORK", "MEDIA_ERR_DECODE", "MEDIA_ERR_SRC_NOT_SUPPORTED", - "MEDIA_ERR_ENCRYPTED", + "MEDIA_ERR_ENCRYPTED" ]; tX.defaultMessages = { 1: "You aborted the media playback", @@ -2331,7 +2331,7 @@ "id", "inBandMetadataTrackDispatchType", "mode", - "src", + "src" ].reduce(function(e, i, r) { if (t[i]) { e[i] = t[i]; @@ -2493,21 +2493,21 @@ }; i.closeable = function e(t) { if (typeof t === "boolean") { - var e = (this.closeable_ = !!t); - var i = this.getChild("closeButton"); - if (e && !i) { - var r = this.contentEl_; + var i = (this.closeable_ = !!t); + var r = this.getChild("closeButton"); + if (i && !r) { + var n = this.contentEl_; this.contentEl_ = this.el_; - i = this.addChild("closeButton", { + r = this.addChild("closeButton", { controlText: "Close Modal Dialog" }); - this.contentEl_ = r; - this.on(i, "close", this.close_); + this.contentEl_ = n; + this.on(r, "close", this.close_); } - if (!e && i) { - this.off(i, "close", this.close_); - this.removeChild(i); - i.dispose(); + if (!i && r) { + this.off(r, "close", this.close_); + this.removeChild(r); + r.dispose(); } } return this.closeable_; @@ -3034,7 +3034,7 @@ "pathname", "search", "hash", - "host", + "host" ]; var r = s().createElement("a"); r.href = t; @@ -4217,7 +4217,7 @@ t = [ iJ({ src: t - }), + }) ]; } else if (ee(t) && typeof t.src === "string" && t.src && t.src.trim()) { t = [ @@ -4728,7 +4728,7 @@ var n = eL("span", { className: "vjs-control-text", textContent: this.localize("{1} is loading.", [ - r, + r ]) }); var a = e.prototype.createEl.call(this, "div", { @@ -5737,7 +5737,7 @@ if (r.currentTime_ !== e || r.duration_ !== i) { r.el_.setAttribute("aria-valuetext", r.localize("progress bar timing: currentTime={1} duration={2}", [ ru(e, i), - ru(i, i), + ru(i, i) ], "{1} of {2}")); r.currentTime_ = e; r.duration_ = i; @@ -7222,7 +7222,7 @@ if ([ "captions", "descriptions", - "subtitles", + "subtitles" ].indexOf(s.kind) > -1 && s.mode === "showing") { r = false; break; @@ -7870,7 +7870,7 @@ "descriptionsButton", "subsCapsButton", "audioTrackButton", - "fullscreenToggle", + "fullscreenToggle" ] }; if ("exitPictureInPicture" in s()) { @@ -7962,7 +7962,7 @@ ne, ns, nr, - nt, + nt ] }, backgroundOpacity: { @@ -7987,7 +7987,7 @@ ne, ns, nr, - nt, + nt ] }, edgeStyle: { @@ -8014,7 +8014,7 @@ [ "dropshadow", "Dropshadow" - ], + ] ] }, fontFamily: { @@ -8049,7 +8049,7 @@ [ "small-caps", "Small Caps" - ], + ] ] }, fontPercent: { @@ -8092,7 +8092,7 @@ [ "4.00", "400%" - ], + ] ], default: 2, parser: function e(t) { @@ -8205,14 +8205,14 @@ "<" + r + ' id="' + s + '" class="' + (r === "label" ? "vjs-label" : "") + '">', this.localize(a.label), "", - '' ].concat(a.options.map(function(e) { var t = s + "-" + e[1].replace(/\W+/g, ""); return [ '", + "" ].join(""); })).concat("").join(""); }; @@ -8227,7 +8227,7 @@ '', this.createElSelect_("textOpacity", t), "", - "", + "" ].join(""); }; i.createElBgColor_ = function e() { @@ -8241,7 +8241,7 @@ '', this.createElSelect_("backgroundOpacity", t), "", - "", + "" ].join(""); }; i.createElWinColor_ = function e() { @@ -8255,7 +8255,7 @@ '', this.createElSelect_("windowOpacity", t), "", - "", + "" ].join(""); }; i.createElColors_ = function e() { @@ -8264,7 +8264,7 @@ innerHTML: [ this.createElFgColor_(), this.createElBgColor_(), - this.createElWinColor_(), + this.createElWinColor_() ].join("") }); }; @@ -8280,7 +8280,7 @@ "", '
', this.createElSelect_("fontFamily", "", "legend"), - "
", + "" ].join("") }); }; @@ -8293,7 +8293,7 @@ this.localize("Reset"), ' ' + t + "", "", - '", + '" ].join("") }); }; @@ -8301,7 +8301,7 @@ return [ this.createElColors_(), this.createElFont_(), - this.createElControls_(), + this.createElControls_() ]; }; i.label = function e() { @@ -8735,7 +8735,7 @@ t.el(), n().HTMLMediaElement.prototype, n().Element.prototype, - ny, + ny ], "innerHTML"); }; var nS = function e(t) { @@ -8794,7 +8794,7 @@ return nT([ t.el(), n().HTMLMediaElement.prototype, - nk, + nk ], "src"); }; var nE = function e(t) { @@ -9095,7 +9095,7 @@ "loop", "muted", "playsinline", - "autoplay", + "autoplay" ]; for(var u = 0; u < o.length; u++){ var l = o[u]; @@ -9461,7 +9461,7 @@ "pause", "ratechange", "resize", - "volumechange", + "volumechange" ]; [ [ @@ -9491,7 +9491,7 @@ [ "featuresNativeAudioTracks", "supportsNativeAudioTracks" - ], + ] ].forEach(function(e) { var t = e[0], i = e[1]; nw(nI.prototype, t, function() { @@ -9566,7 +9566,7 @@ "autoplay", "controls", "loop", - "playsinline", + "playsinline" ].forEach(function(e) { nI.prototype[e] = function() { return this.el_[e] || this.el_.hasAttribute(e); @@ -9577,7 +9577,7 @@ "defaultMuted", "autoplay", "loop", - "playsinline", + "playsinline" ].forEach(function(e) { nI.prototype["set" + tB(e)] = function(t) { this.el_[e] = t; @@ -9607,7 +9607,7 @@ "readyState", "videoWidth", "videoHeight", - "crossOrigin", + "crossOrigin" ].forEach(function(e) { nI.prototype[e] = function() { return this.el_[e]; @@ -9621,7 +9621,7 @@ "playbackRate", "defaultPlaybackRate", "disablePictureInPicture", - "crossOrigin", + "crossOrigin" ].forEach(function(e) { nI.prototype["set" + tB(e)] = function(t) { this.el_[e] = t; @@ -9630,7 +9630,7 @@ [ "pause", "load", - "play", + "play" ].forEach(function(e) { nI.prototype[e] = function() { return this.el_[e](); @@ -9671,7 +9671,7 @@ "timeupdate", "resize", "volumechange", - "texttrackchange", + "texttrackchange" ]; var nA = { canplay: "CanPlay", @@ -9686,7 +9686,7 @@ "medium", "large", "xlarge", - "huge", + "huge" ]; var nD = {}; nL.forEach(function(e) { @@ -10851,11 +10851,11 @@ return (Math.floor(this.duration()) - Math.floor(this.currentTime())); }; i.buffered = function e() { - var e = this.techGet_("buffered"); - if (!e || !e.length) { - e = tZ(0, 0); + var t = this.techGet_("buffered"); + if (!t || !t.length) { + t = tZ(0, 0); } - return e; + return t; }; i.bufferedPercent = function e() { return tQ(this.buffered(), this.duration()); @@ -11085,7 +11085,7 @@ "hidden", "radio", "reset", - "submit", + "submit" ]; if (i === "input") { return r.indexOf(t.type) === -1; @@ -11780,7 +11780,7 @@ { src: s, type: iX(s) - }, + } ]; } if (o) { @@ -11818,7 +11818,7 @@ { src: n.poster, type: iX(n.poster) - }, + } ]; } return n; @@ -11926,7 +11926,7 @@ "controlBar", "errorDisplay", "textTrackSettings", - "resizeManager", + "resizeManager" ], language: (nR && ((nR.languages && nR.languages[0]) || nR.userLanguage || nR.language)) || "en", languages: {}, @@ -11945,7 +11945,7 @@ "seeking", "seekable", "networkState", - "readyState", + "readyState" ].forEach(function(e) { nM.prototype[e] = function() { return this.techGet_(e); @@ -12307,7 +12307,7 @@ "getAttributes", "emptyEl", "appendContent", - "insertContent", + "insertContent" ].forEach(function(e) { nZ[e] = function() { K.warn("videojs." + e + "() is deprecated; use videojs.dom." + e + "() instead"); @@ -12344,7 +12344,7 @@ if (i(t.start(n), t.end(n))) { r.push([ t.start(n), - t.end(n), + t.end(n) ]); } } @@ -12969,7 +12969,7 @@ "serverControl", "renditionReports", "partInf", - "partTargetDuration", + "partTargetDuration" ].forEach(function(e) { if (c.hasOwnProperty(e)) { delete c[e]; @@ -13081,7 +13081,7 @@ id: r, resolvedUri: i, attributes: {} - }, + } ] }; a.playlists[r] = a.playlists[0]; @@ -13109,7 +13109,7 @@ } } e.playlists = [ - (0, o.Z)({}, e), + (0, o.Z)({}, e) ]; } e.playlists.forEach(function(e, i) { @@ -13769,7 +13769,7 @@ return [ i.length, i.offset, - t.resolvedUri, + t.resolvedUri ].join(","); }; var a3 = function e(t) { @@ -14803,7 +14803,7 @@ e.charCodeAt(0), e.charCodeAt(1), e.charCodeAt(2), - e.charCodeAt(3), + e.charCodeAt(3) ]; } } @@ -14811,13 +14811,13 @@ "i".charCodeAt(0), "s".charCodeAt(0), "o".charCodeAt(0), - "m".charCodeAt(0), + "m".charCodeAt(0) ]); x = new Uint8Array([ "a".charCodeAt(0), "v".charCodeAt(0), "c".charCodeAt(0), - "1".charCodeAt(0), + "1".charCodeAt(0) ]); I = new Uint8Array([ 0, @@ -15071,7 +15071,7 @@ 0x55, 0xc4, 0x00, - 0x00, + 0x00 ]); if (t.samplerate) { i[12] = (t.samplerate >>> 24) & 0xff; @@ -15255,7 +15255,7 @@ 0x00, 0x00, 0x00, - 0x01, + 0x01 ]), n.type === "video" ? e(n) : t(n)); }; e = function e(t) { @@ -15376,7 +15376,7 @@ 0x2d, 0xc6, 0xc0 - ])), + ])) ]; if (t.sarRatio) { var l = t.sarRatio[0], d = t.sarRatio[1]; @@ -15388,7 +15388,7 @@ (d & 0xff000000) >> 24, (d & 0xff0000) >> 16, (d & 0xff00) >> 8, - d & 0xff, + d & 0xff ]))); } return r.apply(null, u); @@ -15557,7 +15557,7 @@ (d >>> 24) & 0xff, (d >>> 16) & 0xff, (d >>> 8) & 0xff, - d & 0xff, + d & 0xff ])); u = 32 + 20 + 8 + 16 + 8 + 8; if (t.type === "audio") { @@ -15909,7 +15909,7 @@ 8, 17, 191, - 252, + 252 ]; var $ = function e(t) { var i = []; @@ -15939,7 +15939,7 @@ $(154), [ 56 - ], + ] ], 88200: [ X, @@ -15960,7 +15960,7 @@ $(240), [ 56 - ], + ] ], 48000: [ X, @@ -15977,7 +15977,7 @@ $(54), [ 112 - ], + ] ], 44100: [ X, @@ -15994,7 +15994,7 @@ $(84), [ 112 - ], + ] ], 32000: [ X, @@ -16010,7 +16010,7 @@ $(226), [ 112 - ], + ] ], 24000: [ X, @@ -16032,7 +16032,7 @@ $(126), [ 224 - ], + ] ], 16000: [ X, @@ -16060,7 +16060,7 @@ [ 1, 192 - ], + ] ], 12000: [ Y, @@ -16091,7 +16091,7 @@ $(259), [ 56 - ], + ] ], 11025: [ Y, @@ -16128,7 +16128,7 @@ $(108), [ 112 - ], + ] ], 8000: [ Y, @@ -16141,7 +16141,7 @@ $(47), [ 7 - ], + ] ] }; ee = J(t); @@ -17203,7 +17203,7 @@ 0x1300, 0x1320, 0x1400, - 0x1420, + 0x1420 ]; var ej = function e() { var t = [], i = eN + 1; @@ -17817,7 +17817,7 @@ this.packetsWaitingForPmt.push([ e, r, - i, + i ]); } else { this.processPes_(e, r, i); @@ -18034,7 +18034,7 @@ 12000, 11025, 8000, - 7350, + 7350 ]; tr = function e(t) { var i, r = 0; @@ -18559,7 +18559,7 @@ { _ = [ (s.readUnsignedByte() << 8) | s.readUnsignedByte(), - (s.readUnsignedByte() << 8) | s.readUnsignedByte(), + (s.readUnsignedByte() << 8) | s.readUnsignedByte() ]; break; } @@ -18597,7 +18597,7 @@ 12000, 11025, 8000, - 7350, + 7350 ]; var tf = function e(t, i) { var r = (t[i + 6] << 21) | (t[i + 7] << 14) | (t[i + 8] << 7) | t[i + 9], n = t[i + 5], a = (n & 16) >> 4; @@ -18772,7 +18772,7 @@ "channelcount", "samplerate", "samplingfrequencyindex", - "samplesize", + "samplesize" ]; var tI = tw; var tx = [ @@ -18781,7 +18781,7 @@ "profileIdc", "levelIdc", "profileCompatibility", - "sarRatio", + "sarRatio" ]; var tP = tx; var tA = tc.H264Stream; @@ -20076,13 +20076,13 @@ "mdia", "minf", "stbl", - "stsd", + "stsd" ])[0]; if (u) { var l = u.subarray(8); t.codec = tG(l.subarray(4, 8)); var d = tQ(l, [ - t.codec, + t.codec ])[0]; var c, h; if (d) { @@ -20600,7 +20600,7 @@ type: "audio", dts: a + r * 1024 * d, pts: a + r * 1024 * d - }, + } ] }; return c; @@ -21124,7 +21124,7 @@ a.byteOffset = u ? 0 : t.data.byteOffset; a.byteLength = t.data.byteLength; var l = [ - u ? t.data : t.data.buffer, + u ? t.data : t.data.buffer ]; i.postMessage(a, l); } else { @@ -21215,7 +21215,7 @@ o.getUint32(0), o.getUint32(4), o.getUint32(8), - o.getUint32(12), + o.getUint32(12) ]); for(var l = 0; l < i.length; l++){ i[l].bytes = u; @@ -23686,7 +23686,7 @@ 0, 0, 0, - t.mediaIndex + t.playlist.mediaSequence, + t.mediaIndex + t.playlist.mediaSequence ]); n.key = this.segmentKey(i.key); n.key.iv = s; @@ -25029,7 +25029,7 @@ } return null; } - }, + } ]; var o6 = (function(e) { (0, l.Z)(t, e); @@ -25406,7 +25406,7 @@ [], [], [] - ], + ] ]; var i = t[0]; var r = t[1]; @@ -25457,15 +25457,15 @@ u[0][1].slice(), u[0][2].slice(), u[0][3].slice(), - u[0][4].slice(), + u[0][4].slice() ], [ u[1][0].slice(), u[1][1].slice(), u[1][2].slice(), u[1][3].slice(), - u[1][4].slice(), - ], + u[1][4].slice() + ] ]; var t; var i; @@ -25621,7 +25621,7 @@ c(o[l - 4]), c(o[l - 3]), c(o[l - 2]), - c(o[l - 1]), + c(o[l - 1]) ]); this.asyncStream_.push(this.decryptChunk_(o.subarray(l, l + a), i, r, u)); } @@ -25642,7 +25642,7 @@ get: function e() { return 32000; } - }, + } ]); return e; })(); @@ -26190,7 +26190,7 @@ "mediaRequestsErrored", "mediaTransferDuration", "mediaBytesTransferred", - "mediaAppends", + "mediaAppends" ]; var uy = function e(t) { return (this.audioSegmentLoader_[t] + this.mainSegmentLoader_[t]); @@ -27013,7 +27013,7 @@ if (l.attributes.SUBTITLES !== r.attributes.SUBTITLES) { this.delegateLoaders_("subtitle", [ "abort", - "pause", + "pause" ]); } this.delegateLoaders_("main", [ @@ -27155,8 +27155,8 @@ this.seekable_ = nZ.createTimeRanges([ [ t.start(0) > a.start(0) ? t.start(0) : a.start(0), - t.end(0) < a.end(0) ? t.end(0) : a.end(0), - ], + t.end(0) < a.end(0) ? t.end(0) : a.end(0) + ] ]); } if (this.seekable_ && this.seekable_.length) { @@ -27512,7 +27512,7 @@ "seeked", "pause", "playing", - "error", + "error" ]; var uw = (function() { function e(e) { @@ -28117,7 +28117,7 @@ }); return Promise.race([ Promise.all(u), - Promise.race(l), + Promise.race(l) ]); }; var uq = function e(t) { @@ -28181,7 +28181,7 @@ "application/x-mpegurl", "video/x-mpegurl", "video/mpegurl", - "application/mpegurl", + "application/mpegurl" ]; return t.some(function(t) { return /maybe|probably/i.test(e.canPlayType(t)); @@ -28272,7 +28272,7 @@ "fullscreenchange", "webkitfullscreenchange", "mozfullscreenchange", - "MSFullscreenChange", + "MSFullscreenChange" ], function(e) { var t = s().fullscreenElement || s().webkitFullscreenElement || s().mozFullScreenElement || s().msFullscreenElement; if (t && t.contains(n.tech_.el())) { @@ -28360,7 +28360,7 @@ "experimentalLLHLS", "useNetworkInformationApi", "experimentalExactManifestTimings", - "experimentalLeastPixelDiffSelector", + "experimentalLeastPixelDiffSelector" ].forEach(function(e) { if (typeof t.source_[e] !== "undefined") { t.options_[e] = t.source_[e]; @@ -28862,5 +28862,5 @@ } t["Z"] = nZ; } - }, + } ]); diff --git a/crates/swc_ecma_minifier/tests/fixture/next/33265/static/chunks/pages/index-cb36c1bf7f830e3c/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/fixture/next/33265/static/chunks/pages/index-cb36c1bf7f830e3c/output.mangleOnly.js index f8aaba712941..b921ad9cf7cc 100644 --- a/crates/swc_ecma_minifier/tests/fixture/next/33265/static/chunks/pages/index-cb36c1bf7f830e3c/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/fixture/next/33265/static/chunks/pages/index-cb36c1bf7f830e3c/output.mangleOnly.js @@ -110,7 +110,7 @@ p("0x10000000000"), p("0x1000000000000"), p("0x100000000000000"), - p("0x10000000000000000"), + p("0x10000000000000000") ]; var d = (function() { var e = new Uint16Array([ @@ -526,7 +526,7 @@ 0x48, 0x65, 0x61, - 0x64, + 0x64 ]); var u = function e(t) { var r = new DataView(t.buffer, t.byteOffset, t.byteLength); @@ -679,7 +679,7 @@ bytes: t }; } - }, + } ]; var v = function e(t, r, i) { if (i === void 0) { @@ -985,7 +985,7 @@ 0x1a, 0x45, 0xdf, - 0xa3, + 0xa3 ]), DocType: (0, n.Ki)([ 0x42, @@ -995,19 +995,19 @@ 0x18, 0x53, 0x80, - 0x67, + 0x67 ]), SegmentInfo: (0, n.Ki)([ 0x15, 0x49, 0xa9, - 0x66, + 0x66 ]), Tracks: (0, n.Ki)([ 0x16, 0x54, 0xae, - 0x6b, + 0x6b ]), Track: (0, n.Ki)([ 0xae @@ -1018,7 +1018,7 @@ DefaultDuration: (0, n.Ki)([ 0x23, 0xe3, - 0x83, + 0x83 ]), TrackEntry: (0, n.Ki)([ 0xae @@ -1046,7 +1046,7 @@ 0x1f, 0x43, 0xb6, - 0x75, + 0x75 ]), Timestamp: (0, n.Ki)([ 0xe7 @@ -1054,7 +1054,7 @@ TimestampScale: (0, n.Ki)([ 0x2a, 0xd7, - 0xb1, + 0xb1 ]), BlockGroup: (0, n.Ki)([ 0xa0 @@ -1278,12 +1278,12 @@ var n = C(t, [ E.Segment, E.Tracks, - E.Track, + E.Track ]); if (!n.length) { n = C(t, [ E.Tracks, - E.Track, + E.Track ]); } if (!n.length) { @@ -1314,7 +1314,7 @@ ])[0]), type: t, codecPrivate: C(e, [ - E.CodecPrivate, + E.CodecPrivate ])[0], number: bytesToNumber(C(e, [ E.TrackNumber @@ -1359,7 +1359,7 @@ [ 0x55, 0xb1 - ], + ] ])[0] || []; var l = C(e, [ 0xe0, @@ -1370,7 +1370,7 @@ [ 0x55, 0xb9 - ], + ] ])[0] || []; var h = C(e, [ 0xe0, @@ -1381,7 +1381,7 @@ [ 0x55, 0xba - ], + ] ])[0] || []; var p = C(e, [ 0xe0, @@ -1392,7 +1392,7 @@ [ 0x55, 0xbb - ], + ] ])[0] || []; if (c.length || l.length || h.length || p.length) { i += "." + padStart(p[0], 2, "0"); @@ -1446,7 +1446,7 @@ ])[0]; var a = C(i, [ E.SegmentInfo, - E.TimestampScale, + E.TimestampScale ])[0]; if (a && a.length) { a = bytesToNumber(a); @@ -1461,7 +1461,7 @@ } o.forEach(function(e, t) { var r = C(e, [ - E.SimpleBlock, + E.SimpleBlock ]).map(function(e) { return { type: "simple", @@ -1469,7 +1469,7 @@ }; }); var i = C(e, [ - E.BlockGroup, + E.BlockGroup ]).map(function(e) { return { type: "group", @@ -1500,17 +1500,17 @@ 0x00, 0x00, 0x00, - 0x01, + 0x01 ]); var P = (0, n.Ki)([ 0x00, 0x00, - 0x01, + 0x01 ]); var _ = (0, n.Ki)([ 0x00, 0x00, - 0x03, + 0x03 ]); var k = function e(t) { var r = []; @@ -1585,7 +1585,7 @@ 0x77, 0x65, 0x62, - 0x6d, + 0x6d ]), matroska: (0, n.Ki)([ 0x6d, @@ -1595,19 +1595,19 @@ 0x6f, 0x73, 0x6b, - 0x61, + 0x61 ]), flac: (0, n.Ki)([ 0x66, 0x4c, 0x61, - 0x43, + 0x43 ]), ogg: (0, n.Ki)([ 0x4f, 0x67, 0x67, - 0x53, + 0x53 ]), ac3: (0, n.Ki)([ 0x0b, @@ -1617,7 +1617,7 @@ 0x52, 0x49, 0x46, - 0x46, + 0x46 ]), avi: (0, n.Ki)([ 0x41, @@ -1628,7 +1628,7 @@ 0x57, 0x41, 0x56, - 0x45, + 0x45 ]), "3gp": (0, n.Ki)([ 0x66, @@ -1636,19 +1636,19 @@ 0x79, 0x70, 0x33, - 0x67, + 0x67 ]), mp4: (0, n.Ki)([ 0x66, 0x74, 0x79, - 0x70, + 0x70 ]), fmp4: (0, n.Ki)([ 0x73, 0x74, 0x79, - 0x70, + 0x70 ]), mov: (0, n.Ki)([ 0x66, @@ -1656,19 +1656,19 @@ 0x79, 0x70, 0x71, - 0x74, + 0x74 ]), moov: (0, n.Ki)([ 0x6d, 0x6f, 0x6f, - 0x76, + 0x76 ]), moof: (0, n.Ki)([ 0x6d, 0x6f, 0x6f, - 0x66, + 0x66 ]) }; var G = { @@ -1701,14 +1701,14 @@ webm: function e(t) { var r = C(t, [ E.EBML, - E.DocType, + E.DocType ])[0]; return (0, n.G3)(r, V.webm); }, mkv: function e(t) { var r = C(t, [ E.EBML, - E.DocType, + E.DocType ])[0]; return (0, n.G3)(r, V.matroska); }, @@ -1852,7 +1852,7 @@ var i = (0, n.Ki)([ 0x49, 0x44, - 0x33, + 0x33 ]); var a = function e(t, r) { if (r === void 0) { @@ -5001,7 +5001,7 @@ [ "CAN-SKIP-UNTIL", "PART-HOLD-BACK", - "HOLD-BACK", + "HOLD-BACK" ].forEach(function(e) { if (i.attributes.hasOwnProperty(e)) { i.attributes[e] = parseFloat(i.attributes[e]); @@ -5227,19 +5227,19 @@ } }, byterange: function t() { - var t = {}; + var r = {}; if ("length" in e) { - i.byterange = t; - t.length = e.length; + i.byterange = r; + r.length = e.length; if (!("offset" in e)) { e.offset = y; } } if ("offset" in e) { - i.byterange = t; - t.offset = e.offset; + i.byterange = r; + r.offset = e.offset; } - y = t.offset + t.length; + y = r.offset + r.length; }, endlist: function e() { this.manifest.endList = true; @@ -5296,7 +5296,7 @@ var r = [ "SAMPLE-AES", "SAMPLE-AES-CTR", - "SAMPLE-AES-CENC", + "SAMPLE-AES-CENC" ]; if (r.indexOf(e.attributes.METHOD) === -1) { this.trigger("warn", { @@ -5488,17 +5488,17 @@ var r = this; l = true; var n = this.manifest.segments.length; - var t = d(e.attributes); + var a = d(e.attributes); i.parts = i.parts || []; - i.parts.push(t); - if (t.byterange) { - if (!t.byterange.hasOwnProperty("offset")) { - t.byterange.offset = w; + i.parts.push(a); + if (a.byterange) { + if (!a.byterange.hasOwnProperty("offset")) { + a.byterange.offset = w; } - w = t.byterange.offset + t.byterange.length; + w = a.byterange.offset + a.byterange.length; } - var a = i.parts.length - 1; - this.warnOnMissingAttributes_("#EXT-X-PART #" + a + " for segment #" + n, e.attributes, [ + var o = i.parts.length - 1; + this.warnOnMissingAttributes_("#EXT-X-PART #" + o + " for segment #" + n, e.attributes, [ "URI", "DURATION" ]); @@ -5568,7 +5568,7 @@ var n = this.manifest.renditionReports.length - 1; var i = [ "LAST-MSN", - "URI", + "URI" ]; if (l) { i.push("LAST-PART"); @@ -5985,7 +5985,7 @@ resolvedUri: n.baseUrl || "", duration: n.sourceDuration, number: 0 - }, + } ]; n.duration = n.sourceDuration; } @@ -6271,7 +6271,7 @@ duration: t.sourceDuration, time: 0, timeline: t.periodIndex - }, + } ]; } if (t.duration) { @@ -6886,7 +6886,7 @@ "/", function() { return r(4816); - }, + } ]); if (false) {} }, @@ -6953,7 +6953,7 @@ { src: "https://d2zihajmogu5jn.cloudfront.net/bipbop-advanced/bipbop_16x9_variant.m3u8", type: "application/x-mpegurl" - }, + } ] }; var r = function(t) { @@ -7279,7 +7279,7 @@ n.alt("lineAlign", a[1], [ "start", "center", - "end", + "end" ]); } break; @@ -7290,7 +7290,7 @@ n.alt("positionAlign", a[1], [ "start", "center", - "end", + "end" ]); } break; @@ -7303,7 +7303,7 @@ "center", "end", "left", - "right", + "right" ]); break; } @@ -7888,7 +7888,7 @@ [ 0x10fffd, 0x10fffd - ], + ] ]; function m(e) { for(var t = 0; t < g.length; t++){ @@ -10513,5 +10513,5 @@ }); var r = e.O(); _N_E = r; - }, + } ]); diff --git a/crates/swc_ecma_minifier/tests/fixture/next/wrap-contracts/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/fixture/next/wrap-contracts/output.mangleOnly.js index 679336b09ff4..ba724951dee5 100644 --- a/crates/swc_ecma_minifier/tests/fixture/next/wrap-contracts/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/fixture/next/wrap-contracts/output.mangleOnly.js @@ -2777,20 +2777,20 @@ }; o._prime = function t(e) { if (x[e]) return x[e]; - var t; + var r; if (e === 'k256') { - t = new T(); + r = new T(); } else if (e === 'p224') { - t = new A(); + r = new A(); } else if (e === 'p192') { - t = new O(); + r = new O(); } else if (e === 'p25519') { - t = new k(); + r = new k(); } else { throw new Error('Unknown prime ' + e); } - x[e] = t; - return t; + x[e] = r; + return r; }; function I(t) { if (typeof t === 'string') { @@ -15520,20 +15520,20 @@ }; o._prime = function t(e) { if (w[e]) return w[e]; - var t; + var r; if (e === 'k256') { - t = new S(); + r = new S(); } else if (e === 'p224') { - t = new E(); + r = new E(); } else if (e === 'p192') { - t = new x(); + r = new x(); } else if (e === 'p25519') { - t = new M(); + r = new M(); } else { throw new Error('Unknown prime ' + e); } - w[e] = t; - return t; + w[e] = r; + return r; }; function T(t) { if (typeof t === 'string') { diff --git a/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/collapse_rhs_lhs_2/output.js b/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/collapse_rhs_lhs_2/output.js index 09233d218f4a..0bfc4b23d625 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/collapse_rhs_lhs_2/output.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/collapse_rhs_lhs_2/output.js @@ -1,6 +1,5 @@ var b = 1; -(function f(f) { - f = b; - f[b] = 0; +(function f(f1) { + (f1 = b)[b] = 0; })(); console.log("PASS"); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/collapse_rhs_lhs_2/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/collapse_rhs_lhs_2/output.mangleOnly.js index d6cd3aea1bc7..309502966067 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/collapse_rhs_lhs_2/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/collapse_rhs_lhs_2/output.mangleOnly.js @@ -1,6 +1,6 @@ var o = 1; -(function n(n) { - n = o; - n[o] = 0; +(function n(c) { + c = o; + c[o] = 0; })(); console.log("PASS"); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2313_2/output.js b/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2313_2/output.js index 2a1372a1d18b..a748aaafc224 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2313_2/output.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2313_2/output.js @@ -1,7 +1,7 @@ var c = 0; -!(function a() { - a && c++; - var a = 0; - a && c++; -})(); +!function a() { + a1 && c++; + var a1 = 0; + a1 && c++; +}(); console.log(c); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2313_2/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2313_2/output.mangleOnly.js index 872899630a5f..3d68f3d4ac04 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2313_2/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2313_2/output.mangleOnly.js @@ -1,7 +1,7 @@ var o = 0; !(function n() { - n && o++; - var n = 0; - n && o++; + a && o++; + var a = 0; + a && o++; })(); console.log(o); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_1709/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_1709/output.mangleOnly.js index e4e868f098a2..46cdda96d06a 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_1709/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_1709/output.mangleOnly.js @@ -1,14 +1,10 @@ -console.log( - (function n() { - var n = 1; - return n; - })(), - (function n() { - const n = 2; - return n; - })(), - (function n() { - function n() {} - return n; - })() -); +console.log((function n() { + var o = 1; + return o; +})(), (function n() { + const o = 2; + return o; +})(), (function n() { + function o() {} + return o; +})()); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_1715_4/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_1715_4/output.mangleOnly.js index 3c2e0e8629e4..50c0962bf5de 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_1715_4/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/issue_1715_4/output.mangleOnly.js @@ -1,6 +1,6 @@ var c = 1; !(function c() { - c++; + o++; try { x(); } catch (o) { diff --git a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/duplicate_lambda_defun_name_1/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/duplicate_lambda_defun_name_1/output.mangleOnly.js index 19bfbc716917..c912ac90165d 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/duplicate_lambda_defun_name_1/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/duplicate_lambda_defun_name_1/output.mangleOnly.js @@ -1,6 +1,4 @@ -console.log( - (function n(o) { - function n() {} - return n.length; - })() -); +console.log((function n(o) { + function t() {} + return t.length; +})()); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/duplicate_lambda_defun_name_2/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/duplicate_lambda_defun_name_2/output.mangleOnly.js index 19bfbc716917..c912ac90165d 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/duplicate_lambda_defun_name_2/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/duplicate_lambda_defun_name_2/output.mangleOnly.js @@ -1,6 +1,4 @@ -console.log( - (function n(o) { - function n() {} - return n.length; - })() -); +console.log((function n(o) { + function t() {} + return t.length; +})()); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/inverted_var/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/inverted_var/output.mangleOnly.js index c169f69c9f74..15d41aa7a6de 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/inverted_var/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/inverted_var/output.mangleOnly.js @@ -1,39 +1,30 @@ -console.log( - (function () { - var n = 1; - return n; - })(), - (function () { - var n; - n = 2; - return n; - })(), - (function () { - n = 3; - return n; - var n; - })(), - (function (n) { - n = 4; - return n; - })(), - (function (n) { - n = 5; - return n; - var n; - })(), - (function n() { - n = 6; - return n; - })(), - (function n() { - n = 7; - return n; - var n; - })(), - (function () { - n = 8; - return n; - var n = "foo"; - })() -); +console.log((function() { + var n = 1; + return n; +})(), (function() { + var n; + n = 2; + return n; +})(), (function() { + n = 3; + return n; + var n; +})(), (function(n) { + n = 4; + return n; +})(), (function(n) { + n = 5; + return n; + var n; +})(), (function n() { + n = 6; + return n; +})(), (function n() { + r = 7; + return r; + var r; +})(), (function() { + n = 8; + return n; + var n = "foo"; +})()); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/typeof/duplicate_lambda_arg_name/output.js b/crates/swc_ecma_minifier/tests/terser/compress/typeof/duplicate_lambda_arg_name/output.js index d6e49b280c2a..db96e44b032d 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/typeof/duplicate_lambda_arg_name/output.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/typeof/duplicate_lambda_arg_name/output.js @@ -1,5 +1,3 @@ -console.log( - (function long_name(long_name) { - return typeof long_name; - })() -); +console.log(function long_name(long_name1) { + return typeof long_name1; +}()); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/typeof/duplicate_lambda_arg_name/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/typeof/duplicate_lambda_arg_name/output.mangleOnly.js index 7617fc29cd0b..a740157a9bcc 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/typeof/duplicate_lambda_arg_name/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/typeof/duplicate_lambda_arg_name/output.mangleOnly.js @@ -1,5 +1,3 @@ -console.log( - (function o(o) { - return typeof o; - })() -); +console.log((function o(n) { + return typeof n; +})()); diff --git a/crates/swc_ecma_transforms_base/src/resolver/mod.rs b/crates/swc_ecma_transforms_base/src/resolver/mod.rs index 8bf6282f73a6..ce26ce329ccf 100644 --- a/crates/swc_ecma_transforms_base/src/resolver/mod.rs +++ b/crates/swc_ecma_transforms_base/src/resolver/mod.rs @@ -839,12 +839,18 @@ impl<'a> VisitMut for Resolver<'a> { fn visit_mut_fn_expr(&mut self, e: &mut FnExpr) { e.function.decorators.visit_mut_with(self); - self.with_child(ScopeKind::Fn, |child| { - if let Some(ident) = &mut e.ident { - child.modify(ident, DeclKind::Function) - } - e.function.visit_mut_with(child); - }); + if let Some(ident) = &mut e.ident { + self.with_child(ScopeKind::Fn, |child| { + child.modify(ident, DeclKind::Function); + child.with_child(ScopeKind::Fn, |child| { + e.function.visit_mut_with(child); + }); + }); + } else { + self.with_child(ScopeKind::Fn, |child| { + e.function.visit_mut_with(child); + }); + } } fn visit_mut_for_in_stmt(&mut self, n: &mut ForInStmt) { diff --git a/crates/swc_ecma_transforms_base/tests/resolver/class/nested/var/output.js b/crates/swc_ecma_transforms_base/tests/resolver/class/nested/var/output.js index b58bdbc1ae59..d5b495b6012f 100644 --- a/crates/swc_ecma_transforms_base/tests/resolver/class/nested/var/output.js +++ b/crates/swc_ecma_transforms_base/tests/resolver/class/nested/var/output.js @@ -1,8 +1,8 @@ var ConstructorScoping__1 = function ConstructorScoping__2() { _classCallCheck(this, ConstructorScoping__2); - var bar__2; + var bar__3; { - let bar__4; - use(bar__4); + let bar__5; + use(bar__5); } }; diff --git a/crates/swc_ecma_transforms_base/tests/resolver/export/default/fn_decl/scope/output.js b/crates/swc_ecma_transforms_base/tests/resolver/export/default/fn_decl/scope/output.js index 15bc92361cfe..0510759a81e1 100644 --- a/crates/swc_ecma_transforms_base/tests/resolver/export/default/fn_decl/scope/output.js +++ b/crates/swc_ecma_transforms_base/tests/resolver/export/default/fn_decl/scope/output.js @@ -1,6 +1,6 @@ export default function foo__1() { - foo__1 = function foo__2(x__2) { - return x__2 === 0 ? 1 : 1 + foo__2(x__2 - 1); + foo__1 = function foo__2(x__3) { + return x__3 === 0 ? 1 : 1 + foo__2(x__3 - 1); }; return foo__1(10); } diff --git a/crates/swc_ecma_transforms_base/tests/resolver/fn_expr/scope/output.js b/crates/swc_ecma_transforms_base/tests/resolver/fn_expr/scope/output.js index 678305055808..dfc022ca4015 100644 --- a/crates/swc_ecma_transforms_base/tests/resolver/fn_expr/scope/output.js +++ b/crates/swc_ecma_transforms_base/tests/resolver/fn_expr/scope/output.js @@ -1,6 +1,6 @@ test(function foo__2() { - foo__2 = function foo__3(x__3) { - return x__3 === 0 ? 1 : 1 + foo__3(x__3 - 1); + foo__2 = function foo__3(x__4) { + return x__4 === 0 ? 1 : 1 + foo__3(x__4 - 1); }; return foo__2(10); }); diff --git a/crates/swc_ecma_transforms_base/tests/resolver/issues/271/output.js b/crates/swc_ecma_transforms_base/tests/resolver/issues/271/output.js index 6f4aa7d17de9..0317f5f6fd0c 100644 --- a/crates/swc_ecma_transforms_base/tests/resolver/issues/271/output.js +++ b/crates/swc_ecma_transforms_base/tests/resolver/issues/271/output.js @@ -1,6 +1,6 @@ function foo__1(scope__2) { - var startOperation__2 = function startOperation1__3(operation__3) { - scope__2.agentOperation = operation__3; + var startOperation__2 = function startOperation1__3(operation__4) { + scope__2.agentOperation = operation__4; }; scope__2.startOperation = startOperation__2; } diff --git a/crates/swc_ecma_transforms_base/tests/resolver/issues/292/1/output.js b/crates/swc_ecma_transforms_base/tests/resolver/issues/292/1/output.js index bd754f1057b7..d990a7535f6d 100644 --- a/crates/swc_ecma_transforms_base/tests/resolver/issues/292/1/output.js +++ b/crates/swc_ecma_transforms_base/tests/resolver/issues/292/1/output.js @@ -1,10 +1,10 @@ var __assign__1 = function() { - __assign__1 = Object.assign || function __assign1__3(t__3) { - for(var s__3, i__3 = 1, n__3 = arguments.length; i__3 < n__3; i__3++){ - s__3 = arguments[i__3]; - for(var p__3 in s__3)if (Object.prototype.hasOwnProperty.call(s__3, p__3)) t__3[p__3] = s__3[p__3]; + __assign__1 = Object.assign || function __assign1__3(t__4) { + for(var s__4, i__4 = 1, n__4 = arguments.length; i__4 < n__4; i__4++){ + s__4 = arguments[i__4]; + for(var p__4 in s__4)if (Object.prototype.hasOwnProperty.call(s__4, p__4)) t__4[p__4] = s__4[p__4]; } - return t__3; + return t__4; }; return __assign__1.apply(this, arguments); }; diff --git a/crates/swc_ecma_transforms_base/tests/resolver/issues/292/2/output.js b/crates/swc_ecma_transforms_base/tests/resolver/issues/292/2/output.js index 958d81948954..952e4eba9e37 100644 --- a/crates/swc_ecma_transforms_base/tests/resolver/issues/292/2/output.js +++ b/crates/swc_ecma_transforms_base/tests/resolver/issues/292/2/output.js @@ -1,8 +1,8 @@ -__assign = Object.assign || function __assign1__2(t__2) { - for(var s__2, i__2 = 1, n__2 = arguments.length; i__2 < n__2; i__2++){ - s__2 = arguments[i__2]; - for(var p__2 in s__2)if (Object.prototype.hasOwnProperty.call(s__2, p__2)) t__2[p__2] = s__2[p__2]; +__assign = Object.assign || function __assign1__2(t__3) { + for(var s__3, i__3 = 1, n__3 = arguments.length; i__3 < n__3; i__3++){ + s__3 = arguments[i__3]; + for(var p__3 in s__3)if (Object.prototype.hasOwnProperty.call(s__3, p__3)) t__3[p__3] = s__3[p__3]; } - return t__2; + return t__3; }; __assign.apply(this, arguments); diff --git a/crates/swc_ecma_transforms_base/tests/resolver/issues/438/output.js b/crates/swc_ecma_transforms_base/tests/resolver/issues/438/output.js index ec64992efa37..f6febb637055 100644 --- a/crates/swc_ecma_transforms_base/tests/resolver/issues/438/output.js +++ b/crates/swc_ecma_transforms_base/tests/resolver/issues/438/output.js @@ -1,7 +1,7 @@ function _setPrototypeOf__1(o__2, p__2) { - _setPrototypeOf__1 = Object.setPrototypeOf || function _setPrototypeOf__4(o__4, p__4) { - o__4.__proto__ = p__4; - return o__4; + _setPrototypeOf__1 = Object.setPrototypeOf || function _setPrototypeOf__4(o__5, p__5) { + o__5.__proto__ = p__5; + return o__5; }; return _setPrototypeOf__1(o__2, p__2); } diff --git a/crates/swc_ecma_transforms_base/tests/resolver/minifier/15/output.js b/crates/swc_ecma_transforms_base/tests/resolver/minifier/15/output.js index 93b5a76a4d56..88e248df6ef2 100644 --- a/crates/swc_ecma_transforms_base/tests/resolver/minifier/15/output.js +++ b/crates/swc_ecma_transforms_base/tests/resolver/minifier/15/output.js @@ -1,9 +1,9 @@ (function aaa__1() { try { console.log(111); - } catch (Ic__3) { - throw Ic__3; + } catch (Ic__4) { + throw Ic__4; } - var jc__1, Ic__1; - (Ic__1 = jc__1).PV = "page_view"; + var jc__2, Ic__2; + (Ic__2 = jc__2).PV = "page_view"; })(); diff --git a/crates/swc_ecma_transforms_base/tests/resolver/minifier/16/output.js b/crates/swc_ecma_transforms_base/tests/resolver/minifier/16/output.js index 5faf03574384..35a9ad063be7 100644 --- a/crates/swc_ecma_transforms_base/tests/resolver/minifier/16/output.js +++ b/crates/swc_ecma_transforms_base/tests/resolver/minifier/16/output.js @@ -1,13 +1,13 @@ (function aaa__1() { - bbb__1(); - function bbb__1() { + bbb__2(); + function bbb__2() { try { console.log(111); - } catch (Ic__4) { - throw Ic__4; + } catch (Ic__5) { + throw Ic__5; } - var jc__2, Ic__2; - (Ic__2 = jc__2).PV = "page_view"; + var jc__3, Ic__3; + (Ic__3 = jc__3).PV = "page_view"; } - var Ic__1 = {}; + var Ic__2 = {}; })();