[K/JS] Fix initialization issue for objects which annotated with @JsExport and contain nested classes

Merge-request: KT-MR-11146
Merged-by: Artem Kobzar <Artem.Kobzar@jetbrains.com>
This commit is contained in:
Artem Kobzar
2023-07-19 10:41:25 +00:00
committed by Space Team
parent 69c8942462
commit b1884456b8
2 changed files with 21 additions and 10 deletions
@@ -119,11 +119,7 @@ class ExportModelToJsStatements(
is ExportedObject -> {
require(namespace != null || esModules) { "Only namespaced properties are allowed" }
val (name, objectClassInitialization) = declaration.getNameAndInitialization()
val newNameSpace = when {
namespace != null -> jsElementAccess(declaration.name, namespace)
else ->
jsElementAccess(Namer.PROTOTYPE_NAME, name.makeRef())
}
val newNameSpace = jsElementAccess(Namer.PROTOTYPE_NAME, name.makeRef())
val staticsExport =
declaration.nestedClasses.flatMap { generateDeclarationExport(it, newNameSpace, esModules, declaration.ir) }
@@ -256,11 +252,11 @@ class ExportModelToJsStatements(
private fun ExportedClass.getNameAndInitialization(): Pair<JsName, JsStatement?> {
return when (val classRef = ir.getClassRef(staticContext)) {
!is JsNameRef -> {
is JsNameRef -> classRef.name!! to null
else -> {
val stableName = JsName(name, true)
stableName to JsVars(JsVars.JsVar(stableName, classRef))
}
else -> classRef.name!! to null
}
}
@@ -2,8 +2,6 @@
// See KT-6201
package foo
import kotlin.reflect.KProperty
var log = ""
open class Mixin {
@@ -39,8 +37,20 @@ object O5 {
val someValue = O3.also { log = "O5 also" }
}
@JsExport
object O6 {
init {
log = "O6 init"
}
object O7 {
init {
log = "O7 init"
}
}
}
fun box(): String {
if (log != "") return "Fail: something was initialized before any object was used"
if (log != "") return "Fail: something was initialized before any object was used: $log"
O1
if (log != "O1 init") return "Fail: O1 didn't initialized lazy"
O2
@@ -51,5 +61,10 @@ fun box(): String {
if (log != "initCall") return "Fail: O4 didn't initialized lazy"
O5
if (log != "O5 also") return "Fail: O5 didn't initialized lazy"
O6
if (log != "O6 init") return "Fail: O6 didn't initialized lazy"
O6.O7
if (log != "O7 init") return "Fail: O7 didn't initialized lazy"
return "OK"
}