Remove Any from the inheritance chain

this fixes #323
Kotlin · Jul 3, 2020 · 8085959 · 8085959
1 parent d587f0f
commit 8085959
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 6 deletions.
diff --git a/compiler/test/data/typescript/Object.d.kt b/compiler/test/data/typescript/Object.d.kt
@@ -18,4 +18,6 @@ import org.w3c.xhr.*
 
 external var a: Any
 
-external fun foo(o: Any): Any
+external fun foo(o: Any): Any
+
+external interface SomeClass
diff --git a/compiler/test/data/typescript/Object.d.ts b/compiler/test/data/typescript/Object.d.ts
@@ -1,3 +1,5 @@
 declare var a: Object;
 
-declare function foo(o: Object): Object
+declare function foo(o: Object): Object
+
+interface SomeClass extends Object {}
diff --git a/model-lowerings/src/org/jetbrains/dukat/commonLowerings/removeParentAny.kt b/model-lowerings/src/org/jetbrains/dukat/commonLowerings/removeParentAny.kt
@@ -0,0 +1,38 @@
+package org.jetbrains.dukat.commonLowerings
+
+import org.jetbrains.dukat.astCommon.IdentifierEntity
+import org.jetbrains.dukat.astCommon.QualifierEntity
+import org.jetbrains.dukat.astModel.ClassLikeModel
+import org.jetbrains.dukat.astModel.ClassModel
+import org.jetbrains.dukat.astModel.HeritageModel
+import org.jetbrains.dukat.astModel.InterfaceModel
+import org.jetbrains.dukat.astModel.ModuleModel
+import org.jetbrains.dukat.astModel.TypeValueModel
+import org.jetbrains.dukat.model.commonLowerings.ModelLowering
+import org.jetbrains.dukat.model.commonLowerings.TopLevelModelLowering
+import org.jetbrains.dukat.ownerContext.NodeOwner
+import org.jetbrains.dukat.stdlib.TSLIBROOT
+
+private fun TypeValueModel.isAny() = fqName == QualifierEntity(TSLIBROOT, IdentifierEntity("Any"))
+
+private fun ClassLikeModel.removeParentAny(): List<HeritageModel> {
+    return parentEntities.filter { !it.value.isAny() }
+}
+
+private class RemoveParentAnyLowering : TopLevelModelLowering {
+    override fun lowerClassModel(ownerContext: NodeOwner<ClassModel>, parentModule: ModuleModel): ClassModel? {
+        val node = ownerContext.node
+        return super.lowerClassModel(ownerContext.copy(node = node.copy(parentEntities = node.removeParentAny())), parentModule)
+    }
+
+    override fun lowerInterfaceModel(ownerContext: NodeOwner<InterfaceModel>, parentModule: ModuleModel): InterfaceModel? {
+        val node = ownerContext.node
+        return super.lowerInterfaceModel(ownerContext.copy(node = node.copy(parentEntities = node.removeParentAny())), parentModule)
+    }
+}
+
+class RemoveParentAny : ModelLowering {
+    override fun lower(module: ModuleModel): ModuleModel {
+        return RemoveParentAnyLowering().lowerRoot(module, NodeOwner(module, null))
+    }
+}
diff --git a/model-lowerings/src/org/jetbrains/dukat/commonLowerings/substituteTsStdLibEntities.kt b/model-lowerings/src/org/jetbrains/dukat/commonLowerings/substituteTsStdLibEntities.kt
@@ -52,13 +52,14 @@ private enum class SubstitutedEntities(val value: IdentifierEntity) {
     EXCLUDE(IdentifierEntity("Exclude")),
     REQUIRED(IdentifierEntity("Required")),
     READONLY_ARRAY(IdentifierEntity("ReadonlyArray")),
-    TEMPLATE_STRINGS_ARRAY(IdentifierEntity("TemplateStringsArray"))
+    TEMPLATE_STRINGS_ARRAY(IdentifierEntity("TemplateStringsArray")),
+    OBJECT(IdentifierEntity("Object"))
 }
 
 private fun TypeValueModel.resolveAsSubstitution(): TypeValueModel? {
     val isLibReference = isLibReference()
 
-    return if (value == SubstitutedEntities.NON_NULLABLE.value || value == SubstitutedEntities.EXCLUDE.value || value == SubstitutedEntities.REQUIRED.value) {
+    return if (value == SubstitutedEntities.NON_NULLABLE.value || value == SubstitutedEntities.EXCLUDE.value || value == SubstitutedEntities.REQUIRED.value || value == SubstitutedEntities.OBJECT.value) {
         if (isLibReference) {
             createStdType("Any")
         } else null
@@ -173,7 +174,7 @@ private class SubstituteLowering : ModelWithOwnerTypeLowering {
     }
 }
 
-class SubstituteTsStdLibEntities() : ModelLowering {
+class SubstituteTsStdLibEntities : ModelLowering {
     override fun lower(module: ModuleModel): ModuleModel {
         return SubstituteLowering().lowerRoot(module, NodeOwner(module, null))
     }

diff --git a/typescript/ts-lowerings/src/org/jetbrains/dukat/tsLowerings/lowerPrimitives.kt b/typescript/ts-lowerings/src/org/jetbrains/dukat/tsLowerings/lowerPrimitives.kt
@@ -15,7 +15,6 @@ private fun mapPrimitiveValue(value: String): String {
         "boolean" -> "Boolean"
         "string" -> "String"
         "number" -> "Number"
-        "Object" -> "Any"
         else -> value
     }
 }

diff --git a/typescript/ts-translator/src/org/jetbrains/dukat/ts/translator/TypescriptLowerer.kt b/typescript/ts-translator/src/org/jetbrains/dukat/ts/translator/TypescriptLowerer.kt
@@ -6,6 +6,7 @@ import org.jetbrains.dukat.commonLowerings.AddExplicitGettersAndSetters
 import org.jetbrains.dukat.commonLowerings.AddImports
 import org.jetbrains.dukat.commonLowerings.AnyfyUnresolvedTypes
 import org.jetbrains.dukat.commonLowerings.RemoveDuplicateMembers
+import org.jetbrains.dukat.commonLowerings.RemoveParentAny
 import org.jetbrains.dukat.commonLowerings.RemoveUnsupportedJsNames
 import org.jetbrains.dukat.commonLowerings.SeparateNonExternalEntities
 import org.jetbrains.dukat.commonLowerings.SubstituteTsStdLibEntities
@@ -99,6 +100,7 @@ open class TypescriptLowerer(
                         RemoveRedundantTypeParams(),
                         RemoveConflictingOverloads(),
                         SubstituteTsStdLibEntities(),
+                        RemoveParentAny(),
                         EscapeIdentificators(),
                         RemoveUnsupportedJsNames(),
                         MergeClassLikesAndModuleDeclarations(),