[JS] Export parameter names in function types in .d.ts files

^KT-82327 Fixed

Author: broadwaylamb

compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/tsexport/ExportModelGenerator.kt

@@ -12,7 +12,10 @@ import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.descriptors.DescriptorVisibility
 import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.ir.backend.js.*
+import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext
+import org.jetbrains.kotlin.ir.backend.js.JsLoweredDeclarationOrigin
+import org.jetbrains.kotlin.ir.backend.js.correspondingEnumEntry
+import org.jetbrains.kotlin.ir.backend.js.initEntryInstancesFun
 import org.jetbrains.kotlin.ir.backend.js.lower.ES6_BOX_PARAMETER
 import org.jetbrains.kotlin.ir.backend.js.lower.coroutines.isPromisifiedWrapper
 import org.jetbrains.kotlin.ir.backend.js.lower.isBoxParameter
@@ -650,7 +653,7 @@ class ExportModelGenerator(val context: JsIrBackendContext, val generateNamespac
             nonNullType.isFunction() -> ExportedType.Function(
                 parameters = nonNullType.arguments.dropLast(1).memoryOptimizedMap {
                     ExportedParameter(
-                        name = null,
+                        name = (it as? IrTypeProjection)?.type?.getAnnotationArgumentValue(StandardNames.FqNames.parameterName, "name"),
                         type = exportTypeArgument(it, typeOwner),
                     )
                 },

compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/export/ExportModelGenerator.kt

@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.backend.wasm.export
 
 import org.jetbrains.kotlin.backend.wasm.WasmBackendContext
+import org.jetbrains.kotlin.builtins.StandardNames
 import org.jetbrains.kotlin.config.CommonConfigurationKeys
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
@@ -206,7 +207,7 @@ class ExportModelGenerator(val context: WasmBackendContext) {
             nonNullType.isFunction() -> ExportedType.Function(
                 parameters = nonNullType.arguments.dropLast(1).memoryOptimizedMap {
                     ExportedParameter(
-                        name = null,
+                        name = (it as? IrTypeProjection)?.type?.getAnnotationArgumentValue(StandardNames.FqNames.parameterName, "name"),
                         type = exportTypeArgument(it),
                     )
                 },

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/IrUtils.kt

@@ -363,11 +363,11 @@ internal fun IrConstructorCall.getAnnotationValueOrNullImpl(name: String): Any?
     return (argument as IrConst?)?.value
 }
 
-inline fun <reified T> IrDeclaration.getAnnotationArgumentValue(fqName: FqName, argumentName: String): T? =
+inline fun <reified T> IrAnnotationContainer.getAnnotationArgumentValue(fqName: FqName, argumentName: String): T? =
     getAnnotationArgumentValueImpl(fqName, argumentName) as T?
 
 @PublishedApi
-internal fun IrDeclaration.getAnnotationArgumentValueImpl(fqName: FqName, argumentName: String): Any? {
+internal fun IrAnnotationContainer.getAnnotationArgumentValueImpl(fqName: FqName, argumentName: String): Any? {
     val annotation = this.annotations.findAnnotation(fqName) ?: return null
     for (parameter in annotation.symbol.owner.parameters) {
         if (parameter.name.asString() == argumentName) {

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 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;
+        function allParameters<A, B, C, D, R>(a: A, b: B, c: C, d: D, block: (p0: A, p1: B, _this_: C, d: D) => R): R;
         /* ErrorDeclaration: Class declarations are not implemented yet */
         /* ErrorDeclaration: Class declarations are not implemented yet */
         /* ErrorDeclaration: Class declarations are not implemented yet */

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 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;
+        function allParameters<A, B, C, D, R>(a: A, b: B, c: C, d: D, block: (p0: A, p1: B, p2: C, d: D) => R): R;
     }
 }

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 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;
+        function allParameters<A, B, C, D, R>(a: A, b: B, c: C, d: D, block: (p0: A, p1: B, _this_: C, d: D) => R): R;
         /* ErrorDeclaration: Class declarations are not implemented yet */
         /* ErrorDeclaration: Class declarations are not implemented yet */
         /* ErrorDeclaration: Class declarations are not implemented yet */

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 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;
+        function allParameters<A, B, C, D, R>(a: A, b: B, c: C, d: D, block: (p0: A, p1: B, p2: C, d: D) => R): R;
     }
 }

js/js.translator/testData/typescript-export/js/primitives-in-exported-file/primitives.d.ts

@@ -53,8 +53,8 @@ declare namespace JS_TESTS {
         const _array_n_int: Array<Nullable<number>>;
         const _n_array_n_int: Nullable<Array<Nullable<number>>>;
         const _array_n_array_string: Array<Nullable<Array<string>>>;
-        const _fun_n_int_unit: (p0: Nullable<number>) => void;
-        const _fun_n_int_unit_class: (p0: Nullable<number>) => void;
+        const _fun_n_int_unit: (int: Nullable<number>) => void;
+        const _fun_n_int_unit_class: (int: Nullable<number>) => void;
         const _kfun_n_int_unit: any/* kotlin.reflect.KFunction1<Nullable<number>, void> */;
         const _fun_n_int_unit_suspend: any /*Suspend functions are not supported*/;
         const _fun_n_int_unit_suspend_class: any /*Suspend functions are not supported*/;

js/js.translator/testData/typescript-export/js/primitives/primitives.d.ts

@@ -53,8 +53,8 @@ declare namespace JS_TESTS {
         const _array_n_int: Array<Nullable<number>>;
         const _n_array_n_int: Nullable<Array<Nullable<number>>>;
         const _array_n_array_string: Array<Nullable<Array<string>>>;
-        const _fun_n_int_unit: (p0: Nullable<number>) => void;
-        const _fun_n_int_unit_class: (p0: Nullable<number>) => void;
+        const _fun_n_int_unit: (int: Nullable<number>) => void;
+        const _fun_n_int_unit_class: (int: Nullable<number>) => void;
         const _kfun_n_int_unit: any/* kotlin.reflect.KFunction1<Nullable<number>, void> */;
         const _fun_n_int_unit_suspend: any /*Suspend functions are not supported*/;
         const _fun_n_int_unit_suspend_class: any /*Suspend functions are not supported*/;

js/js.translator/testData/typescript-export/wasm/nullablePrimitives/index.d.mts

@@ -15,4 +15,4 @@ export declare function consumeInt(x: Nullable<number>): Nullable<string>;
 export declare function consumeLong(x: Nullable<bigint>): Nullable<string>;
 export declare function consumeChar(x: Nullable<number>): Nullable<string>;
 export declare function consumeString(x: Nullable<string>): Nullable<string>;
-export declare function consumeFunction(fn: Nullable<(p0: string) => number>): Nullable<number>;
+export declare function consumeFunction(fn: Nullable<(string: string) => number>): Nullable<number>;