[JS IR] Override method are not exported

[JS IR] Add test with jsexport overrides not js export method with stable name ^KT-44616 fixed
2021-02-03 19:24:26 +03:00
parent a9322a01ce
commit 6c051b2be4
6 changed files with 130 additions and 5 deletions
@@ -8,10 +8,12 @@ package org.jetbrains.kotlin.ir.backend.js.export
 import org.jetbrains.kotlin.backend.common.ir.isExpect
 import org.jetbrains.kotlin.config.CommonConfigurationKeys
 import org.jetbrains.kotlin.descriptors.ClassKind
-import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
-import org.jetbrains.kotlin.ir.backend.js.*
-import org.jetbrains.kotlin.ir.backend.js.lower.ES6AddInternalParametersToConstructorPhase.*
+import org.jetbrains.kotlin.descriptors.Modality
+import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext
+import org.jetbrains.kotlin.ir.backend.js.JsLoweredDeclarationOrigin
+import org.jetbrains.kotlin.ir.backend.js.lower.ES6AddInternalParametersToConstructorPhase.ES6_INIT_BOX_PARAMETER
+import org.jetbrains.kotlin.ir.backend.js.lower.ES6AddInternalParametersToConstructorPhase.ES6_RESULT_TYPE_PARAMETER
 import org.jetbrains.kotlin.ir.backend.js.utils.getJsNameOrKotlinName
 import org.jetbrains.kotlin.ir.backend.js.utils.isJsExport
 import org.jetbrains.kotlin.ir.backend.js.utils.sanitizeName
@@ -80,7 +82,7 @@ class ExportModelGenerator(val context: JsIrBackendContext) {
    private fun exportConstructor(constructor: IrConstructor): ExportedDeclaration? {
        if (!constructor.isPrimary) return null
        val allValueParameters = listOfNotNull(constructor.extensionReceiverParameter) +
-            constructor.valueParameters.filterNot { it.origin === ES6_RESULT_TYPE_PARAMETER || it.origin === ES6_INIT_BOX_PARAMETER }
+                constructor.valueParameters.filterNot { it.origin === ES6_RESULT_TYPE_PARAMETER || it.origin === ES6_INIT_BOX_PARAMETER }
        return ExportedConstructor(allValueParameters.map { exportParameter(it) })
    }

@@ -192,7 +194,7 @@ class ExportModelGenerator(val context: JsIrBackendContext) {
            ?.let { exportType(it).takeIf { it !is ExportedType.ErrorType } }

        val superInterfaces = klass.superTypes
-            .filter {it.classifierOrFail.isInterface }
+            .filter { it.classifierOrFail.isInterface }
            .map { exportType(it) }
            .filter { it !is ExportedType.ErrorType }

@@ -398,6 +400,16 @@ private fun shouldDeclarationBeExported(declaration: IrDeclarationWithName, cont
    if (context?.additionalExportedDeclarations?.contains(declaration) == true)
        return true

+    if (declaration is IrSimpleFunction) {
+        val overriddenNonEmpty = declaration
+            .overriddenSymbols
+            .isNotEmpty()
+
+        if (overriddenNonEmpty) {
+            return declaration.isOverriddenExported(context)
+        }
+    }
+
    if (declaration.isJsExport())
        return true

@@ -408,6 +420,10 @@ private fun shouldDeclarationBeExported(declaration: IrDeclarationWithName, cont
    }
 }

+private fun IrSimpleFunction.isOverriddenExported(context: JsIrBackendContext?): Boolean =
+    overriddenSymbols
+        .any { shouldDeclarationBeExported(it.owner, context) }
+
 fun IrDeclaration.isExported(context: JsIrBackendContext?): Boolean {
    val candidate = getExportCandidate(this) ?: return false
    return shouldDeclarationBeExported(candidate, context)
@@ -1632,6 +1632,16 @@ public class IrBoxJsES6TestGenerated extends AbstractIrBoxJsES6Test {
            runTest("js/js.translator/testData/box/export/nonIndetifierModuleName.kt");
        }

+        @TestMetadata("overriddenExternalMethodWithSameNameMethod.kt")
+        public void testOverriddenExternalMethodWithSameNameMethod() throws Exception {
+            runTest("js/js.translator/testData/box/export/overriddenExternalMethodWithSameNameMethod.kt");
+        }
+
+        @TestMetadata("overriddenExternalMethodWithSameStableNameMethod.kt")
+        public void testOverriddenExternalMethodWithSameStableNameMethod() throws Exception {
+            runTest("js/js.translator/testData/box/export/overriddenExternalMethodWithSameStableNameMethod.kt");
+        }
+
        @TestMetadata("overridenMethod.kt")
        public void testOverridenMethod() throws Exception {
            runTest("js/js.translator/testData/box/export/overridenMethod.kt");
@@ -1632,6 +1632,16 @@ public class IrBoxJsTestGenerated extends AbstractIrBoxJsTest {
            runTest("js/js.translator/testData/box/export/nonIndetifierModuleName.kt");
        }

+        @TestMetadata("overriddenExternalMethodWithSameNameMethod.kt")
+        public void testOverriddenExternalMethodWithSameNameMethod() throws Exception {
+            runTest("js/js.translator/testData/box/export/overriddenExternalMethodWithSameNameMethod.kt");
+        }
+
+        @TestMetadata("overriddenExternalMethodWithSameStableNameMethod.kt")
+        public void testOverriddenExternalMethodWithSameStableNameMethod() throws Exception {
+            runTest("js/js.translator/testData/box/export/overriddenExternalMethodWithSameStableNameMethod.kt");
+        }
+
        @TestMetadata("overridenMethod.kt")
        public void testOverridenMethod() throws Exception {
            runTest("js/js.translator/testData/box/export/overridenMethod.kt");
@@ -1637,6 +1637,16 @@ public class BoxJsTestGenerated extends AbstractBoxJsTest {
            runTest("js/js.translator/testData/box/export/nonIndetifierModuleName.kt");
        }

+        @TestMetadata("overriddenExternalMethodWithSameNameMethod.kt")
+        public void testOverriddenExternalMethodWithSameNameMethod() throws Exception {
+            runTest("js/js.translator/testData/box/export/overriddenExternalMethodWithSameNameMethod.kt");
+        }
+
+        @TestMetadata("overriddenExternalMethodWithSameStableNameMethod.kt")
+        public void testOverriddenExternalMethodWithSameStableNameMethod() throws Exception {
+            runTest("js/js.translator/testData/box/export/overriddenExternalMethodWithSameStableNameMethod.kt");
+        }
+
        @TestMetadata("overridenMethod.kt")
        public void testOverridenMethod() throws Exception {
            runTest("js/js.translator/testData/box/export/overridenMethod.kt");
@@ -0,0 +1,38 @@
+// IGNORE_BACKEND: JS
+// RUN_PLAIN_BOX_FUNCTION
+// INFER_MAIN_MODULE
+
+// MODULE: overriden-external-method-with-same-name-method
+// FILE: lib.kt
+external abstract class Foo {
+    abstract fun o(): String
+}
+
+abstract class Bar : Foo() {
+    abstract fun String.o(): String
+
+    override fun o(): String {
+        return "O".o()
+    }
+}
+
+@JsExport
+class Baz : Bar() {
+    override fun String.o(): String {
+        return this
+    }
+}
+
+// FILE: test.js
+function Foo() {}
+Foo.prototype.k = function() {
+    return "K"
+}
+
+function box() {
+    return test(new this["overriden-external-method-with-same-name-method"].Baz());
+}
+
+function test(foo) {
+    return foo.o() + foo.k()
+}
@@ -0,0 +1,41 @@
+// IGNORE_BACKEND: JS
+// RUN_PLAIN_BOX_FUNCTION
+// INFER_MAIN_MODULE
+
+// MODULE: overriden-external-method-with-same-stable-name-method
+// FILE: lib.kt
+external abstract class Foo {
+    abstract fun o(): String
+}
+
+abstract class Bar : Foo() {
+    @JsName("oStable")
+    abstract fun String.o(): String
+
+    override fun o(): String {
+        return "O".o()
+    }
+}
+
+@JsExport
+class Baz : Bar() {
+    override fun String.o(): String {
+        return this
+    }
+}
+
+// FILE: test.js
+function Foo() {}
+Foo.prototype.k = function() {
+    return "K"
+}
+
+function box() {
+    return test(new this["overriden-external-method-with-same-stable-name-method"].Baz());
+}
+
+function test(foo) {
+    const oStable = foo.oStable("OK")
+    if (oStable !== "OK") return "false: " + oStable
+    return foo.o() + foo.k()
+}