azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/JS] Generating TypeScript definitions for exceptions and rest of the types ^Fixed KT-53940

Browse Source
This commit is contained in:
Artem Kobzar
2022-12-01 15:01:24 +00:00
committed by Space Team
parent 50ad5027fe
commit 0f0421ea3d
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/export/ExportModelToTsDeclarations.kt
+1 -2
View File
@@ -15,7 +15,6 @@ import org.jetbrains.kotlin.ir.util.isObject
import org.jetbrains.kotlin.ir.util.parentAsClass import org.jetbrains.kotlin.ir.util.parentAsClass
import org.jetbrains.kotlin.js.common.isValidES5Identifier import org.jetbrains.kotlin.js.common.isValidES5Identifier
import org.jetbrains.kotlin.serialization.js.ModuleKind import org.jetbrains.kotlin.serialization.js.ModuleKind
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance
import org.jetbrains.kotlin.utils.addToStdlib.runIf import org.jetbrains.kotlin.utils.addToStdlib.runIf
private const val Nullable = "Nullable" private const val Nullable = "Nullable"
@@ -318,7 +317,7 @@ class ExportModelToTsDeclarations {
" /* extends $implicitlyExportedClassesString */" " /* extends $implicitlyExportedClassesString */"
} else { } else {
val originallyDefinedSuperClass = implicitlyExportedClassesString.takeIf { it.isNotEmpty() }?.let { "/* $it */ " }.orEmpty() val originallyDefinedSuperClass = implicitlyExportedClassesString.takeIf { it.isNotEmpty() }?.let { "/* $it */ " }.orEmpty()
val transitivelyDefinedSuperClass = firstIsInstance<ExportedType.ClassType>().toTypeScript(indent, false) val transitivelyDefinedSuperClass = single { it !is ExportedType.ImplicitlyExportedType }.toTypeScript(indent, false)
" extends $originallyDefinedSuperClass$transitivelyDefinedSuperClass" " extends $originallyDefinedSuperClass$transitivelyDefinedSuperClass"
} }
} }
js/js.translator/testData/typescript-export/implicit-export/implicit-export.d.ts
Vendored
+3
View File
@@ -42,5 +42,8 @@ declare namespace JS_TESTS {
const console: Console; const console: Console;
const error: WebAssembly.CompileError; const error: WebAssembly.CompileError;
function functionWithTypeAliasInside(x: any/* foo.NonExportedGenericInterface<foo.NonExportedType> */): any/* foo.NonExportedGenericInterface<foo.NonExportedType> */; function functionWithTypeAliasInside(x: any/* foo.NonExportedGenericInterface<foo.NonExportedType> */): any/* foo.NonExportedGenericInterface<foo.NonExportedType> */;
class TheNewException extends Error {
constructor();
}
} }
} }
js/js.translator/testData/typescript-export/implicit-export/implicit-export.kt
Vendored
+3
View File
@@ -93,3 +93,6 @@ typealias NotExportedTypeAlias = NonExportedGenericInterface<NonExportedType>
fun functionWithTypeAliasInside(x: NotExportedTypeAlias): NotExportedTypeAlias { fun functionWithTypeAliasInside(x: NotExportedTypeAlias): NotExportedTypeAlias {
return x return x
} }
@JsExport
class TheNewException: Throwable()