fix(ast/estree): remove custom serializer for MethodDefinition key field (#11763)

Remove the custom ESTree serializer for `MethodDefinition`'s `key` field. This serializer was required to replicate a bug in TS-ESLint, which they've now fixed. This fixes the test case which was broken by #11762.

Author: overlookmotel

crates/oxc_ast/src/ast/js.rs

@@ -2097,7 +2097,6 @@ pub struct MethodDefinition<'a> {
     /// This will always be true when an `abstract` modifier is used on the method.
     pub r#type: MethodDefinitionType,
     pub decorators: Vec<'a, Decorator<'a>>,
-    #[estree(via = MethodDefinitionKey)]
     pub key: PropertyKey<'a>,
     #[visit(args(flags = match self.kind {
         MethodDefinitionKind::Get => ScopeFlags::Function | ScopeFlags::GetAccessor,

crates/oxc_ast/src/generated/derive_estree.rs

@@ -1499,7 +1499,7 @@ impl ESTree for MethodDefinition<'_> {
         state.serialize_field("start", &self.span.start);
         state.serialize_field("end", &self.span.end);
         state.serialize_field("decorators", &self.decorators);
-        state.serialize_field("key", &crate::serialize::js::MethodDefinitionKey(self));
+        state.serialize_field("key", &self.key);
         state.serialize_field("value", &self.value);
         state.serialize_field("kind", &self.kind);
         state.serialize_field("computed", &self.computed);

crates/oxc_ast/src/serialize/js.rs

@@ -3,7 +3,6 @@ use oxc_estree::{
     Concat2, ConcatElement, ESTree, JsonSafeString, SequenceSerializer, Serializer,
     StructSerializer,
 };
-use oxc_span::GetSpan;
 
 use crate::ast::*;
 
@@ -380,52 +379,6 @@ impl ESTree for ExportAllDeclarationWithClause<'_, '_> {
 // Misc
 // ----------------------------------------
 
-/// Serializer for `key` field of `MethodDefinition`.
-///
-/// In TS-ESTree `"constructor"` in `class C { "constructor"() {} }`
-/// is represented as an `Identifier`.
-/// In Acorn and Espree, it's a `Literal`.
-/// <https://github.com/typescript-eslint/typescript-eslint/issues/11084>
-#[ast_meta]
-#[estree(
-    ts_type = "PropertyKey",
-    raw_deser = "
-        /* IF_JS */
-        DESER[PropertyKey](POS_OFFSET.key)
-        /* END_IF_JS */
-
-        /* IF_TS */
-        let key = DESER[PropertyKey](POS_OFFSET.key);
-        if (THIS.kind === 'constructor') {
-            key = {
-                type: 'Identifier',
-                start: key.start,
-                end: key.end,
-                decorators: [],
-                name: 'constructor',
-                optional: false,
-                typeAnnotation: null,
-            };
-        }
-        key
-        /* END_IF_TS */
-    "
-)]
-pub struct MethodDefinitionKey<'a, 'b>(pub &'b MethodDefinition<'a>);
-
-impl ESTree for MethodDefinitionKey<'_, '_> {
-    fn serialize<S: Serializer>(&self, serializer: S) {
-        let method = self.0;
-        if S::INCLUDE_TS_FIELDS && method.kind == MethodDefinitionKind::Constructor {
-            // `key` can only be either an identifier `constructor`, or string `"constructor"`
-            let span = method.key.span();
-            IdentifierName { span, name: Atom::from("constructor") }.serialize(serializer);
-        } else {
-            method.key.serialize(serializer);
-        }
-    }
-}
-
 /// Serializer for `body` field of `ArrowFunctionExpression`.
 ///
 /// Serialize as either an expression (if `expression` property is set),

napi/parser/generated/deserialize/ts.js

@@ -956,27 +956,14 @@ function deserializeClassBody(pos) {
 }
 
 function deserializeMethodDefinition(pos) {
-  const kind = deserializeMethodDefinitionKind(pos + 57);
-  let key = deserializePropertyKey(pos + 32);
-  if (kind === 'constructor') {
-    key = {
-      type: 'Identifier',
-      start: key.start,
-      end: key.end,
-      decorators: [],
-      name: 'constructor',
-      optional: false,
-      typeAnnotation: null,
-    };
-  }
   return {
     type: deserializeMethodDefinitionType(pos + 56),
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     decorators: deserializeVecDecorator(pos + 8),
-    key,
+    key: deserializePropertyKey(pos + 32),
     value: deserializeBoxFunction(pos + 48),
-    kind,
+    kind: deserializeMethodDefinitionKind(pos + 57),
     computed: deserializeBool(pos + 58),
     static: deserializeBool(pos + 59),
     override: deserializeBool(pos + 60),

tasks/coverage/snapshots/estree_typescript.snap

@@ -2,9 +2,7 @@ commit: 81c95189
 
 estree_typescript Summary:
 AST Parsed     : 6489/6489 (100.00%)
-Positive Passed: 6485/6489 (99.94%)
-Mismatch: tasks/coverage/typescript/tests/cases/conformance/classes/constructorDeclarations/quotedConstructors.ts
-
+Positive Passed: 6486/6489 (99.95%)
 Mismatch: tasks/coverage/typescript/tests/cases/conformance/jsx/jsxReactTestSuite.tsx
 
 Mismatch: tasks/coverage/typescript/tests/cases/conformance/jsx/tsxReactEmitEntities.tsx