fix(es/renamer): Use a separate scope for the name of FnExpr (#6008)

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();
+};

crates/swc/tests/fixture/issues-4xxx/4841/output/input.js

@@ -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();
-};

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();
+            var clone = new AstPath();
-            clone1.asts = this.asts.map(function(value) {
+            clone.asts = this.asts.map(function(value) {
                 return value;
             });
-            clone1.top = this.top;
+            clone.top = this.top;
-            return clone1;
+            return clone;
         };
         _proto.pop = function pop() {
             var head = this.ast();

crates/swc/tests/tsc-references/typeParametersAvailableInNestedScope3.1.normal.js

@@ -1,7 +1,7 @@
 //// [typeParametersAvailableInNestedScope3.ts]
 function foo(v) {
-    var a = function a(a1) {
+    var a = function a(a) {
-        return a1;
+        return a;
     };
     var b = function b() {
         return v;

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) {
+(function f(f) {
-    (f1 = b)[b] = 0;
+    (f = b)[b] = 0;
 })();
 console.log("PASS");

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) {
+(function n(n) {
-    c = o;
+    n = o;
-    c[o] = 0;
+    n[o] = 0;
 })();
 console.log("PASS");

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) {
+            !(function o(o) {
-                n[1] = "foo";
+                o[1] = "foo";
             })();
             console.log("FAIL");
         } catch (c) {

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++;
+    a && c++;
-    var a1 = 0;
+    var a = 0;
-    a1 && c++;
+    a && c++;
 }();
 console.log(c);

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++;
+    n && o++;
-    var a = 0;
+    var n = 0;
-    a && o++;
+    n && o++;
 })();
 console.log(o);

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) {
+        (function n(n) {
-            var o = o && (o.null = "FAIL");
+            var n = n && (n.null = "FAIL");
         })(n);
     }
     o();

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) {
+    var r = (function o(o) {
-        throw r;
+        throw o;
     })(2);
     var a = --o + r;
 } catch (c) {}

crates/swc_ecma_minifier/tests/terser/compress/collapse_vars/issue_2974/output.mangleOnly.js

@@ -1,10 +1,10 @@
 var l = 0;
-(function n(o) {
+(function n(n) {
-    var u = 2;
+    var o = 2;
     do {
-        o && o[o];
+        n && n[n];
-        o && (o.null = -4);
+        n && (n.null = -4);
         l++;
-    }while (o.null && --u > 0)
+    }while (n.null && --o > 0)
 })(true);
 console.log(l);

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"));

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;
+    var n = 1;
-    return o;
+    return n;
 })(), (function n() {
-    const o = 2;
+    const n = 2;
-    return o;
+    return n;
 })(), (function n() {
-    function o() {}
+    function n() {}
-    return o;
+    return n;
 })());

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) {
+    } catch (c) {
-        var o;
+        var c;
     }
 })();
 console.log(c);

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) {};
 }

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) {

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) {

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);

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);

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) {
+        (function o(o) {
-            c && c();
+            o && o();
         })();
         c && (o = "PASS");
     }

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) {
+        (function o(o) {
-            c && c();
+            o && o();
         })();
         c && (o = "PASS");
     }

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) {
+        var c = (function n(n) {
-            o && o();
+            n && n();
         })();
         if (o) {
             var f = (n = "PASS");

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) {
+        var c = (function n(n) {
-            o && o();
+            n && n();
         })();
         if (o) {
             var f = (n = "PASS");

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;
+    return t;
-    function t(n) {
+    function n(n) {
         return n || n();
     }
-    function r(n) {
+    function t(t) {
-        t(n);
+        n(t);
-        return n;
+        return t;
     }
 })()(42));

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) {})();

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) {
+    p: function p(p) {
-        return 10 * n;
+        return 10 * p;
     },
     x: 1,
     y: 2

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) {
+    (function o(o) {
-        var l = 2;
+        var i = 2;
-        while(--c + (i = {
+        while(--c + (o = {
             p: n++
-        }) && --l > 0);
+        }) && --i > 0);
     })();
 })();
 console.log(n);

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 function t(t, n, r) {
-        return n + r + u;
+        return t + n + r;
     };
 }

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 function n(n, t, r) {
-        return t + r + u;
+        return n + t + r;
     };
 }

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 function n(n, t, r) {
-        return t + r + u;
+        return n + t + r;
     };
 }

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) {
+!(function n(n) {
-    return r;
+    return n;
 })(42);

crates/swc_ecma_minifier/tests/terser/compress/issue_281/issue_1595_3/output.mangleOnly.js

@@ -1,3 +1,3 @@
-(function n(r) {
+(function n(n) {
-    return g(r + 1);
+    return g(n + 1);
 })(2);

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);
+        console.log(t);
-        var t = function() {};
+        var n = function() {};
-        return t;
+        return n;
     };
 })()();

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) {
+new (function n(n) {
-    this.foo = o;
+    this.foo = n;
 })(1);
-new (function n(o) {
+new (function n(n) {
-    this.foo = o;
+    this.foo = n;
 })();

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) {
+console.log((function n(n) {
-    function t() {}
+    function o() {}
-    return t.length;
+    return o.length;
 })());

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) {
+console.log((function n(n) {
-    function t() {}
+    function o() {}
-    return t.length;
+    return o.length;
 })());

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;
+    n = 7;
-    return r;
+    return n;
-    var r;
+    var n;
 })(), (function() {
     n = 8;
     return n;

crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1595_2/output.mangleOnly.js

@@ -1,3 +1,3 @@
-(function n(r) {
+(function n(n) {
-    return g(r + 1);
+    return g(n + 1);
 })(2);

crates/swc_ecma_minifier/tests/terser/compress/reduce_vars/issue_1595_3/output.mangleOnly.js

@@ -1,3 +1,3 @@
-(function n(r) {
+(function n(n) {
-    return g(r + 1);
+    return g(n + 1);
 })(2);

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");
     }
 })();

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");
     }
 })();

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");
     }
 })();

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");
     }
 })();

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):
+        case (o = 1):
-            s && (c = "FAIL");
+            o && (c = "FAIL");
     }
 })();
 console.log(c);

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;
+    var o = 2;
-    console.log(n - 5);
+    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 o = typeof C !== "undefined";
-    var e = 4;
+    var n = 4;
-    if (n) {
+    if (o) {
         return "yes";
     } else {
         return "no";

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) {
+console.log(function long_name(long_name) {
-    return typeof long_name1;
+    return typeof long_name;
 }());

crates/swc_ecma_minifier/tests/terser/compress/typeof/duplicate_lambda_arg_name/output.mangleOnly.js

@@ -1,3 +1,3 @@
-console.log((function o(n) {
+console.log((function o(o) {
-    return typeof n;
+    return typeof o;
 })());

crates/swc_ecma_transforms/tests/es2015_function_name.rs

@@ -896,8 +896,8 @@ function search({search}) {
 "#,
     r#"
 var obj = {
-    search: function search({ search: search1 }) {
+    search: function search({ search }) {
-        console.log(search1);
+        console.log(search);
     }
 };
 

crates/swc_ecma_transforms_base/src/rename/analyzer/mod.rs

@@ -161,14 +161,19 @@ impl Visit for Analyzer {
     }
 
     fn visit_fn_expr(&mut self, f: &FnExpr) {
-        self.with_scope(|v| {
         if let Some(id) = &f.ident {
+            self.with_scope(|v| {
                 v.add_decl(id.to_id());
-            }
+                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) {
         self.add_decl(n.local.to_id());

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;