Fix @Satisfies tag preventing @param types from being applied to arrow functions (#3746)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: sandersn <293473+sandersn@users.noreply.github.com>

Author: Copilot

internal/parser/reparser.go

@@ -564,19 +564,27 @@ func findMatchingParameter(fun *ast.Node, parameterTag *ast.JSDocParameterOrProp
 	return nil, false
 }
 
+func skipSatisfiesExpressions(node *ast.Node) *ast.Node {
+	for node != nil && node.Kind == ast.KindSatisfiesExpression {
+		node = node.Expression()
+	}
+	return node
+}
+
 func getFunctionLikeHost(host *ast.Node) *ast.Node {
 	fun := host
 	if host.Kind == ast.KindVariableStatement && host.AsVariableStatement().DeclarationList != nil {
 		for _, declaration := range host.AsVariableStatement().DeclarationList.AsVariableDeclarationList().Declarations.Nodes {
-			if ast.IsFunctionLike(declaration.Initializer()) {
-				fun = declaration.Initializer()
+			initializer := skipSatisfiesExpressions(declaration.Initializer())
+			if ast.IsFunctionLike(initializer) {
+				fun = initializer
 				break
 			}
 		}
 	} else if host.Kind == ast.KindPropertyAssignment {
-		fun = host.Initializer()
+		fun = skipSatisfiesExpressions(host.Initializer())
 	} else if host.Kind == ast.KindPropertyDeclaration {
-		fun = host.Initializer()
+		fun = skipSatisfiesExpressions(host.Initializer())
 	} else if host.Kind == ast.KindExportAssignment {
 		fun = host.Expression()
 	} else if host.Kind == ast.KindReturnStatement {

testdata/baselines/reference/compiler/jsdocSatisfiesTagWithParamTag.errors.txt

@@ -0,0 +1,31 @@
+/a.js(9,16): error TS1360: Type '(a: string, b: string) => void' does not satisfy the expected type '(a: string, ...args: number[]) => void'.
+  Types of parameters 'b' and 'args' are incompatible.
+    Type 'number' is not assignable to type 'string'.
+
+
+==== /a.js (1 errors) ====
+    /** 
+     * @satisfies {(a: string, ...args: never) => void}
+     * @param {string} a
+     * @param {number} b
+     */
+    export const fn1 = (a, b) => {};
+    
+    /** 
+     * @satisfies {(a: string, ...args: number[]) => void}
+                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1360: Type '(a: string, b: string) => void' does not satisfy the expected type '(a: string, ...args: number[]) => void'.
+!!! error TS1360:   Types of parameters 'b' and 'args' are incompatible.
+!!! error TS1360:     Type 'number' is not assignable to type 'string'.
+     * @param {string} a
+     * @param {string} b
+     */
+    export const fn2 = (a, b) => {};
+    
+    /** 
+     * @satisfies {(a: string, ...args: number[]) => void}
+     * @param {string} a
+     * @param {string | number} b
+     */
+    export const fn3 = (a, b) => {};
+    

testdata/baselines/reference/compiler/jsdocSatisfiesTagWithParamTag.js

@@ -0,0 +1,65 @@
+//// [tests/cases/compiler/jsdocSatisfiesTagWithParamTag.ts] ////
+
+//// [a.js]
+/** 
+ * @satisfies {(a: string, ...args: never) => void}
+ * @param {string} a
+ * @param {number} b
+ */
+export const fn1 = (a, b) => {};
+
+/** 
+ * @satisfies {(a: string, ...args: number[]) => void}
+ * @param {string} a
+ * @param {string} b
+ */
+export const fn2 = (a, b) => {};
+
+/** 
+ * @satisfies {(a: string, ...args: number[]) => void}
+ * @param {string} a
+ * @param {string | number} b
+ */
+export const fn3 = (a, b) => {};
+
+
+//// [a.js]
+/**
+ * @satisfies {(a: string, ...args: never) => void}
+ * @param {string} a
+ * @param {number} b
+ */
+export const fn1 = (a, b) => { };
+/**
+ * @satisfies {(a: string, ...args: number[]) => void}
+ * @param {string} a
+ * @param {string} b
+ */
+export const fn2 = (a, b) => { };
+/**
+ * @satisfies {(a: string, ...args: number[]) => void}
+ * @param {string} a
+ * @param {string | number} b
+ */
+export const fn3 = (a, b) => { };
+
+
+//// [a.d.ts]
+/**
+ * @satisfies {(a: string, ...args: never) => void}
+ * @param {string} a
+ * @param {number} b
+ */
+export declare const fn1: (a: string, b: number) => void;
+/**
+ * @satisfies {(a: string, ...args: number[]) => void}
+ * @param {string} a
+ * @param {string} b
+ */
+export declare const fn2: (a: string, b: string) => void;
+/**
+ * @satisfies {(a: string, ...args: number[]) => void}
+ * @param {string} a
+ * @param {string | number} b
+ */
+export declare const fn3: (a: string, b: string | number) => void;

testdata/baselines/reference/compiler/jsdocSatisfiesTagWithParamTag.symbols

@@ -0,0 +1,33 @@
+//// [tests/cases/compiler/jsdocSatisfiesTagWithParamTag.ts] ////
+
+=== /a.js ===
+/** 
+ * @satisfies {(a: string, ...args: never) => void}
+ * @param {string} a
+ * @param {number} b
+ */
+export const fn1 = (a, b) => {};
+>fn1 : Symbol(fn1, Decl(a.js, 5, 12))
+>a : Symbol(a, Decl(a.js, 5, 20))
+>b : Symbol(b, Decl(a.js, 5, 22))
+
+/** 
+ * @satisfies {(a: string, ...args: number[]) => void}
+ * @param {string} a
+ * @param {string} b
+ */
+export const fn2 = (a, b) => {};
+>fn2 : Symbol(fn2, Decl(a.js, 12, 12))
+>a : Symbol(a, Decl(a.js, 12, 20))
+>b : Symbol(b, Decl(a.js, 12, 22))
+
+/** 
+ * @satisfies {(a: string, ...args: number[]) => void}
+ * @param {string} a
+ * @param {string | number} b
+ */
+export const fn3 = (a, b) => {};
+>fn3 : Symbol(fn3, Decl(a.js, 19, 12))
+>a : Symbol(a, Decl(a.js, 19, 20))
+>b : Symbol(b, Decl(a.js, 19, 22))
+

testdata/baselines/reference/compiler/jsdocSatisfiesTagWithParamTag.types

@@ -0,0 +1,36 @@
+//// [tests/cases/compiler/jsdocSatisfiesTagWithParamTag.ts] ////
+
+=== /a.js ===
+/** 
+ * @satisfies {(a: string, ...args: never) => void}
+ * @param {string} a
+ * @param {number} b
+ */
+export const fn1 = (a, b) => {};
+>fn1 : (a: string, b: number) => void
+>(a, b) => {} : (a: string, b: number) => void
+>a : string
+>b : number
+
+/** 
+ * @satisfies {(a: string, ...args: number[]) => void}
+ * @param {string} a
+ * @param {string} b
+ */
+export const fn2 = (a, b) => {};
+>fn2 : (a: string, b: string) => void
+>(a, b) => {} : (a: string, b: string) => void
+>a : string
+>b : string
+
+/** 
+ * @satisfies {(a: string, ...args: number[]) => void}
+ * @param {string} a
+ * @param {string | number} b
+ */
+export const fn3 = (a, b) => {};
+>fn3 : (a: string, b: string | number) => void
+>(a, b) => {} : (a: string, b: string | number) => void
+>a : string
+>b : string | number
+

testdata/baselines/reference/submodule/conformance/checkJsdocSatisfiesTag15.errors.txt

@@ -1,8 +1,11 @@
 /a.js(9,20): error TS2322: Type 'number' is not assignable to type 'string'.
+/a.js(28,16): error TS1360: Type '(a: string, b: string) => void' does not satisfy the expected type '(a: string, ...args: number[]) => void'.
+  Types of parameters 'b' and 'args' are incompatible.
+    Type 'number' is not assignable to type 'string'.
 /a.js(42,21): error TS7006: Parameter 'uuid' implicitly has an 'any' type.
 
 
-==== /a.js (2 errors) ====
+==== /a.js (3 errors) ====
     /** @satisfies {(uuid: string) => void} */
     export const fn1 = uuid => {};
 
@@ -33,6 +36,10 @@
 
     /** 
      * @satisfies {(a: string, ...args: number[]) => void}
+                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS1360: Type '(a: string, b: string) => void' does not satisfy the expected type '(a: string, ...args: number[]) => void'.
+!!! error TS1360:   Types of parameters 'b' and 'args' are incompatible.
+!!! error TS1360:     Type 'number' is not assignable to type 'string'.
      * @param {string} a
      * @param {string} b
      */

testdata/baselines/reference/submodule/conformance/checkJsdocSatisfiesTag15.errors.txt.diff

@@ -3,24 +3,16 @@
 @@= skipped -0, +0 lines =@@
  /a.js(9,20): error TS2322: Type 'number' is not assignable to type 'string'.
 -/a.js(28,5): error TS1360: Type '(a: string, b: string) => void' does not satisfy the expected type '(a: string, ...args: number[]) => void'.
--  Types of parameters 'b' and 'args' are incompatible.
--    Type 'number' is not assignable to type 'string'.
++/a.js(28,16): error TS1360: Type '(a: string, b: string) => void' does not satisfy the expected type '(a: string, ...args: number[]) => void'.
+   Types of parameters 'b' and 'args' are incompatible.
+     Type 'number' is not assignable to type 'string'.
  /a.js(42,21): error TS7006: Parameter 'uuid' implicitly has an 'any' type.
-
-
--==== /a.js (3 errors) ====
-+==== /a.js (2 errors) ====
-     /** @satisfies {(uuid: string) => void} */
-     export const fn1 = uuid => {};
-     
-@@= skipped -35, +32 lines =@@
+@@= skipped -35, +35 lines =@@
 
      /** 
       * @satisfies {(a: string, ...args: number[]) => void}
 -        ~~~~~~~~~
--!!! error TS1360: Type '(a: string, b: string) => void' does not satisfy the expected type '(a: string, ...args: number[]) => void'.
--!!! error TS1360:   Types of parameters 'b' and 'args' are incompatible.
--!!! error TS1360:     Type 'number' is not assignable to type 'string'.
-      * @param {string} a
-      * @param {string} b
-      */
++                   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ !!! error TS1360: Type '(a: string, b: string) => void' does not satisfy the expected type '(a: string, ...args: number[]) => void'.
+ !!! error TS1360:   Types of parameters 'b' and 'args' are incompatible.
+ !!! error TS1360:     Type 'number' is not assignable to type 'string'.

testdata/baselines/reference/submodule/conformance/checkJsdocSatisfiesTag15.js

@@ -103,18 +103,18 @@ export declare const fn3: (a: string, b: never) => void;
  * @param {string} a
  * @param {number} b
  */
-export declare const fn4: (a: string, b: never) => void;
+export declare const fn4: (a: string, b: number) => void;
 /**
  * @satisfies {(a: string, ...args: number[]) => void}
  * @param {string} a
  * @param {string} b
  */
-export declare const fn5: (a: string, b: number) => void;
+export declare const fn5: (a: string, b: string) => void;
 /**
  * @satisfies {(a: string, ...args: number[]) => void}
  * @param {string} a
  * @param {string | number} b
  */
-export declare const fn6: (a: string, b: number) => void;
+export declare const fn6: (a: string, b: string | number) => void;
 /** @satisfies {(uuid: string) => void} */
 export declare function fn7(uuid: any): void;

testdata/baselines/reference/submodule/conformance/checkJsdocSatisfiesTag15.types

@@ -44,32 +44,32 @@ export const fn3 = (a, b) => {};
  * @param {number} b
  */
 export const fn4 = (a, b) => {};
->fn4 : (a: string, b: never) => void
->(a, b) => {} : (a: string, b: never) => void
+>fn4 : (a: string, b: number) => void
+>(a, b) => {} : (a: string, b: number) => void
 >a : string
->b : never
+>b : number
 
 /** 
  * @satisfies {(a: string, ...args: number[]) => void}
  * @param {string} a
  * @param {string} b
  */
 export const fn5 = (a, b) => {};
->fn5 : (a: string, b: number) => void
->(a, b) => {} : (a: string, b: number) => void
+>fn5 : (a: string, b: string) => void
+>(a, b) => {} : (a: string, b: string) => void
 >a : string
->b : number
+>b : string
 
 /** 
  * @satisfies {(a: string, ...args: number[]) => void}
  * @param {string} a
  * @param {string | number} b
  */
 export const fn6 = (a, b) => {};
->fn6 : (a: string, b: number) => void
->(a, b) => {} : (a: string, b: number) => void
+>fn6 : (a: string, b: string | number) => void
+>(a, b) => {} : (a: string, b: string | number) => void
 >a : string
->b : number
+>b : string | number
 
 /** @satisfies {(uuid: string) => void} */
 export function fn7(uuid) {}