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

[K/JS] Fix nameBindings for ES-modules after the ES-modules external declarations optimization

Browse Source
This commit is contained in:
Artem Kobzar
2023-10-20 14:04:39 +00:00
committed by Space Team
parent 72438f4969
commit 4a042dafef
15 changed files with 84 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsNameLinkingNamer.kt
+1
View File
@@ -90,6 +90,7 @@ class JsNameLinkingNamer(
else -> JsImport.Target.Default(nameRef)
}
imports[this] = JsImport(jsModule, importSubject)
nameMap[this] = name
} else {
importedModules += JsImportedModule(jsModule, name, nameRef)
}
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/serialization/JsIrAstSerializer.kt
+1 -1
View File
@@ -97,7 +97,7 @@ private class JsIrAstSerializer {
}
fun append(fragment: JsIrProgramFragment): JsIrAstSerializer {
importedNames += fragment.imports.map { fragment.nameBindings[it.key]!! }
importedNames += fragment.imports.map { fragment.nameBindings[it.key] ?: error("No binding for tag ${it.key}") }
fragmentSerializer.writeFragment(fragment)
return this
}
js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsFirInvalidationPerFileTestGenerated.java
Generated
+6
View File
@@ -325,6 +325,12 @@ public class JsFirInvalidationPerFileTestGenerated extends AbstractJsFirInvalida
runTest("js/js.translator/testData/incremental/invalidation/jsModuleAnnotation/");
}
@Test
@TestMetadata("jsModuleAnnotationOnObjectWithUsage")
public void testJsModuleAnnotationOnObjectWithUsage() throws Exception {
runTest("js/js.translator/testData/incremental/invalidation/jsModuleAnnotationOnObjectWithUsage/");
}
@Test
@TestMetadata("languageVersionSettings")
public void testLanguageVersionSettings() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsFirInvalidationPerModuleTestGenerated.java
Generated
+6
View File
@@ -325,6 +325,12 @@ public class JsFirInvalidationPerModuleTestGenerated extends AbstractJsFirInvali
runTest("js/js.translator/testData/incremental/invalidation/jsModuleAnnotation/");
}
@Test
@TestMetadata("jsModuleAnnotationOnObjectWithUsage")
public void testJsModuleAnnotationOnObjectWithUsage() throws Exception {
runTest("js/js.translator/testData/incremental/invalidation/jsModuleAnnotationOnObjectWithUsage/");
}
@Test
@TestMetadata("languageVersionSettings")
public void testLanguageVersionSettings() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsIrES6InvalidationPerFileTestGenerated.java
Generated
+6
View File
@@ -325,6 +325,12 @@ public class JsIrES6InvalidationPerFileTestGenerated extends AbstractJsIrES6Inva
runTest("js/js.translator/testData/incremental/invalidation/jsModuleAnnotation/");
}
@Test
@TestMetadata("jsModuleAnnotationOnObjectWithUsage")
public void testJsModuleAnnotationOnObjectWithUsage() throws Exception {
runTest("js/js.translator/testData/incremental/invalidation/jsModuleAnnotationOnObjectWithUsage/");
}
@Test
@TestMetadata("languageVersionSettings")
public void testLanguageVersionSettings() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsIrES6InvalidationPerModuleTestGenerated.java
Generated
+6
View File
@@ -325,6 +325,12 @@ public class JsIrES6InvalidationPerModuleTestGenerated extends AbstractJsIrES6In
runTest("js/js.translator/testData/incremental/invalidation/jsModuleAnnotation/");
}
@Test
@TestMetadata("jsModuleAnnotationOnObjectWithUsage")
public void testJsModuleAnnotationOnObjectWithUsage() throws Exception {
runTest("js/js.translator/testData/incremental/invalidation/jsModuleAnnotationOnObjectWithUsage/");
}
@Test
@TestMetadata("languageVersionSettings")
public void testLanguageVersionSettings() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsIrInvalidationPerFileTestGenerated.java
Generated
+6
View File
@@ -325,6 +325,12 @@ public class JsIrInvalidationPerFileTestGenerated extends AbstractJsIrInvalidati
runTest("js/js.translator/testData/incremental/invalidation/jsModuleAnnotation/");
}
@Test
@TestMetadata("jsModuleAnnotationOnObjectWithUsage")
public void testJsModuleAnnotationOnObjectWithUsage() throws Exception {
runTest("js/js.translator/testData/incremental/invalidation/jsModuleAnnotationOnObjectWithUsage/");
}
@Test
@TestMetadata("languageVersionSettings")
public void testLanguageVersionSettings() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/incremental/JsIrInvalidationPerModuleTestGenerated.java
Generated
+6
View File
@@ -325,6 +325,12 @@ public class JsIrInvalidationPerModuleTestGenerated extends AbstractJsIrInvalida
runTest("js/js.translator/testData/incremental/invalidation/jsModuleAnnotation/");
}
@Test
@TestMetadata("jsModuleAnnotationOnObjectWithUsage")
public void testJsModuleAnnotationOnObjectWithUsage() throws Exception {
runTest("js/js.translator/testData/incremental/invalidation/jsModuleAnnotationOnObjectWithUsage/");
}
@Test
@TestMetadata("languageVersionSettings")
public void testLanguageVersionSettings() throws Exception {
js/js.translator/testData/incremental/invalidation/jsModuleAnnotationOnObjectWithUsage/lib1/ObjectB.0.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
external object ObjectB {
fun getResult(): String
}
js/js.translator/testData/incremental/invalidation/jsModuleAnnotationOnObjectWithUsage/lib1/ObjectB.1.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
@JsNonModule
@JsModule("../third-party-lib.mjs")
external object ObjectB {
fun getResult(): String
}
js/js.translator/testData/incremental/invalidation/jsModuleAnnotationOnObjectWithUsage/lib1/module.info
Vendored
+8
View File
@@ -0,0 +1,8 @@
STEP 0:
modifications:
U : ObjectB.0.kt -> ObjectB.kt
added file: ObjectB.kt
STEP 1:
modifications:
U : ObjectB.1.kt -> ObjectB.kt
modified ir: ObjectB.kt
js/js.translator/testData/incremental/invalidation/jsModuleAnnotationOnObjectWithUsage/main/m.kt
Vendored
+9
View File
@@ -0,0 +1,9 @@
@OptIn(kotlin.ExperimentalStdlibApi::class)
@EagerInitialization
val initJsObject = js("""
globalThis.ObjectB = { getResult: function() { return "OK" } }
""")
fun box(stepId: Int): String {
return ObjectB.getResult()
}
js/js.translator/testData/incremental/invalidation/jsModuleAnnotationOnObjectWithUsage/main/module.info
Vendored
+6
View File
@@ -0,0 +1,6 @@
STEP 0:
dependencies: lib1
added file: m.kt
STEP 1:
dependencies: lib1
updated imports: m.kt
js/js.translator/testData/incremental/invalidation/jsModuleAnnotationOnObjectWithUsage/project.info
Vendored
+12
View File
@@ -0,0 +1,12 @@
MODULES: lib1, main
MODULE_KIND: es
IGNORE_PER_MODULE: true
STEP 0:
libs: lib1, main
dirty js modules: lib1, main
dirty js files: lib1/ObjectB, main/m, main/m.export, main
STEP 1:
libs: lib1, main
dirty js modules: lib1, main
dirty js files: lib1/ObjectB, main/m
js/js.translator/testData/incremental/invalidation/jsModuleAnnotationOnObjectWithUsage/third-party-lib.mjs
Vendored
+3
View File
@@ -0,0 +1,3 @@
export function getResult() {
return "OK"
}