[test] Test parameter names in function types in TypeScript export tests

broadwaylamb · Space Team · commit 5decea62e06a · 2025-11-14T12:11:55.000Z
diff --git a/js/js.translator/testData/typescript-export/js/functions-in-exported-file/functions.aa.d.ts b/js/js.translator/testData/typescript-export/js/functions-in-exported-file/functions.aa.d.ts
@@ -36,7 +36,7 @@ declare namespace JS_TESTS {
         function concatWithContextParameters(scope1: foo.Scope1, scope2: foo.Scope2): string;
         function concatWithExtensionAndContextParameter(scope1: foo.Scope1, _this_: foo.Scope2): string;
         function getWithExtension(_this_: foo.Scope1): string;
-        function context<A, B, R>(a: A, b: B, block: (p0: A, p1: B) => R): R;
+        function allParameters<A, B, C, D, R>(a: A, b: B, c: C, d: D, block: (p0: A, p1: B, p2: C, p3: D) => R): R;
         /* ErrorDeclaration: Class declarations are not implemented yet */
         /* ErrorDeclaration: Class declarations are not implemented yet */
         /* ErrorDeclaration: Class declarations are not implemented yet */
diff --git a/js/js.translator/testData/typescript-export/js/functions-in-exported-file/functions.d.ts b/js/js.translator/testData/typescript-export/js/functions-in-exported-file/functions.d.ts
@@ -68,6 +68,6 @@ declare namespace JS_TESTS {
         function concatWithContextParameters(scope1: foo.Scope1, scope2: foo.Scope2): string;
         function concatWithExtensionAndContextParameter(scope1: foo.Scope1, _this_: foo.Scope2): string;
         function getWithExtension(_this_: foo.Scope1): string;
-        function context<A, B, R>(a: A, b: B, block: (p0: A, p1: B) => R): R;
+        function allParameters<A, B, C, D, R>(a: A, b: B, c: C, d: D, block: (p0: A, p1: B, p2: C, p3: D) => R): R;
     }
 }
diff --git a/js/js.translator/testData/typescript-export/js/functions-in-exported-file/functions.kt b/js/js.translator/testData/typescript-export/js/functions-in-exported-file/functions.kt
@@ -140,4 +140,4 @@ fun Scope2.concatWithExtensionAndContextParameter() = scope1.getA() + getA()
 fun Scope1.getWithExtension() = getA()
 
 
-fun <A, B, R> context(a: A, b: B, block: context(A, B) () -> R): R = block(a, b)
+fun <A, B, C, D, R> allParameters(a: A, b: B, c: C, d: D, block: context(A, B) C.(d: D) -> R): R = block(a, b, c, d)
diff --git a/js/js.translator/testData/typescript-export/js/functions-in-exported-file/functions__main.ts b/js/js.translator/testData/typescript-export/js/functions-in-exported-file/functions__main.ts
@@ -26,7 +26,7 @@ import Scope1 = JS_TESTS.foo.Scope1;
 import Scope2 = JS_TESTS.foo.Scope2;
 import concatWithExtensionAndContextParameter = JS_TESTS.foo.concatWithExtensionAndContextParameter;
 import getWithExtension = JS_TESTS.foo.getWithExtension;
-import context = JS_TESTS.foo.context;
+import allParameters = JS_TESTS.foo.allParameters;
 
 function assert(condition: boolean) {
     if (!condition) {
@@ -94,8 +94,15 @@ function box(): string {
 
     assert(getWithExtension(new Scope1("A")) == "A")
 
-    assert(context(new Scope1("A"), new Scope2("B"), concatWithContextParameters) == "AB")
-    assert(context(new Scope1("B"), new Scope2("A"), concatWithContextParameters) == "BA")
+    assert(
+        allParameters(
+            new Scope1("A"),
+            new Scope2("B"),
+            "C",
+            "D",
+            (a, b, c, d) => concatWithContextParameters(a, b) + c + d
+        ) == "ABCD"
+    )
 
     return "OK";
 }
diff --git a/js/js.translator/testData/typescript-export/js/functions/functions.aa.d.ts b/js/js.translator/testData/typescript-export/js/functions/functions.aa.d.ts
@@ -36,7 +36,7 @@ declare namespace JS_TESTS {
         function concatWithContextParameters(scope1: foo.Scope1, scope2: foo.Scope2): string;
         function concatWithExtensionAndContextParameter(scope1: foo.Scope1, _this_: foo.Scope2): string;
         function getWithExtension(_this_: foo.Scope1): string;
-        function context<A, B, R>(a: A, b: B, block: (p0: A, p1: B) => R): R;
+        function allParameters<A, B, C, D, R>(a: A, b: B, c: C, d: D, block: (p0: A, p1: B, p2: C, p3: D) => R): R;
         /* ErrorDeclaration: Class declarations are not implemented yet */
         /* ErrorDeclaration: Class declarations are not implemented yet */
         /* ErrorDeclaration: Class declarations are not implemented yet */
diff --git a/js/js.translator/testData/typescript-export/js/functions/functions.d.ts b/js/js.translator/testData/typescript-export/js/functions/functions.d.ts
@@ -68,6 +68,6 @@ declare namespace JS_TESTS {
         function concatWithContextParameters(scope1: foo.Scope1, scope2: foo.Scope2): string;
         function concatWithExtensionAndContextParameter(scope1: foo.Scope1, _this_: foo.Scope2): string;
         function getWithExtension(_this_: foo.Scope1): string;
-        function context<A, B, R>(a: A, b: B, block: (p0: A, p1: B) => R): R;
+        function allParameters<A, B, C, D, R>(a: A, b: B, c: C, d: D, block: (p0: A, p1: B, p2: C, p3: D) => R): R;
     }
 }
diff --git a/js/js.translator/testData/typescript-export/js/functions/functions.kt b/js/js.translator/testData/typescript-export/js/functions/functions.kt
@@ -135,4 +135,4 @@ fun Scope2.concatWithExtensionAndContextParameter() = scope1.getA() + getA()
 fun Scope1.getWithExtension() = getA()
 
 @JsExport
-fun <A, B, R> context(a: A, b: B, block: context(A, B) () -> R): R = block(a, b)
+fun <A, B, C, D, R> allParameters(a: A, b: B, c: C, d: D, block: context(A, B) C.(d: D) -> R): R = block(a, b, c, d)
diff --git a/js/js.translator/testData/typescript-export/js/functions/functions__main.ts b/js/js.translator/testData/typescript-export/js/functions/functions__main.ts
@@ -26,7 +26,7 @@ import Scope1 = JS_TESTS.foo.Scope1;
 import Scope2 = JS_TESTS.foo.Scope2;
 import concatWithExtensionAndContextParameter = JS_TESTS.foo.concatWithExtensionAndContextParameter;
 import getWithExtension = JS_TESTS.foo.getWithExtension;
-import context = JS_TESTS.foo.context;
+import allParameters = JS_TESTS.foo.allParameters;
 
 function assert(condition: boolean) {
     if (!condition) {
@@ -94,8 +94,15 @@ function box(): string {
 
     assert(getWithExtension(new Scope1("A")) == "A")
 
-    assert(context(new Scope1("A"), new Scope2("B"), concatWithContextParameters) == "AB")
-    assert(context(new Scope1("B"), new Scope2("A"), concatWithContextParameters) == "BA")
+    assert(
+        allParameters(
+            new Scope1("A"),
+            new Scope2("B"),
+            "C",
+            "D",
+            (a, b, c, d) => concatWithContextParameters(a, b) + c + d
+        ) == "ABCD"
+    )
 
     return "OK";
 }
diff --git a/js/js.translator/testData/typescript-export/js/primitives-in-exported-file/primitives.kt b/js/js.translator/testData/typescript-export/js/primitives-in-exported-file/primitives.kt
@@ -154,19 +154,19 @@ val _n_array_n_int: Array<Int?>? = emptyArray()
 val _array_n_array_string: Array<Array<String>?> = arrayOf(arrayOf(":)"))
 
 
-val _fun_n_int_unit: (Int?) -> Unit = { x -> }
+val _fun_n_int_unit: (int: Int?) -> Unit = { x -> }
 
 
-val _fun_n_int_unit_class: Function1<Int?, Unit> = { x -> }
+val _fun_n_int_unit_class: Function1<@ParameterName("int") Int?, Unit> = { x -> }
 
 
 val _kfun_n_int_unit: kotlin.reflect.KFunction1<Int?, Unit> = _fun_n_int_unit_class::invoke
 
 
-val _fun_n_int_unit_suspend: suspend (Int?) -> Unit = { x -> }
+val _fun_n_int_unit_suspend: suspend (int: Int?) -> Unit = { x -> }
 
 
-val _fun_n_int_unit_suspend_class: kotlin.coroutines.SuspendFunction1<Int?, Unit> = { x -> }
+val _fun_n_int_unit_suspend_class: kotlin.coroutines.SuspendFunction1<@ParameterName("int") Int?, Unit> = { x -> }
 
 
 val _kfun_n_int_unit_suspend: kotlin.reflect.KSuspendFunction1<Int?, Unit> = _fun_n_int_unit_suspend::invoke
diff --git a/js/js.translator/testData/typescript-export/js/primitives/primitives.kt b/js/js.translator/testData/typescript-export/js/primitives/primitives.kt
@@ -149,19 +149,19 @@ val _n_array_n_int: Array<Int?>? = emptyArray()
 val _array_n_array_string: Array<Array<String>?> = arrayOf(arrayOf(":)"))
 
 @JsExport
-val _fun_n_int_unit: (Int?) -> Unit = { x -> }
+val _fun_n_int_unit: (int: Int?) -> Unit = { x -> }
 
 @JsExport
-val _fun_n_int_unit_class: Function1<Int?, Unit> = { x -> }
+val _fun_n_int_unit_class: Function1<@ParameterName("int") Int?, Unit> = { x -> }
 
 @JsExport
 val _kfun_n_int_unit: kotlin.reflect.KFunction1<Int?, Unit> = _fun_n_int_unit_class::invoke
 
 @JsExport
-val _fun_n_int_unit_suspend: suspend (Int?) -> Unit = { x -> }
+val _fun_n_int_unit_suspend: suspend (int: Int?) -> Unit = { x -> }
 
 @JsExport
-val _fun_n_int_unit_suspend_class: kotlin.coroutines.SuspendFunction1<Int?, Unit> = { x -> }
+val _fun_n_int_unit_suspend_class: kotlin.coroutines.SuspendFunction1<@ParameterName("int") Int?, Unit> = { x -> }
 
 @JsExport
 val _kfun_n_int_unit_suspend: kotlin.reflect.KSuspendFunction1<Int?, Unit> = _fun_n_int_unit_suspend::invoke
diff --git a/js/js.translator/testData/typescript-export/wasm/nullablePrimitives/nullablePrimitives.kt b/js/js.translator/testData/typescript-export/wasm/nullablePrimitives/nullablePrimitives.kt
@@ -47,4 +47,4 @@ fun consumeChar(x: Char?): String? = x?.toString()
 fun consumeString(x: String?): String? = x
 
 @JsExport
-fun consumeFunction(fn: ((String) -> Int)?): Int? = fn?.invoke("42")
+fun consumeFunction(fn: ((string: String) -> Int)?): Int? = fn?.invoke("42")
diff --git a/js/js.translator/testData/typescript-export/wasm/nullableUnsigned/nullableUnsinged.kt b/js/js.translator/testData/typescript-export/wasm/nullableUnsigned/nullableUnsinged.kt
@@ -29,4 +29,4 @@ fun consumeUInt(x: UInt?): String? = x?.toString()
 fun consumeULong(x: ULong?): String? = x?.toString()
 
 @JsExport
-fun consumeFunction(fn: (String) -> UInt?): UInt? = fn("42")
+fun consumeFunction(fn: (string: String) -> UInt?): UInt? = fn("42")
diff --git a/js/js.translator/testData/typescript-export/wasm/primitives/primitives.kt b/js/js.translator/testData/typescript-export/wasm/primitives/primitives.kt
@@ -57,4 +57,4 @@ fun consumeChar(x: Char): String = x.toString()
 fun consumeString(x: String): String = x
 
 @JsExport
-fun consumeFunction(fn: (String) -> Int): Int = fn("42")
+fun consumeFunction(fn: (string: String) -> Int): Int = fn("42")
diff --git a/js/js.translator/testData/typescript-export/wasm/unsigned/unsinged.kt b/js/js.translator/testData/typescript-export/wasm/unsigned/unsinged.kt
@@ -29,4 +29,4 @@ fun consumeUInt(x: UInt): String = x.toString()
 fun consumeULong(x: ULong): String = x.toString()
 
 @JsExport
-fun consumeFunction(fn: (String) -> UInt): UInt = fn("42")
+fun consumeFunction(fn: (string: String) -> UInt): UInt = fn("42")

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,6 @@ declare namespace JS_TESTS {`
`68`	`68`	`function concatWithContextParameters(scope1: foo.Scope1, scope2: foo.Scope2): string;`
`69`	`69`	`function concatWithExtensionAndContextParameter(scope1: foo.Scope1, _this_: foo.Scope2): string;`
`70`	`70`	`function getWithExtension(_this_: foo.Scope1): string;`
`71`		`- function context<A, B, R>(a: A, b: B, block: (p0: A, p1: B) => R): R;`
	`71`	`+ function allParameters<A, B, C, D, R>(a: A, b: B, c: C, d: D, block: (p0: A, p1: B, p2: C, p3: D) => R): R;`
`72`	`72`	`}`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,4 +140,4 @@ fun Scope2.concatWithExtensionAndContextParameter() = scope1.getA() + getA()`
`140`	`140`	`fun Scope1.getWithExtension() = getA()`
`141`	`141`
`142`	`142`
`143`		`-fun <A, B, R> context(a: A, b: B, block: context(A, B) () -> R): R = block(a, b)`
	`143`	`+fun <A, B, C, D, R> allParameters(a: A, b: B, c: C, d: D, block: context(A, B) C.(d: D) -> R): R = block(a, b, c, d)`