diff --git a/crates/swc/tests/fixture/issues-4xxx/4841/input/input.js b/crates/swc/tests/fixture/issues-4xxx/4841/input/index.js similarity index 100% rename from crates/swc/tests/fixture/issues-4xxx/4841/input/input.js rename to crates/swc/tests/fixture/issues-4xxx/4841/input/index.js diff --git a/crates/swc/tests/fixture/issues-4xxx/4841/output/index.js b/crates/swc/tests/fixture/issues-4xxx/4841/output/index.js new file mode 100644 index 00000000000..3df965c55c9 --- /dev/null +++ b/crates/swc/tests/fixture/issues-4xxx/4841/output/index.js @@ -0,0 +1,10 @@ +global._processChunk = function r(r, c, i) { + if (r) { + if (!c) { + return true; + } + var i = this.write(); + return (i.callback = callback), void 0; + } + cb(); +}; diff --git a/crates/swc/tests/fixture/issues-4xxx/4841/output/input.js b/crates/swc/tests/fixture/issues-4xxx/4841/output/input.js deleted file mode 100644 index e5779c0bafd..00000000000 --- a/crates/swc/tests/fixture/issues-4xxx/4841/output/input.js +++ /dev/null @@ -1,10 +0,0 @@ -global._processChunk = function r(c, i, a) { - if (c) { - if (!i) { - return true; - } - var a = this.write(); - return (a.callback = callback), void 0; - } - cb(); -}; diff --git a/crates/swc/tests/tsc-references/parserRealSource14.1.normal.js b/crates/swc/tests/tsc-references/parserRealSource14.1.normal.js index f34fb4cee79..c44dbfa379f 100644 --- a/crates/swc/tests/tsc-references/parserRealSource14.1.normal.js +++ b/crates/swc/tests/tsc-references/parserRealSource14.1.normal.js @@ -120,12 +120,12 @@ var TypeScript; } var _proto = AstPath.prototype; _proto.clone = function clone() { - var clone1 = new AstPath(); - clone1.asts = this.asts.map(function(value) { + var clone = new AstPath(); + clone.asts = this.asts.map(function(value) { return value; }); - clone1.top = this.top; - return clone1; + clone.top = this.top; + return clone; }; _proto.pop = function pop() { var head = this.ast(); diff --git a/crates/swc/tests/tsc-references/typeParametersAvailableInNestedScope3.1.normal.js b/crates/swc/tests/tsc-references/typeParametersAvailableInNestedScope3.1.normal.js index 781a41d7b49..e01e404627e 100644 --- a/crates/swc/tests/tsc-references/typeParametersAvailableInNestedScope3.1.normal.js +++ b/crates/swc/tests/tsc-references/typeParametersAvailableInNestedScope3.1.normal.js @@ -1,7 +1,7 @@ //// [typeParametersAvailableInNestedScope3.ts] function foo(v) { - var a = function a(a1) { - return a1; + var a = function a(a) { + return a; }; var b = function b() { return v; 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 0bfc4b23d62..2b5c8bc877b 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,5 +1,5 @@ var b = 1; -(function f(f1) { - (f1 = b)[b] = 0; +(function f(f) { + (f = 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 30950296606..d6cd3aea1bc 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(c) { - c = o; - c[o] = 0; +(function n(n) { + n = o; + n[o] = 0; })(); console.log("PASS"); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2298/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2298/output.mangleOnly.js index 38e0adae92b..57401437d07 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2298/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2298/output.mangleOnly.js @@ -3,8 +3,8 @@ var o = n; var n = o++; try { - !(function o(n) { - n[1] = "foo"; + !(function o(o) { + o[1] = "foo"; })(); console.log("FAIL"); } catch (c) { 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 a748aaafc22..318bea0bb6d 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() { - a1 && c++; - var a1 = 0; - a1 && c++; + a && c++; + var a = 0; + a && 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 3d68f3d4ac0..872899630a5 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() { - a && o++; - var a = 0; - a && o++; + n && o++; + var n = 0; + n && o++; })(); console.log(o); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2436_13/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2436_13/output.mangleOnly.js index bb2f2972083..9427ff71507 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2436_13/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2436_13/output.mangleOnly.js @@ -1,8 +1,8 @@ var n = "PASS"; (function() { function o(o) { - (function n(o) { - var o = o && (o.null = "FAIL"); + (function n(n) { + var n = n && (n.null = "FAIL"); })(n); } o(); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2571_1/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2571_1/output.mangleOnly.js index a72971cb675..8ae315d78cd 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2571_1/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2571_1/output.mangleOnly.js @@ -1,7 +1,7 @@ var o = 1; try { - var r = (function o(r) { - throw r; + var r = (function o(o) { + throw o; })(2); var a = --o + r; } catch (c) {} diff --git a/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2974/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2974/output.mangleOnly.js index 2d26def9614..f1820472f20 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2974/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2974/output.mangleOnly.js @@ -1,10 +1,10 @@ var l = 0; -(function n(o) { - var u = 2; +(function n(n) { + var o = 2; do { - o && o[o]; - o && (o.null = -4); + n && n[n]; + n && (n.null = -4); l++; - }while (o.null && --u > 0) + }while (n.null && --o > 0) })(true); console.log(l); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_348/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_348/output.mangleOnly.js index 22693fb2c40..0db5cce6383 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_348/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_348/output.mangleOnly.js @@ -1,8 +1,8 @@ -console.log((function n(o) { +console.log((function n(n) { return (function(n) { if (n) { const o = n; if (o) return o; } - })(o); + })(n); })("PASS")); 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 46cdda96d06..50eaefe6ee9 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,10 +1,10 @@ console.log((function n() { - var o = 1; - return o; + var n = 1; + return n; })(), (function n() { - const o = 2; - return o; + const n = 2; + return n; })(), (function n() { - function o() {} - return o; + function n() {} + return n; })()); 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 50c0962bf5d..1c1ce7c626d 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,10 +1,10 @@ var c = 1; !(function c() { - o++; + c++; try { x(); - } catch (o) { - var o; + } catch (c) { + var c; } })(); console.log(c); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/keep_fnames/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/keep_fnames/output.mangleOnly.js index f4f288cfb1c..1241875fa5a 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/keep_fnames/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/drop_unused/keep_fnames/output.mangleOnly.js @@ -1,3 +1,3 @@ function n() { - return function n(t) {}; + return function n(n) {}; } diff --git a/crates/swc_ecma_minifier/tests/terser/compress/functions/iifes_returning_constants_keep_fargs_false/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/functions/iifes_returning_constants_keep_fargs_false/output.mangleOnly.js index ab386d915df..e7668182131 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/functions/iifes_returning_constants_keep_fargs_false/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/functions/iifes_returning_constants_keep_fargs_false/output.mangleOnly.js @@ -4,7 +4,7 @@ console.log((function n() { return "okay"; })()); -console.log((function n(o, r, t) { +console.log((function n(n, o, r) { return 123; })()); console.log((function(n, o, r) { diff --git a/crates/swc_ecma_minifier/tests/terser/compress/functions/iifes_returning_constants_keep_fargs_true/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/functions/iifes_returning_constants_keep_fargs_true/output.mangleOnly.js index ab386d915df..e7668182131 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/functions/iifes_returning_constants_keep_fargs_true/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/functions/iifes_returning_constants_keep_fargs_true/output.mangleOnly.js @@ -4,7 +4,7 @@ console.log((function n() { return "okay"; })()); -console.log((function n(o, r, t) { +console.log((function n(n, o, r) { return 123; })()); console.log((function(n, o, r) { diff --git a/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2114_1/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2114_1/output.mangleOnly.js index 6a372613145..f581af87d7a 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2114_1/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2114_1/output.mangleOnly.js @@ -7,7 +7,7 @@ var n = 0; length: (n = 1 + n) }, typeof void (function o() { - var t = (function n(o) {})(t && (t.b += ((n = n + 1), 0))); + var o = (function n(n) {})(o && (o.b += ((n = n + 1), 0))); })() ]); console.log(n); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2114_2/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2114_2/output.mangleOnly.js index 6a372613145..f581af87d7a 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2114_2/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2114_2/output.mangleOnly.js @@ -7,7 +7,7 @@ var n = 0; length: (n = 1 + n) }, typeof void (function o() { - var t = (function n(o) {})(t && (t.b += ((n = n + 1), 0))); + var o = (function n(n) {})(o && (o.b += ((n = n + 1), 0))); })() ]); console.log(n); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2604_1/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2604_1/output.mangleOnly.js index e5ca5589a38..1e839897b21 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2604_1/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2604_1/output.mangleOnly.js @@ -3,8 +3,8 @@ var o = "FAIL"; try { throw 1; } catch (c) { - (function o(c) { - c && c(); + (function o(o) { + o && o(); })(); c && (o = "PASS"); } diff --git a/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2604_2/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2604_2/output.mangleOnly.js index e5ca5589a38..1e839897b21 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2604_2/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2604_2/output.mangleOnly.js @@ -3,8 +3,8 @@ var o = "FAIL"; try { throw 1; } catch (c) { - (function o(c) { - c && c(); + (function o(o) { + o && o(); })(); c && (o = "PASS"); } diff --git a/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2620_1/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2620_1/output.mangleOnly.js index afc68d05566..8c1a3dc7717 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2620_1/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2620_1/output.mangleOnly.js @@ -1,8 +1,8 @@ var n = "FAIL"; (function() { function o(o) { - var c = (function n(o) { - o && o(); + var c = (function n(n) { + n && n(); })(); if (o) { var f = (n = "PASS"); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2620_2/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2620_2/output.mangleOnly.js index afc68d05566..8c1a3dc7717 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2620_2/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2620_2/output.mangleOnly.js @@ -1,8 +1,8 @@ var n = "FAIL"; (function() { function o(o) { - var c = (function n(o) { - o && o(); + var c = (function n(n) { + n && n(); })(); if (o) { var f = (n = "PASS"); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2657/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2657/output.mangleOnly.js index 68b5090b4ac..e55ad29d81a 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2657/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/functions/issue_2657/output.mangleOnly.js @@ -1,11 +1,11 @@ "use strict"; console.log((function n() { - return r; - function t(n) { + return t; + function n(n) { return n || n(); } - function r(n) { - t(n); - return n; + function t(t) { + n(t); + return t; } })()(42)); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/functions/non_ascii_function_identifier_name/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/functions/non_ascii_function_identifier_name/output.mangleOnly.js index 0f0a9c17fe8..759234326b8 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/functions/non_ascii_function_identifier_name/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/functions/non_ascii_function_identifier_name/output.mangleOnly.js @@ -1,3 +1,3 @@ function n(n) {} function c(n) {} -(function n(c) {})(); +(function n(n) {})(); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/hoist_props/hoist_function_with_call/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/hoist_props/hoist_function_with_call/output.mangleOnly.js index 7cd26ba118e..7c7e665d595 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/hoist_props/hoist_function_with_call/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/hoist_props/hoist_function_with_call/output.mangleOnly.js @@ -1,6 +1,6 @@ var p = { - p: function p(n) { - return 10 * n; + p: function p(p) { + return 10 * p; }, x: 1, y: 2 diff --git a/crates/swc_ecma_minifier/tests/terser/compress/hoist_props/issue_3071_3/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/hoist_props/issue_3071_3/output.mangleOnly.js index cb2e092516a..425b44c6bc9 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/hoist_props/issue_3071_3/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/hoist_props/issue_3071_3/output.mangleOnly.js @@ -1,10 +1,10 @@ var n = 0; (function(o, c) { - (function o(i) { - var l = 2; - while(--c + (i = { + (function o(o) { + var i = 2; + while(--c + (o = { p: n++ - }) && --l > 0); + }) && --i > 0); })(); })(); console.log(n); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/issue_1202/mangle_keep_fnames_false/output.js b/crates/swc_ecma_minifier/tests/terser/compress/issue_1202/mangle_keep_fnames_false/output.js index 6d414017abb..9b2d1c469a9 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/issue_1202/mangle_keep_fnames_false/output.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/issue_1202/mangle_keep_fnames_false/output.js @@ -1,6 +1,6 @@ "use strict"; function total() { - return function t(n, r, u) { - return n + r + u; + return function t(t, n, r) { + return t + n + r; }; } diff --git a/crates/swc_ecma_minifier/tests/terser/compress/issue_1202/mangle_keep_fnames_false/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/issue_1202/mangle_keep_fnames_false/output.mangleOnly.js index e14353b699e..f177447cfa9 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/issue_1202/mangle_keep_fnames_false/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/issue_1202/mangle_keep_fnames_false/output.mangleOnly.js @@ -1,6 +1,6 @@ "use strict"; function n() { - return function n(t, r, u) { - return t + r + u; + return function n(n, t, r) { + return n + t + r; }; } diff --git a/crates/swc_ecma_minifier/tests/terser/compress/issue_1202/mangle_keep_fnames_true/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/issue_1202/mangle_keep_fnames_true/output.mangleOnly.js index e14353b699e..f177447cfa9 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/issue_1202/mangle_keep_fnames_true/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/issue_1202/mangle_keep_fnames_true/output.mangleOnly.js @@ -1,6 +1,6 @@ "use strict"; function n() { - return function n(t, r, u) { - return t + r + u; + return function n(n, t, r) { + return n + t + r; }; } diff --git a/crates/swc_ecma_minifier/tests/terser/compress/issue_1569/inner_reference/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/issue_1569/inner_reference/output.mangleOnly.js index b0d42b174e3..bfae12f74aa 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/issue_1569/inner_reference/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/issue_1569/inner_reference/output.mangleOnly.js @@ -1,6 +1,6 @@ !(function n(r) { return r && n(r - 1) + r; })(42); -!(function n(r) { - return r; +!(function n(n) { + return n; })(42); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/issue_281/issue_1595_3/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/issue_281/issue_1595_3/output.mangleOnly.js index 68366d2e858..19d134b7584 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/issue_281/issue_1595_3/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/issue_281/issue_1595_3/output.mangleOnly.js @@ -1,3 +1,3 @@ -(function n(r) { - return g(r + 1); +(function n(n) { + return g(n + 1); })(2); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/keep_names/keep_fnames_and_avoid_collisions/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/keep_names/keep_fnames_and_avoid_collisions/output.mangleOnly.js index 8af83c415bc..63098306341 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/keep_names/keep_fnames_and_avoid_collisions/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/keep_names/keep_fnames_and_avoid_collisions/output.mangleOnly.js @@ -1,9 +1,9 @@ global.t = "ttttttttttttttttttttt"; (function t() { - var n = "PASS"; + var t = "PASS"; return ()=>{ - console.log(n); - var t = function() {}; - return t; + console.log(t); + var n = function() {}; + return n; }; })()(); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/new/new_statements_3/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/new/new_statements_3/output.mangleOnly.js index fc63f0401cc..1a4cb50e59b 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/new/new_statements_3/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/new/new_statements_3/output.mangleOnly.js @@ -4,9 +4,9 @@ new (function(n) { new (function(n) { this.foo = n; })(); -new (function n(o) { - this.foo = o; +new (function n(n) { + this.foo = n; })(1); -new (function n(o) { - this.foo = o; +new (function n(n) { + this.foo = n; })(); 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 c912ac90165..caa845c37dd 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,4 +1,4 @@ -console.log((function n(o) { - function t() {} - return t.length; +console.log((function n(n) { + function o() {} + return o.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 c912ac90165..caa845c37dd 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,4 +1,4 @@ -console.log((function n(o) { - function t() {} - return t.length; +console.log((function n(n) { + function o() {} + return o.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 15d41aa7a6d..a0f74bfbce7 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 @@ -20,9 +20,9 @@ console.log((function() { n = 6; return n; })(), (function n() { - r = 7; - return r; - var r; + n = 7; + return n; + var n; })(), (function() { n = 8; return n; diff --git a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1595_2/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1595_2/output.mangleOnly.js index 68366d2e858..19d134b7584 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1595_2/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1595_2/output.mangleOnly.js @@ -1,3 +1,3 @@ -(function n(r) { - return g(r + 1); +(function n(n) { + return g(n + 1); })(2); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1595_3/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1595_3/output.mangleOnly.js index 68366d2e858..19d134b7584 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1595_3/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1595_3/output.mangleOnly.js @@ -1,3 +1,3 @@ -(function n(r) { - return g(r + 1); +(function n(n) { + return g(n + 1); })(2); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1670_1/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1670_1/output.mangleOnly.js index 8c8e0e98962..ad0d8d9e0da 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1670_1/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1670_1/output.mangleOnly.js @@ -1,10 +1,10 @@ (function e() { switch(1){ case 0: - var o = true; + var e = true; break; default: - if (typeof o === "undefined") console.log("PASS"); + if (typeof e === "undefined") console.log("PASS"); else console.log("FAIL"); } })(); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1670_2/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1670_2/output.mangleOnly.js index 8c8e0e98962..ad0d8d9e0da 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1670_2/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1670_2/output.mangleOnly.js @@ -1,10 +1,10 @@ (function e() { switch(1){ case 0: - var o = true; + var e = true; break; default: - if (typeof o === "undefined") console.log("PASS"); + if (typeof e === "undefined") console.log("PASS"); else console.log("FAIL"); } })(); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1670_3/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1670_3/output.mangleOnly.js index f736ccf8365..a7b86e2939f 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1670_3/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1670_3/output.mangleOnly.js @@ -1,10 +1,10 @@ (function e() { switch(1){ case 0: - var o = true; + var e = true; break; case 1: - if (typeof o === "undefined") console.log("PASS"); + if (typeof e === "undefined") console.log("PASS"); else console.log("FAIL"); } })(); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1670_4/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1670_4/output.mangleOnly.js index f736ccf8365..a7b86e2939f 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1670_4/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1670_4/output.mangleOnly.js @@ -1,10 +1,10 @@ (function e() { switch(1){ case 0: - var o = true; + var e = true; break; case 1: - if (typeof o === "undefined") console.log("PASS"); + if (typeof e === "undefined") console.log("PASS"); else console.log("FAIL"); } })(); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_2992/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_2992/output.mangleOnly.js index ca5d10ef657..e2e73c72f15 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_2992/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_2992/output.mangleOnly.js @@ -1,9 +1,9 @@ var c = "PASS"; -(function o(s) { +(function o(o) { switch(0){ case 0: - case (s = 1): - s && (c = "FAIL"); + case (o = 1): + o && (c = "FAIL"); } })(); console.log(c); diff --git a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/reduce_vars/output.mangleOnly.js b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/reduce_vars/output.mangleOnly.js index d19b9b49524..38fcdf66c53 100644 --- a/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/reduce_vars/output.mangleOnly.js +++ b/crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/reduce_vars/output.mangleOnly.js @@ -1,7 +1,7 @@ var A = 1; (function o() { - var n = 2; - console.log(n - 5); + var o = 2; + console.log(o - 5); console.log(A - 5); })(); (function f1() { @@ -15,9 +15,9 @@ var A = 1; eval("console.log(a);"); })(eval); (function o() { - var n = typeof C !== "undefined"; - var e = 4; - if (n) { + var o = typeof C !== "undefined"; + var n = 4; + if (o) { return "yes"; } else { return "no"; 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 db96e44b032..47f3287dbac 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,3 +1,3 @@ -console.log(function long_name(long_name1) { - return typeof long_name1; +console.log(function long_name(long_name) { + return typeof long_name; }()); 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 a740157a9bc..b554033c9de 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,3 +1,3 @@ -console.log((function o(n) { - return typeof n; +console.log((function o(o) { + return typeof o; })()); diff --git a/crates/swc_ecma_transforms/tests/es2015_function_name.rs b/crates/swc_ecma_transforms/tests/es2015_function_name.rs index e0fb11241df..2250324f73f 100644 --- a/crates/swc_ecma_transforms/tests/es2015_function_name.rs +++ b/crates/swc_ecma_transforms/tests/es2015_function_name.rs @@ -896,8 +896,8 @@ function search({search}) { "#, r#" var obj = { - search: function search({ search: search1 }) { - console.log(search1); + search: function search({ search }) { + console.log(search); } }; diff --git a/crates/swc_ecma_transforms_base/src/rename/analyzer/mod.rs b/crates/swc_ecma_transforms_base/src/rename/analyzer/mod.rs index 3d751b368ab..002a0ca52e3 100644 --- a/crates/swc_ecma_transforms_base/src/rename/analyzer/mod.rs +++ b/crates/swc_ecma_transforms_base/src/rename/analyzer/mod.rs @@ -161,13 +161,18 @@ impl Visit for Analyzer { } fn visit_fn_expr(&mut self, f: &FnExpr) { - self.with_scope(|v| { - if let Some(id) = &f.ident { + if let Some(id) = &f.ident { + self.with_scope(|v| { v.add_decl(id.to_id()); - } - - f.function.visit_with(v); - }) + v.with_scope(|v| { + f.function.visit_with(v); + }); + }) + } else { + self.with_scope(|v| { + f.function.visit_with(v); + }) + } } fn visit_import_default_specifier(&mut self, n: &ImportDefaultSpecifier) { diff --git a/crates/swc_ecma_transforms_compat/tests/es2015_classes.rs b/crates/swc_ecma_transforms_compat/tests/es2015_classes.rs index 671aeb9c569..60cb2a5dfcc 100644 --- a/crates/swc_ecma_transforms_compat/tests/es2015_classes.rs +++ b/crates/swc_ecma_transforms_compat/tests/es2015_classes.rs @@ -3476,7 +3476,7 @@ function A() { _createClass(A, [{ key: "foo", value: function foo() { - const foo1 = 2; + const foo = 2; } }]); return A;