fix(ast/estree): Fix TSFunctionType and TSCallSignatureDeclaration (#9959)

Skips estree serialisation for the field named `this_param` for both
`TSFunctionType` and `TSCallSignatureDeclaration` nodes.

PR is part of ongoing work to align our AST's ESTree output with that of
TS-ESLint's. Relates to #9705.

---------

Co-authored-by: overlookmotel <[email protected]>

Author: therewillbecode

crates/oxc_ast/src/ast/ts.rs

@@ -975,6 +975,7 @@ pub struct TSIndexSignature<'a> {
 pub struct TSCallSignatureDeclaration<'a> {
     pub span: Span,
     pub type_parameters: Option<Box<'a, TSTypeParameterDeclaration<'a>>>,
+    #[estree(skip)]
     pub this_param: Option<TSThisParameter<'a>>,
     pub params: Box<'a, FormalParameters<'a>>,
     pub return_type: Option<Box<'a, TSTypeAnnotation<'a>>>,
@@ -1319,6 +1320,7 @@ pub struct TSFunctionType<'a> {
     /// type T = (this: string, a: number) => void;
     /// //        ^^^^^^^^^^^^
     /// ```
+    #[estree(skip)]
     pub this_param: Option<Box<'a, TSThisParameter<'a>>>,
     /// Function parameters. Akin to [`Function::params`].
     pub params: Box<'a, FormalParameters<'a>>,

crates/oxc_ast/src/generated/derive_estree.rs

@@ -2907,7 +2907,6 @@ impl ESTree for TSCallSignatureDeclaration<'_> {
         state.serialize_field("start", &self.span.start);
         state.serialize_field("end", &self.span.end);
         state.serialize_field("typeParameters", &self.type_parameters);
-        state.serialize_field("thisParam", &self.this_param);
         state.serialize_field("params", &self.params);
         state.serialize_field("returnType", &self.return_type);
         state.end();
@@ -3124,7 +3123,6 @@ impl ESTree for TSFunctionType<'_> {
         state.serialize_field("start", &self.span.start);
         state.serialize_field("end", &self.span.end);
         state.serialize_field("typeParameters", &self.type_parameters);
-        state.serialize_field("thisParam", &self.this_param);
         state.serialize_field("params", &self.params);
         state.serialize_field("returnType", &self.return_type);
         state.end();

napi/parser/deserialize-js.js

@@ -1662,7 +1662,6 @@ function deserializeTSCallSignatureDeclaration(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 8),
-    thisParam: deserializeOptionTSThisParameter(pos + 16),
     params: deserializeBoxFormalParameters(pos + 48),
     returnType: deserializeOptionBoxTSTypeAnnotation(pos + 56),
   };
@@ -1798,7 +1797,6 @@ function deserializeTSFunctionType(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 8),
-    thisParam: deserializeOptionBoxTSThisParameter(pos + 16),
     params: deserializeBoxFormalParameters(pos + 24),
     returnType: deserializeBoxTSTypeAnnotation(pos + 32),
   };

napi/parser/deserialize-ts.js

@@ -1727,7 +1727,6 @@ function deserializeTSCallSignatureDeclaration(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 8),
-    thisParam: deserializeOptionTSThisParameter(pos + 16),
     params: deserializeBoxFormalParameters(pos + 48),
     returnType: deserializeOptionBoxTSTypeAnnotation(pos + 56),
   };
@@ -1863,7 +1862,6 @@ function deserializeTSFunctionType(pos) {
     start: deserializeU32(pos),
     end: deserializeU32(pos + 4),
     typeParameters: deserializeOptionBoxTSTypeParameterDeclaration(pos + 8),
-    thisParam: deserializeOptionBoxTSThisParameter(pos + 16),
     params: deserializeBoxFormalParameters(pos + 24),
     returnType: deserializeBoxTSTypeAnnotation(pos + 32),
   };

npm/oxc-types/types.d.ts

@@ -1210,7 +1210,6 @@ export interface TSIndexSignature extends Span {
 export interface TSCallSignatureDeclaration extends Span {
   type: 'TSCallSignatureDeclaration';
   typeParameters: TSTypeParameterDeclaration | null;
-  thisParam: TSThisParameter | null;
   params: ParamPattern[];
   returnType: TSTypeAnnotation | null;
 }
@@ -1307,7 +1306,6 @@ export interface TSImportType extends Span {
 export interface TSFunctionType extends Span {
   type: 'TSFunctionType';
   typeParameters: TSTypeParameterDeclaration | null;
-  thisParam: TSThisParameter | null;
   params: ParamPattern[];
   returnType: TSTypeAnnotation;
 }