fix(es/compat): Handle classes with accessors and a method with the s…

…ame name (#5039)

crates/swc_ecma_transforms_compat/src/es2015/classes/mod.rs

@@ -965,9 +965,20 @@ where
                 method: None,
             });
             match m.kind {
-                MethodKind::Getter => data.get = Some(value),
-                MethodKind::Setter => data.set = Some(value),
-                MethodKind::Method => data.method = Some(value),
+                // https://github.com/swc-project/swc/issues/5029
+                MethodKind::Getter => {
+                    data.method = None;
+                    data.get = Some(value)
+                }
+                MethodKind::Setter => {
+                    data.method = None;
+                    data.set = Some(value)
+                }
+                MethodKind::Method => {
+                    data.get = None;
+                    data.set = None;
+                    data.method = Some(value)
+                }
             }
         }
 

crates/swc_ecma_transforms_compat/src/es2015/classes/prop_name.rs

@@ -1,27 +1,23 @@
-use num_bigint::BigInt as BigIntValue;
-use ordered_float::OrderedFloat;
 use swc_atoms::JsWord;
 use swc_common::{Span, Spanned};
 use swc_ecma_ast::*;
 
 #[derive(Debug, PartialEq, Eq, Hash)]
 pub enum HashKey {
-    Ident(JsWord),
     Str(JsWord),
-    Num(OrderedFloat<f64>),
-    BigInt(BigIntValue),
     /// Not for key merging
     Computed(Span),
 }
 
 impl From<&PropName> for HashKey {
     fn from(p: &PropName) -> Self {
-        match *p {
-            PropName::Ident(Ident { ref sym, .. }) => HashKey::Ident(sym.clone()),
-            PropName::Str(Str { ref value, .. }) => HashKey::Str(value.clone()),
-            PropName::Num(Number { value, .. }) => HashKey::Num(value.into()),
-            PropName::BigInt(BigInt { ref value, .. }) => HashKey::BigInt(value.clone()),
-            PropName::Computed(ref expr) => HashKey::Computed(expr.span()),
+        match p {
+            PropName::Ident(Ident { sym: value, .. }) | PropName::Str(Str { value, .. }) => {
+                HashKey::Str(value.clone())
+            }
+            PropName::Num(Number { value, .. }) => HashKey::Str(value.to_string().into()),
+            PropName::BigInt(BigInt { value, .. }) => HashKey::Str(value.to_string().into()),
+            PropName::Computed(expr) => HashKey::Computed(expr.span()),
         }
     }
 }

crates/swc_ecma_transforms_compat/tests/classes/issue-5029/1/input.js

@@ -0,0 +1,5 @@
+class A {
+    static b() {}
+    static get b() {}
+    static set b(b) {}
+}

crates/swc_ecma_transforms_compat/tests/classes/issue-5029/1/output.js

@@ -0,0 +1,14 @@
+let A = /*#__PURE__*/ function() {
+    "use strict";
+    function A() {
+        _classCallCheck(this, A);
+    }
+    _createClass(A, null, [
+        {
+            key: "b",
+            get: function() {},
+            set: function(b) {}
+        }
+    ]);
+    return A;
+}();

crates/swc_ecma_transforms_compat/tests/classes/issue-5029/2/input.js

@@ -0,0 +1,5 @@
+class A {
+    "b"() {}
+    get b() {}
+    set b(b) {}
+}

crates/swc_ecma_transforms_compat/tests/classes/issue-5029/2/output.js

@@ -0,0 +1,14 @@
+let A = /*#__PURE__*/ function() {
+    "use strict";
+    function A() {
+        _classCallCheck(this, A);
+    }
+    _createClass(A, [
+        {
+            key: "b",
+            get: function() {},
+            set: function(b) {}
+        }
+    ]);
+    return A;
+}();

crates/swc_ecma_transforms_compat/tests/classes/issue-5029/3/input.js

@@ -0,0 +1,5 @@
+class A {
+    get b() {}
+    set b(b) {}
+    b() {}
+}

crates/swc_ecma_transforms_compat/tests/classes/issue-5029/3/output.js

@@ -0,0 +1,13 @@
+let A = /*#__PURE__*/ function() {
+    "use strict";
+    function A() {
+        _classCallCheck(this, A);
+    }
+    _createClass(A, [
+        {
+            key: "b",
+            value: function b() {}
+        }
+    ]);
+    return A;
+}();

crates/swc_ecma_transforms_compat/tests/es2015_classes.rs

@@ -1902,9 +1902,6 @@ function Foo() {
   _createClass(Foo, [{
     key: "foo",
     value: function foo() {}
-  }, {
-    key: "foo",
-    value: function foo() {}
   }, {
     key: bar,
     value: function() {}
@@ -7231,10 +7228,6 @@ let Test = /*#__PURE__*/function (Foo) {
     return _super.apply(this, arguments);
   }
 
-  var _proto = Test.prototype;
-
-  _proto["foo"] = function foo() {};
-
   _createClass(Test, [
     {
       key: "foo",