fix(es/renamer): Fix renaming of default-exported declarations (#9135)

kdy1 · web-flow · commit 45f671d8d85b · 2024-07-04T21:08:45.000+09:00
**Related issue:** - Closes #9129
diff --git a/crates/swc/tests/fixture/issues-9xxx/9129/1/input/.swcrc b/crates/swc/tests/fixture/issues-9xxx/9129/1/input/.swcrc
@@ -0,0 +1,28 @@
+{
+    "jsc": {
+        "parser": {
+            "syntax": "typescript",
+            "tsx": true,
+            "decorators": true
+        },
+        "target": "es2022",
+        "transform": {
+            "decoratorMetadata": true,
+            "react": {
+                "refresh": true,
+                "development": true
+            }
+        },
+        "externalHelpers": true,
+        "loose": false,
+        "minify": {
+            "compress": false,
+            "mangle": false
+        }
+    },
+    "module": {
+        "type": "es6"
+    },
+    "minify": false,
+    "isModule": "unknown"
+}
diff --git a/crates/swc/tests/fixture/issues-9xxx/9129/1/input/1.js b/crates/swc/tests/fixture/issues-9xxx/9129/1/input/1.js
@@ -0,0 +1,5 @@
+eval('')
+export default function Foo() {
+}
+
+Foo()
diff --git a/crates/swc/tests/fixture/issues-9xxx/9129/1/input/2.js b/crates/swc/tests/fixture/issues-9xxx/9129/1/input/2.js
@@ -0,0 +1,5 @@
+eval('')
+export function Foo() {
+}
+
+Foo()
diff --git a/crates/swc/tests/fixture/issues-9xxx/9129/1/input/3.js b/crates/swc/tests/fixture/issues-9xxx/9129/1/input/3.js
@@ -0,0 +1,5 @@
+eval('')
+export default class Foo {
+}
+
+new Foo()
diff --git a/crates/swc/tests/fixture/issues-9xxx/9129/1/input/4.js b/crates/swc/tests/fixture/issues-9xxx/9129/1/input/4.js
@@ -0,0 +1,5 @@
+eval('')
+export class Foo {
+}
+
+new Foo()
diff --git a/crates/swc/tests/fixture/issues-9xxx/9129/1/output/1.js b/crates/swc/tests/fixture/issues-9xxx/9129/1/output/1.js
@@ -0,0 +1,6 @@
+eval('');
+export default function Foo() {}
+_c = Foo;
+Foo();
+var _c;
+$RefreshReg$(_c, "Foo");
diff --git a/crates/swc/tests/fixture/issues-9xxx/9129/1/output/2.js b/crates/swc/tests/fixture/issues-9xxx/9129/1/output/2.js
@@ -0,0 +1,6 @@
+eval('');
+export function Foo() {}
+_c = Foo;
+Foo();
+var _c;
+$RefreshReg$(_c, "Foo");
diff --git a/crates/swc/tests/fixture/issues-9xxx/9129/1/output/3.js b/crates/swc/tests/fixture/issues-9xxx/9129/1/output/3.js
@@ -0,0 +1,4 @@
+eval('');
+export default class Foo {
+}
+new Foo();
diff --git a/crates/swc/tests/fixture/issues-9xxx/9129/1/output/4.js b/crates/swc/tests/fixture/issues-9xxx/9129/1/output/4.js
@@ -0,0 +1,4 @@
+eval('');
+export class Foo {
+}
+new Foo();
diff --git a/crates/swc/tests/fixture/issues-9xxx/9129/2/input/.swcrc b/crates/swc/tests/fixture/issues-9xxx/9129/2/input/.swcrc
@@ -0,0 +1,25 @@
+{
+    "jsc": {
+        "parser": {
+            "syntax": "typescript",
+            "tsx": true,
+            "decorators": true
+        },
+        "target": "es2022",
+        "transform": {
+            "decoratorMetadata": true,
+            "react": {}
+        },
+        "externalHelpers": true,
+        "loose": false,
+        "minify": {
+            "compress": false,
+            "mangle": false
+        }
+    },
+    "module": {
+        "type": "es6"
+    },
+    "minify": false,
+    "isModule": "unknown"
+}
diff --git a/crates/swc/tests/fixture/issues-9xxx/9129/2/input/1.js b/crates/swc/tests/fixture/issues-9xxx/9129/2/input/1.js
@@ -0,0 +1,5 @@
+eval('')
+export default function Foo() {
+}
+
+Foo()
diff --git a/crates/swc/tests/fixture/issues-9xxx/9129/2/input/2.js b/crates/swc/tests/fixture/issues-9xxx/9129/2/input/2.js
@@ -0,0 +1,5 @@
+eval('')
+export function Foo() {
+}
+
+Foo()
diff --git a/crates/swc/tests/fixture/issues-9xxx/9129/2/input/3.js b/crates/swc/tests/fixture/issues-9xxx/9129/2/input/3.js
@@ -0,0 +1,5 @@
+eval('')
+export default class Foo {
+}
+
+new Foo()
diff --git a/crates/swc/tests/fixture/issues-9xxx/9129/2/input/4.js b/crates/swc/tests/fixture/issues-9xxx/9129/2/input/4.js
@@ -0,0 +1,5 @@
+eval('')
+export class Foo {
+}
+
+new Foo()
diff --git a/crates/swc/tests/fixture/issues-9xxx/9129/2/output/1.js b/crates/swc/tests/fixture/issues-9xxx/9129/2/output/1.js
@@ -0,0 +1,3 @@
+eval('');
+export default function Foo() {}
+Foo();
diff --git a/crates/swc/tests/fixture/issues-9xxx/9129/2/output/2.js b/crates/swc/tests/fixture/issues-9xxx/9129/2/output/2.js
@@ -0,0 +1,3 @@
+eval('');
+export function Foo() {}
+Foo();
diff --git a/crates/swc/tests/fixture/issues-9xxx/9129/2/output/3.js b/crates/swc/tests/fixture/issues-9xxx/9129/2/output/3.js
@@ -0,0 +1,4 @@
+eval('');
+export default class Foo {
+}
+new Foo();
diff --git a/crates/swc/tests/fixture/issues-9xxx/9129/2/output/4.js b/crates/swc/tests/fixture/issues-9xxx/9129/2/output/4.js
@@ -0,0 +1,4 @@
+eval('');
+export class Foo {
+}
+new Foo();
diff --git a/crates/swc_ecma_minifier/tests/terser/compress/harmony/class_name_can_be_preserved/output.js b/crates/swc_ecma_minifier/tests/terser/compress/harmony/class_name_can_be_preserved/output.js
@@ -1,6 +1,6 @@
 function x() {
     (class Baz {
     });
-    let Foo = class Foo {
-    };
+    class Foo {
+    }
 }
diff --git a/crates/swc_ecma_minifier/tests/terser/compress/keep_names/keep_classnames/output.js b/crates/swc_ecma_minifier/tests/terser/compress/keep_names/keep_classnames/output.js
@@ -1,4 +1,4 @@
 function foo() {
-    let Bar = class Bar {
-    };
+    class Bar {
+    }
 }
diff --git a/crates/swc_ecma_transforms_base/src/rename/analyzer/mod.rs b/crates/swc_ecma_transforms_base/src/rename/analyzer/mod.rs
@@ -218,7 +218,7 @@ impl Visit for Analyzer {
                     self.add_decl(id.to_id(), true);
                 }
 
-                f.function.visit_with(self)
+                f.visit_with(self);
             }
             DefaultDecl::TsInterfaceDecl(_) => {}
         }
@@ -240,7 +240,7 @@ impl Visit for Analyzer {
         maybe_grow_default(|| e.visit_children_with(self));
 
         if let Expr::Ident(i) = e {
-            self.add_usage(i.to_id())
+            self.add_usage(i.to_id());
         }
 
         self.is_pat_decl = old_is_pat_decl;
diff --git a/crates/swc_ecma_transforms_base/src/rename/mod.rs b/crates/swc_ecma_transforms_base/src/rename/mod.rs
@@ -202,7 +202,9 @@ macro_rules! unit {
             } else {
                 let map = self.get_map(n, false, false, false);
 
-                n.visit_mut_with(&mut rename_with_config(&map, self.config.clone()));
+                if !map.is_empty() {
+                    n.visit_mut_with(&mut rename_with_config(&map, self.config.clone()));
+                }
             }
         }
     };
@@ -214,7 +216,9 @@ macro_rules! unit {
             } else {
                 let map = self.get_map(n, true, false, false);
 
-                n.visit_mut_with(&mut rename_with_config(&map, self.config.clone()));
+                if !map.is_empty() {
+                    n.visit_mut_with(&mut rename_with_config(&map, self.config.clone()));
+                }
             }
         }
     };
@@ -246,6 +250,20 @@ where
 
     unit!(visit_mut_class_decl, ClassDecl, true);
 
+    fn visit_mut_default_decl(&mut self, n: &mut DefaultDecl) {
+        match n {
+            DefaultDecl::Class(n) => {
+                n.visit_mut_children_with(self);
+            }
+            DefaultDecl::Fn(n) => {
+                n.visit_mut_children_with(self);
+            }
+            DefaultDecl::TsInterfaceDecl(n) => {
+                n.visit_mut_children_with(self);
+            }
+        }
+    }
+
     fn visit_mut_expr(&mut self, n: &mut Expr) {
         maybe_grow_default(|| n.visit_mut_children_with(self));
     }
@@ -284,7 +302,9 @@ where
             m.visit_mut_children_with(self);
         }
 
-        m.visit_mut_with(&mut rename_with_config(&map, self.config.clone()));
+        if !map.is_empty() {
+            m.visit_mut_with(&mut rename_with_config(&map, self.config.clone()));
+        }
     }
 
     fn visit_mut_script(&mut self, m: &mut Script) {
@@ -300,7 +320,9 @@ where
             m.visit_mut_children_with(self);
         }
 
-        m.visit_mut_with(&mut rename_with_config(&map, self.config.clone()));
+        if !map.is_empty() {
+            m.visit_mut_with(&mut rename_with_config(&map, self.config.clone()));
+        }
     }
 }
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +eval('')
 +export default function Foo() {
 +}
++
 +Foo()
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+eval('');`
	`2`	`+export default function Foo() {}`
	`3`	`+Foo();`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+eval('');`
	`2`	`+export function Foo() {}`
	`3`	`+Foo();`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`function x() {`
`2`	`2`	`(class Baz {`
`3`	`3`	`});`
`4`		`- let Foo = class Foo {`
`5`		`- };`
	`4`	`+ class Foo {`
	`5`	`+ }`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`function foo() {`
`2`		`- let Bar = class Bar {`
`3`		`- };`
	`2`	`+ class Bar {`
	`3`	`+ }`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ impl Visit for Analyzer {`
`218`	`218`	`self.add_decl(id.to_id(), true);`
`219`	`219`	`}`
`220`	`220`
`221`		`- f.function.visit_with(self)`
	`221`	`+ f.visit_with(self);`
`222`	`222`	`}`
`223`	`223`	`DefaultDecl::TsInterfaceDecl(_) => {}`
`224`	`224`	`}`
`@@ -240,7 +240,7 @@ impl Visit for Analyzer {`
`240`	`240`	`maybe_grow_default(\|\| e.visit_children_with(self));`
`241`	`241`
`242`	`242`	`if let Expr::Ident(i) = e {`
`243`		`- self.add_usage(i.to_id())`
	`243`	`+ self.add_usage(i.to_id());`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`self.is_pat_decl = old_is_pat_decl;`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,9 @@ macro_rules! unit {`
`202`	`202`	`} else {`
`203`	`203`	`let map = self.get_map(n, false, false, false);`
`204`	`204`
`205`		`- n.visit_mut_with(&mut rename_with_config(&map, self.config.clone()));`
	`205`	`+ if !map.is_empty() {`
	`206`	`+ n.visit_mut_with(&mut rename_with_config(&map, self.config.clone()));`
	`207`	`+ }`
`206`	`208`	`}`
`207`	`209`	`}`
`208`	`210`	`};`
`@@ -214,7 +216,9 @@ macro_rules! unit {`
`214`	`216`	`} else {`
`215`	`217`	`let map = self.get_map(n, true, false, false);`
`216`	`218`
`217`		`- n.visit_mut_with(&mut rename_with_config(&map, self.config.clone()));`
	`219`	`+ if !map.is_empty() {`
	`220`	`+ n.visit_mut_with(&mut rename_with_config(&map, self.config.clone()));`
	`221`	`+ }`
`218`	`222`	`}`
`219`	`223`	`}`
`220`	`224`	`};`
`@@ -246,6 +250,20 @@ where`
`246`	`250`
`247`	`251`	`unit!(visit_mut_class_decl, ClassDecl, true);`
`248`	`252`
	`253`	`+ fn visit_mut_default_decl(&mut self, n: &mut DefaultDecl) {`
	`254`	`+ match n {`
	`255`	`+ DefaultDecl::Class(n) => {`
	`256`	`+ n.visit_mut_children_with(self);`
	`257`	`+ }`
	`258`	`+ DefaultDecl::Fn(n) => {`
	`259`	`+ n.visit_mut_children_with(self);`
	`260`	`+ }`
	`261`	`+ DefaultDecl::TsInterfaceDecl(n) => {`
	`262`	`+ n.visit_mut_children_with(self);`
	`263`	`+ }`
	`264`	`+ }`
	`265`	`+ }`
	`266`	`+`
`249`	`267`	`fn visit_mut_expr(&mut self, n: &mut Expr) {`
`250`	`268`	`maybe_grow_default(\|\| n.visit_mut_children_with(self));`
`251`	`269`	`}`
`@@ -284,7 +302,9 @@ where`
`284`	`302`	`m.visit_mut_children_with(self);`
`285`	`303`	`}`
`286`	`304`
`287`		`- m.visit_mut_with(&mut rename_with_config(&map, self.config.clone()));`
	`305`	`+ if !map.is_empty() {`
	`306`	`+ m.visit_mut_with(&mut rename_with_config(&map, self.config.clone()));`
	`307`	`+ }`
`288`	`308`	`}`
`289`	`309`
`290`	`310`	`fn visit_mut_script(&mut self, m: &mut Script) {`
`@@ -300,7 +320,9 @@ where`
`300`	`320`	`m.visit_mut_children_with(self);`
`301`	`321`	`}`
`302`	`322`
`303`		`- m.visit_mut_with(&mut rename_with_config(&map, self.config.clone()));`
	`323`	`+ if !map.is_empty() {`
	`324`	`+ m.visit_mut_with(&mut rename_with_config(&map, self.config.clone()));`
	`325`	`+ }`
`304`	`326`	`}`
`305`	`327`	`}`
`306`	`328`