[K/JS] Generating TypeScript definitions for exceptions and rest of t…

…he types ^Fixed KT-53940
JetBrains · Dec 5, 2022 · a7f2dd4 · a7f2dd4
1 parent 1eabf6d
commit a7f2dd4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/...r/backend.js/src/org/jetbrains/kotlin/ir/backend/js/export/ExportModelToTsDeclarations.kt b/...r/backend.js/src/org/jetbrains/kotlin/ir/backend/js/export/ExportModelToTsDeclarations.kt
@@ -14,9 +14,6 @@ import org.jetbrains.kotlin.ir.util.isObject
 import org.jetbrains.kotlin.ir.util.parentAsClass
 import org.jetbrains.kotlin.js.common.isValidES5Identifier
 import org.jetbrains.kotlin.serialization.js.ModuleKind
-import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance
-import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
-import javax.lang.model.type.IntersectionType
 
 private const val Nullable = "Nullable"
 private const val objects = "_objects_"
@@ -290,7 +287,7 @@ class ExportModelToTsDeclarations {
             " /* extends $implicitlyExportedClassesString */"
         } else {
             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"
         }
     }

diff --git a/js/js.translator/testData/typescript-export/implicit-export/implicit-export.d.ts b/js/js.translator/testData/typescript-export/implicit-export/implicit-export.d.ts
@@ -42,5 +42,8 @@ declare namespace JS_TESTS {
         const console: Console;
         const error: WebAssembly.CompileError;
         function functionWithTypeAliasInside(x: any/* foo.NonExportedGenericInterface<foo.NonExportedType> */): any/* foo.NonExportedGenericInterface<foo.NonExportedType> */;
+        class TheNewException extends Error {
+            constructor();
+        }
     }
 }
diff --git a/js/js.translator/testData/typescript-export/implicit-export/implicit-export.kt b/js/js.translator/testData/typescript-export/implicit-export/implicit-export.kt
@@ -92,4 +92,7 @@ typealias NotExportedTypeAlias = NonExportedGenericInterface<NonExportedType>
 @JsExport
 fun functionWithTypeAliasInside(x: NotExportedTypeAlias): NotExportedTypeAlias {
     return x
-}
+}
+
+@JsExport
+class TheNewException: Throwable()