[K/JS, K/Wasm] Allow annotating declarations with @JsQualifier

^KT-79928 Fixed

Author: JSMonk

compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsNameLinkingNamer.kt

@@ -43,7 +43,8 @@ class JsNameLinkingNamer(
             val jsModule: String? = declaration.getJsModule()
             val maybeParentFile: IrFile? = declaration.parent as? IrFile
             val fileJsModule: String? = maybeParentFile?.getJsModule()
-            val jsQualifier: List<JsName>? = maybeParentFile?.getJsQualifier()?.split('.')?.map { JsName(it, false) }
+            val jsQualifier: List<JsName>? = (declaration.getJsQualifier() ?: maybeParentFile?.getJsQualifier())
+                ?.split('.')?.map { JsName(it, false) }
 
             return when {
                 jsModule != null -> declaration.generateImportForDeclarationWithJsModule(jsModule)

compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/IrJsUtils.kt

@@ -71,8 +71,9 @@ fun IrConstructor.hasStrictSignature(context: JsIrBackendContext): Boolean {
     }
 }
 
-private fun getKotlinOrJsQualifier(parent: IrPackageFragment, shouldIncludePackage: Boolean): FqName? {
-    return (parent as? IrFile)?.getJsQualifier()?.let { FqName(it) } ?: parent.packageFqName.takeIf { shouldIncludePackage }
+private fun IrDeclaration.getKotlinOrJsQualifier(parent: IrPackageFragment, shouldIncludePackage: Boolean): FqName? {
+    return (getJsQualifier() ?: (parent as? IrFile)?.getJsQualifier())
+        ?.let { FqName(it) } ?: parent.packageFqName.takeIf { shouldIncludePackage }
 }
 
 val IrClass.isInstantiableEnum: Boolean

compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/lower/ComplexExternalDeclarationsToTopLevelFunctionsLowering.kt

@@ -440,7 +440,7 @@ class ComplexExternalDeclarationsToTopLevelFunctionsLowering(val context: WasmBa
     private fun referenceTopLevelExternalDeclaration(declaration: IrDeclarationWithName): String {
         var name: String? = declaration.getJsNameOrKotlinName().identifier
 
-        val qualifier = currentFile.getJsQualifier()
+        val qualifier = declaration.getJsQualifier() ?: currentFile.getJsQualifier()
 
         val module = currentFile.getJsModule()
             ?: declaration.getJsModule()?.also {

compiler/testData/codegen/boxWasmJsInterop/jsModuleWithQualifierOnDeclaration.kt

@@ -0,0 +1,109 @@
+// ES_MODULES
+// FILE: jsModuleWithQualifier.mjs
+let a = {
+    b: {
+        c: {
+            d: {
+                x: 10,
+                f() { return 10; },
+                C: class C {
+                    constructor(x) {
+                        this.x = x;
+                    }
+                }
+            }
+        }
+    }
+};
+
+export { a };
+
+// FILE: lib1.kt
+@file:JsModule("./jsModuleWithQualifier.mjs")
+
+package abcd
+
+@JsQualifier("a.b.c.d")
+external var x: Int
+
+@JsQualifier("a.b.c.d")
+external fun f(): Int
+
+@JsQualifier("a.b.c.d")
+external class C {
+    constructor(x: String)
+    val x: String
+}
+
+@JsName("x")
+@JsQualifier("a.b.c.d")
+external var x2: Int
+
+@JsName("f")
+@JsQualifier("a.b.c.d")
+external fun f2(): Int
+
+@JsName("C")
+@JsQualifier("a.b.c.d")
+external class C2 {
+    constructor(x: String)
+    @JsName("x")
+    val x2: String
+}
+
+// FILE: lib2.kt
+@file:JsModule("./jsModuleWithQualifier.mjs")
+package a
+
+@JsQualifier("a")
+external object b {
+    class c {
+        companion object {
+            @JsName("d")
+            object d2 {
+                var x: Int
+                fun f(): Int
+                class C {
+                    constructor(x: String)
+                    val x: String
+                }
+
+                @JsName("x")
+                var x2: Int
+
+                @JsName("f")
+                fun f2(): Int
+
+                @JsName("C")
+                class C2 {
+                    constructor(x: String)
+                    @JsName("x")
+                    val x2: String
+                }
+            }
+        }
+    }
+}
+
+
+
+// FILE: main.kt
+fun box(): String {
+    if (abcd.x != 10) return "Fail1"
+    if (abcd.f() != 10) return "Fail2"
+    if (abcd.C("10").x != "10") return "Fail3"
+
+    if (abcd.x2 != 10) return "Fail4"
+    if (abcd.f2() != 10) return "Fail5"
+    if (abcd.C2("10").x2 != "10") return "Fail6"
+
+    if (a.b.c.Companion.d2.x != 10) return "Fail7"
+    if (a.b.c.Companion.d2.f() != 10) return "Fail8"
+    if (a.b.c.Companion.d2.C("10").x != "10") return "Fail9"
+
+    if (a.b.c.Companion.d2.x2 != 10) return "Fail10"
+    if (a.b.c.Companion.d2.f2() != 10) return "Fail11"
+    if (a.b.c.Companion.d2.C2("10").x2 != "10") return "Fail12"
+
+    return "OK"
+}

compiler/testData/codegen/boxWasmJsInterop/jsQualifierOnDeclaration.kt

@@ -0,0 +1,102 @@
+// FILE: jsQualifier.js
+let a = {
+    b: {
+        c: {
+            d: {
+                x: 10,
+                f() { return 10; },
+                C: class C {
+                    constructor(x) {
+                        this.x = x;
+                    }
+                }
+            }
+        }
+    }
+};
+
+// FILE: lib1.kt
+package abcd
+
+@JsQualifier("a.b.c.d")
+external var x: Int
+
+@JsQualifier("a.b.c.d")
+external fun f(): Int
+
+@JsQualifier("a.b.c.d")
+external class C {
+    constructor(x: String)
+    val x: String
+}
+
+@JsName("x")
+@JsQualifier("a.b.c.d")
+external var x2: Int
+
+@JsName("f")
+@JsQualifier("a.b.c.d")
+external fun f2(): Int
+
+@JsName("C")
+@JsQualifier("a.b.c.d")
+external class C2 {
+    constructor(x: String)
+    @JsName("x")
+    val x2: String
+}
+
+// FILE: lib2.kt
+package a
+
+@JsQualifier("a")
+external object b {
+    class c {
+        companion object {
+            @JsName("d")
+            object d2 {
+                var x: Int
+                fun f(): Int
+                class C {
+                    constructor(x: String)
+                    val x: String
+                }
+
+                @JsName("x")
+                var x2: Int
+
+                @JsName("f")
+                fun f2(): Int
+
+                @JsName("C")
+                class C2 {
+                    constructor(x: String)
+                    @JsName("x")
+                    val x2: String
+                }
+            }
+        }
+    }
+}
+
+
+// FILE: main.kt
+fun box(): String {
+    if (abcd.x != 10) return "Fail1"
+    if (abcd.f() != 10) return "Fail2"
+    if (abcd.C("10").x != "10") return "Fail3"
+
+    if (abcd.x2 != 10) return "Fail4"
+    if (abcd.f2() != 10) return "Fail5"
+    if (abcd.C2("10").x2 != "10") return "Fail6"
+
+    if (a.b.c.Companion.d2.x != 10) return "Fail7"
+    if (a.b.c.Companion.d2.f() != 10) return "Fail8"
+    if (a.b.c.Companion.d2.C("10").x != "10") return "Fail9"
+
+    if (a.b.c.Companion.d2.x2 != 10) return "Fail10"
+    if (a.b.c.Companion.d2.f2() != 10) return "Fail11"
+    if (a.b.c.Companion.d2.C2("10").x2 != "10") return "Fail12"
+
+    return "OK"
+}