fix: definition of TS function type params (#15867)

Function type params can also be array or object patterns. They can NOT be assignment patterns.
babel · Aug 14, 2023 · 9c5109b · 9c5109b
1 parent 444cea4
commit 9c5109b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 11 deletions.
diff --git a/packages/babel-types/src/ast-types/generated/index.ts b/packages/babel-types/src/ast-types/generated/index.ts
@@ -1718,14 +1718,14 @@ export interface TSQualifiedName extends BaseNode {
 export interface TSCallSignatureDeclaration extends BaseNode {
   type: "TSCallSignatureDeclaration";
   typeParameters?: TSTypeParameterDeclaration | null;
-  parameters: Array<Identifier | RestElement>;
+  parameters: Array<ArrayPattern | Identifier | ObjectPattern | RestElement>;
   typeAnnotation?: TSTypeAnnotation | null;
 }
 
 export interface TSConstructSignatureDeclaration extends BaseNode {
   type: "TSConstructSignatureDeclaration";
   typeParameters?: TSTypeParameterDeclaration | null;
-  parameters: Array<Identifier | RestElement>;
+  parameters: Array<ArrayPattern | Identifier | ObjectPattern | RestElement>;
   typeAnnotation?: TSTypeAnnotation | null;
 }
 
@@ -1744,7 +1744,7 @@ export interface TSMethodSignature extends BaseNode {
   type: "TSMethodSignature";
   key: Expression;
   typeParameters?: TSTypeParameterDeclaration | null;
-  parameters: Array<Identifier | RestElement>;
+  parameters: Array<ArrayPattern | Identifier | ObjectPattern | RestElement>;
   typeAnnotation?: TSTypeAnnotation | null;
   computed?: boolean;
   kind: "method" | "get" | "set";
@@ -1818,14 +1818,14 @@ export interface TSThisType extends BaseNode {
 export interface TSFunctionType extends BaseNode {
   type: "TSFunctionType";
   typeParameters?: TSTypeParameterDeclaration | null;
-  parameters: Array<Identifier | RestElement>;
+  parameters: Array<ArrayPattern | Identifier | ObjectPattern | RestElement>;
   typeAnnotation?: TSTypeAnnotation | null;
 }
 
 export interface TSConstructorType extends BaseNode {
   type: "TSConstructorType";
   typeParameters?: TSTypeParameterDeclaration | null;
-  parameters: Array<Identifier | RestElement>;
+  parameters: Array<ArrayPattern | Identifier | ObjectPattern | RestElement>;
   typeAnnotation?: TSTypeAnnotation | null;
   abstract?: boolean | null;
 }
@@ -2915,8 +2915,13 @@ export interface ParentMaps {
     | ObjectMethod
     | ObjectProperty
     | RestElement
+    | TSCallSignatureDeclaration
+    | TSConstructSignatureDeclaration
+    | TSConstructorType
     | TSDeclareFunction
     | TSDeclareMethod
+    | TSFunctionType
+    | TSMethodSignature
     | VariableDeclarator;
   ArrayTypeAnnotation:
     | ArrayTypeAnnotation
@@ -5626,8 +5631,13 @@ export interface ParentMaps {
     | ObjectMethod
     | ObjectProperty
     | RestElement
+    | TSCallSignatureDeclaration
+    | TSConstructSignatureDeclaration
+    | TSConstructorType
     | TSDeclareFunction
     | TSDeclareMethod
+    | TSFunctionType
+    | TSMethodSignature
     | VariableDeclarator;
   ObjectProperty: ObjectExpression | ObjectPattern | RecordExpression;
   ObjectTypeAnnotation:

diff --git a/packages/babel-types/src/builders/generated/index.ts b/packages/babel-types/src/builders/generated/index.ts
@@ -1927,7 +1927,9 @@ export function tsQualifiedName(
 export { tsQualifiedName as tSQualifiedName };
 export function tsCallSignatureDeclaration(
   typeParameters: t.TSTypeParameterDeclaration | null | undefined = null,
-  parameters: Array<t.Identifier | t.RestElement>,
+  parameters: Array<
+    t.ArrayPattern | t.Identifier | t.ObjectPattern | t.RestElement
+  >,
   typeAnnotation: t.TSTypeAnnotation | null = null,
 ): t.TSCallSignatureDeclaration {
   return validateNode<t.TSCallSignatureDeclaration>({
@@ -1940,7 +1942,9 @@ export function tsCallSignatureDeclaration(
 export { tsCallSignatureDeclaration as tSCallSignatureDeclaration };
 export function tsConstructSignatureDeclaration(
   typeParameters: t.TSTypeParameterDeclaration | null | undefined = null,
-  parameters: Array<t.Identifier | t.RestElement>,
+  parameters: Array<
+    t.ArrayPattern | t.Identifier | t.ObjectPattern | t.RestElement
+  >,
   typeAnnotation: t.TSTypeAnnotation | null = null,
 ): t.TSConstructSignatureDeclaration {
   return validateNode<t.TSConstructSignatureDeclaration>({
@@ -1968,7 +1972,9 @@ export { tsPropertySignature as tSPropertySignature };
 export function tsMethodSignature(
   key: t.Expression,
   typeParameters: t.TSTypeParameterDeclaration | null | undefined = null,
-  parameters: Array<t.Identifier | t.RestElement>,
+  parameters: Array<
+    t.ArrayPattern | t.Identifier | t.ObjectPattern | t.RestElement
+  >,
   typeAnnotation: t.TSTypeAnnotation | null = null,
 ): t.TSMethodSignature {
   return validateNode<t.TSMethodSignature>({
@@ -2078,7 +2084,9 @@ export function tsThisType(): t.TSThisType {
 export { tsThisType as tSThisType };
 export function tsFunctionType(
   typeParameters: t.TSTypeParameterDeclaration | null | undefined = null,
-  parameters: Array<t.Identifier | t.RestElement>,
+  parameters: Array<
+    t.ArrayPattern | t.Identifier | t.ObjectPattern | t.RestElement
+  >,
   typeAnnotation: t.TSTypeAnnotation | null = null,
 ): t.TSFunctionType {
   return validateNode<t.TSFunctionType>({
@@ -2091,7 +2099,9 @@ export function tsFunctionType(
 export { tsFunctionType as tSFunctionType };
 export function tsConstructorType(
   typeParameters: t.TSTypeParameterDeclaration | null | undefined = null,
-  parameters: Array<t.Identifier | t.RestElement>,
+  parameters: Array<
+    t.ArrayPattern | t.Identifier | t.ObjectPattern | t.RestElement
+  >,
   typeAnnotation: t.TSTypeAnnotation | null = null,
 ): t.TSConstructorType {
   return validateNode<t.TSConstructorType>({

diff --git a/packages/babel-types/src/definitions/typescript.ts b/packages/babel-types/src/definitions/typescript.ts
@@ -97,7 +97,7 @@ defineType("TSQualifiedName", {
 const signatureDeclarationCommon = () => ({
   typeParameters: validateOptionalType("TSTypeParameterDeclaration"),
   [process.env.BABEL_8_BREAKING ? "params" : "parameters"]: validateArrayOfType(
-    ["Identifier", "RestElement"],
+    ["ArrayPattern", "Identifier", "ObjectPattern", "RestElement"],
   ),
   [process.env.BABEL_8_BREAKING ? "returnType" : "typeAnnotation"]:
     validateOptionalType("TSTypeAnnotation"),