[JS] Fix exporting some primitive types via Analysis API

broadwaylamb · Space Team · commit 8131c518ca51 · 2025-11-14T15:57:07.000Z
diff --git a/js/js.translator/testData/typescript-export/js/long-type-in-exported-file/long-type.aa.d.ts b/js/js.translator/testData/typescript-export/js/long-type-in-exported-file/long-type.aa.d.ts
@@ -11,7 +11,7 @@ declare namespace JS_TESTS {
         const _ulong: bigint;
         const _long_array: BigInt64Array;
         const _ulong_array: Array<bigint>;
-        const _array_long: BigInt64Array;
+        const _array_long: Array<bigint>;
         const _array_ulong: Array<bigint>;
         let myVar: bigint;
         const _n_long: Nullable<bigint>;
diff --git a/js/js.translator/testData/typescript-export/js/long-type/long-type.aa.d.ts b/js/js.translator/testData/typescript-export/js/long-type/long-type.aa.d.ts
@@ -11,7 +11,7 @@ declare namespace JS_TESTS {
         const _ulong: bigint;
         const _long_array: BigInt64Array;
         const _ulong_array: Array<bigint>;
-        const _array_long: BigInt64Array;
+        const _array_long: Array<bigint>;
         const _array_ulong: Array<bigint>;
         let myVar: bigint;
         const _n_long: Nullable<bigint>;
diff --git a/js/js.translator/testData/typescript-export/js/primitives-in-exported-file/primitives.aa.d.ts b/js/js.translator/testData/typescript-export/js/primitives-in-exported-file/primitives.aa.d.ts
@@ -30,13 +30,13 @@ declare namespace JS_TESTS {
         const _ubyte_array: Array<any/* kotlin.UByte */>;
         const _ushort_array: Array<any/* kotlin.UShort */>;
         const _uint_array: Array<any/* kotlin.UInt */>;
-        const _array_byte: Int8Array;
-        const _array_short: Int16Array;
-        const _array_int: Int32Array;
-        const _array_float: Float32Array;
-        const _array_double: Float64Array;
+        const _array_byte: Array<number>;
+        const _array_short: Array<number>;
+        const _array_int: Array<number>;
+        const _array_float: Array<number>;
+        const _array_double: Array<number>;
         const _array_string: Array<string>;
-        const _array_boolean: any /*BooleanArray*/;
+        const _array_boolean: Array<boolean>;
         const _array_array_string: Array<Array<string>>;
         const _array_array_int_array: Array<Array<Int32Array>>;
         const _array_ubyte: Array<any/* kotlin.UByte */>;
@@ -54,16 +54,16 @@ declare namespace JS_TESTS {
         const _n_boolean: Nullable<boolean>;
         const _n_byte: Nullable<number>;
         const _n_short_array: Nullable<Int16Array>;
-        const _n_array_int: Nullable<Int32Array>;
+        const _n_array_int: Nullable<Array<number>>;
         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: (int: Nullable<number>) => void;
         const _fun_n_int_unit_class: (int: Nullable<number>) => void;
-        const _kfun_n_int_unit: (p0: Nullable<number>) => void;
-        const _fun_n_int_unit_suspend: any /*Suspend function types are not supported*/;
-        const _fun_n_int_unit_suspend_class: any /*Suspend function types are not supported*/;
-        const _kfun_n_int_unit_suspend: any /*Suspend function types are not supported*/;
+        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*/;
+        const _kfun_n_int_unit_suspend: any/* kotlin.reflect.KSuspendFunction1<Nullable<number>, void> */;
         const _fun_n_boolean_n_int_n_string_n_intarray: (p0: Nullable<boolean>, p1: Nullable<number>, p2: Nullable<string>) => Nullable<Int32Array>;
         const _n_curried_fun: (p0: Nullable<number>) => (p0: Nullable<number>) => (p0: Nullable<number>) => Nullable<number>;
         const _n_higher_order_fun: (p0: (p0: Nullable<number>) => Nullable<string>, p1: (p0: Nullable<string>) => Nullable<number>) => (p0: Nullable<number>) => Nullable<number>;
diff --git a/js/js.translator/testData/typescript-export/js/primitives/primitives.aa.d.ts b/js/js.translator/testData/typescript-export/js/primitives/primitives.aa.d.ts
@@ -30,13 +30,13 @@ declare namespace JS_TESTS {
         const _ubyte_array: Array<any/* kotlin.UByte */>;
         const _ushort_array: Array<any/* kotlin.UShort */>;
         const _uint_array: Array<any/* kotlin.UInt */>;
-        const _array_byte: Int8Array;
-        const _array_short: Int16Array;
-        const _array_int: Int32Array;
-        const _array_float: Float32Array;
-        const _array_double: Float64Array;
+        const _array_byte: Array<number>;
+        const _array_short: Array<number>;
+        const _array_int: Array<number>;
+        const _array_float: Array<number>;
+        const _array_double: Array<number>;
         const _array_string: Array<string>;
-        const _array_boolean: any /*BooleanArray*/;
+        const _array_boolean: Array<boolean>;
         const _array_array_string: Array<Array<string>>;
         const _array_array_int_array: Array<Array<Int32Array>>;
         const _array_ubyte: Array<any/* kotlin.UByte */>;
@@ -54,16 +54,16 @@ declare namespace JS_TESTS {
         const _n_boolean: Nullable<boolean>;
         const _n_byte: Nullable<number>;
         const _n_short_array: Nullable<Int16Array>;
-        const _n_array_int: Nullable<Int32Array>;
+        const _n_array_int: Nullable<Array<number>>;
         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: (int: Nullable<number>) => void;
         const _fun_n_int_unit_class: (int: Nullable<number>) => void;
-        const _kfun_n_int_unit: (p0: Nullable<number>) => void;
-        const _fun_n_int_unit_suspend: any /*Suspend function types are not supported*/;
-        const _fun_n_int_unit_suspend_class: any /*Suspend function types are not supported*/;
-        const _kfun_n_int_unit_suspend: any /*Suspend function types are not supported*/;
+        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*/;
+        const _kfun_n_int_unit_suspend: any/* kotlin.reflect.KSuspendFunction1<Nullable<number>, void> */;
         const _fun_n_boolean_n_int_n_string_n_intarray: (p0: Nullable<boolean>, p1: Nullable<number>, p2: Nullable<string>) => Nullable<Int32Array>;
         const _n_curried_fun: (p0: Nullable<number>) => (p0: Nullable<number>) => (p0: Nullable<number>) => Nullable<number>;
         const _n_higher_order_fun: (p0: (p0: Nullable<number>) => Nullable<string>, p1: (p0: Nullable<string>) => Nullable<number>) => (p0: Nullable<number>) => Nullable<number>;
diff --git a/js/typescript-export-standalone/src/org/jetbrains/kotlin/js/tsexport/ExportModelGenerator.kt b/js/typescript-export-standalone/src/org/jetbrains/kotlin/js/tsexport/ExportModelGenerator.kt
@@ -129,7 +129,7 @@ internal class ExportModelGenerator(private val config: TypeScriptExportConfig)
             }
             for (parameter in function.valueParameters) {
                 val type = if (parameter.isVararg) {
-                    TypeExporter(config).exportArrayWithElementType(parameter.returnType)
+                    TypeExporter(config).exportSpecializedArrayWithElementType(parameter.returnType)
                 } else {
                     exportType(parameter.returnType)
                 }
diff --git a/js/typescript-export-standalone/src/org/jetbrains/kotlin/js/tsexport/TypeExporter.kt b/js/typescript-export-standalone/src/org/jetbrains/kotlin/js/tsexport/TypeExporter.kt
@@ -57,7 +57,7 @@ internal class TypeExporter(private val config: TypeScriptExportConfig) {
     }
 
     context(_: KaSession)
-    internal fun exportArrayWithElementType(type: KaType): ExportedType = with(type) {
+    internal fun exportSpecializedArrayWithElementType(type: KaType): ExportedType = with(type) {
         when {
             isMarkedNullable -> Array(exportType(type))
             isByteType -> Primitive.ByteArray
@@ -89,13 +89,17 @@ internal class TypeExporter(private val config: TypeScriptExportConfig) {
         if (type.isNothingType)
             return Primitive.Nothing
         type.arrayElementType?.let {
-            return exportArrayWithElementType(it)
+            return if (type.isClassType(StandardClassIds.Array)) {
+                Array(exportType(it))
+            } else {
+                exportSpecializedArrayWithElementType(it)
+            }
         }
         if (type.isClassType(StandardClassIds.Throwable))
             return Primitive.Throwable
-        if (type is KaFunctionType) {
+        if (type is KaFunctionType && !type.isKFunctionType && !type.isKSuspendFunctionType) {
             return if (type.isSuspend) {
-                ErrorType("Suspend function types are not supported")
+                ErrorType("Suspend functions are not supported")
             } else {
                 Function(
                     parameters = buildList {
@@ -127,7 +131,7 @@ internal class TypeExporter(private val config: TypeScriptExportConfig) {
         if (type is KaTypeParameterType) {
             return TypeParameter(type.name.identifier)
         }
-        if (type is KaUsualClassType) {
+        if (type is KaClassType) {
             val symbol = type.symbol
             val isExported = shouldDeclarationBeExportedImplicitlyOrExplicitly(symbol)
             return when (symbol) {

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ internal class ExportModelGenerator(private val config: TypeScriptExportConfig)`
`129`	`129`	`}`
`130`	`130`	`for (parameter in function.valueParameters) {`
`131`	`131`	`val type = if (parameter.isVararg) {`
`132`		`- TypeExporter(config).exportArrayWithElementType(parameter.returnType)`
	`132`	`+ TypeExporter(config).exportSpecializedArrayWithElementType(parameter.returnType)`
`133`	`133`	`} else {`
`134`	`134`	`exportType(parameter.returnType)`
`135`	`135`	`}`