Process types in primary constructor at model phase

this fixes #309
Kotlin · Jun 17, 2020 · ffe747f · ffe747f
1 parent 3a716fc
commit ffe747f
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 3 deletions.
diff --git a/compiler/test/data/typescript/import/resolveImportFromPrimaryConstructor/_stream.d.ts b/compiler/test/data/typescript/import/resolveImportFromPrimaryConstructor/_stream.d.ts
@@ -0,0 +1,2 @@
+
+export declare interface ReadableOptions {}
diff --git a/...cript/import/resolveImportFromPrimaryConstructor/resolveImportFromPrimaryConstructor.d.kt b/...cript/import/resolveImportFromPrimaryConstructor/resolveImportFromPrimaryConstructor.d.kt
@@ -0,0 +1,40 @@
+// [test] resolveImportFromPrimaryConstructor.kt
+@file:Suppress("INTERFACE_WITH_SUPERCLASS", "OVERRIDING_FINAL_MEMBER", "RETURN_TYPE_MISMATCH_ON_OVERRIDE", "CONFLICTING_OVERLOADS", "EXTERNAL_DELEGATION")
+
+import kotlin.js.*
+import kotlin.js.Json
+import org.khronos.webgl.*
+import org.w3c.dom.*
+import org.w3c.dom.events.*
+import org.w3c.dom.parsing.*
+import org.w3c.dom.svg.*
+import org.w3c.dom.url.*
+import org.w3c.fetch.*
+import org.w3c.files.*
+import org.w3c.notifications.*
+import org.w3c.performance.*
+import org.w3c.workers.*
+import org.w3c.xhr.*
+
+external open class MyRequest(options: ReadableOptions)
+
+// ------------------------------------------------------------------------------------------
+// [test] _stream.kt
+@file:Suppress("INTERFACE_WITH_SUPERCLASS", "OVERRIDING_FINAL_MEMBER", "RETURN_TYPE_MISMATCH_ON_OVERRIDE", "CONFLICTING_OVERLOADS", "EXTERNAL_DELEGATION")
+
+import kotlin.js.*
+import kotlin.js.Json
+import org.khronos.webgl.*
+import org.w3c.dom.*
+import org.w3c.dom.events.*
+import org.w3c.dom.parsing.*
+import org.w3c.dom.svg.*
+import org.w3c.dom.url.*
+import org.w3c.fetch.*
+import org.w3c.files.*
+import org.w3c.notifications.*
+import org.w3c.performance.*
+import org.w3c.workers.*
+import org.w3c.xhr.*
+
+external interface ReadableOptions
diff --git a/...cript/import/resolveImportFromPrimaryConstructor/resolveImportFromPrimaryConstructor.d.ts b/...cript/import/resolveImportFromPrimaryConstructor/resolveImportFromPrimaryConstructor.d.ts
@@ -0,0 +1,5 @@
+import * as stream from "./_stream";
+
+declare class MyRequest {
+  constructor(options: stream.ReadableOptions)
+}
diff --git a/...erings-common/src/org/jetbrains/dukat/model/commonLowerings/ModelWithOwnerTypeLowering.kt b/...erings-common/src/org/jetbrains/dukat/model/commonLowerings/ModelWithOwnerTypeLowering.kt
@@ -178,6 +178,9 @@ interface ModelWithOwnerTypeLowering : ModelWithOwnerLowering {
     override fun lowerClassModel(ownerContext: NodeOwner<ClassModel>, parentModule: ModuleModel): ClassModel {
         val declaration = ownerContext.node
         return declaration.copy(
+                primaryConstructor = declaration.primaryConstructor?.let { constructorModel ->
+                    constructorModel.copy(parameters = constructorModel.parameters.map { lowerParameterModel(ownerContext.wrap(it)) })
+                },
                 members = declaration.members.mapNotNull { member -> lowerMemberModel(NodeOwner(member, ownerContext), parentModule) },
                 typeParameters = declaration.typeParameters.map { typeParameterModel ->  lowerTypeParameterModel(ownerContext.wrap(typeParameterModel)) },
                 parentEntities = declaration.parentEntities.map { heritageClause ->

diff --git a/model-lowerings/src/org/jetbrains/dukat/commonLowerings/addImports.kt b/model-lowerings/src/org/jetbrains/dukat/commonLowerings/addImports.kt
@@ -95,11 +95,15 @@ private fun NameEntity.normalize(): NameEntity? {
     }
 }
 
+@OptIn(ExperimentalStdlibApi::class)
 private fun ModuleModel.addImports(): ModuleModel {
-    val importContext = mutableMapOf<NameEntity, NameEntity>()
-    declarations.map { importContext[it.name] = name }
 
-    val nameVisitor = NameVisitor(name, importContext)
+    val nameVisitor = NameVisitor(name, buildMap<NameEntity, NameEntity> {
+        declarations.forEach {
+            this[it.name] = name
+        }
+    }.toMutableMap())
+
     val moduleWithFqNames = nameVisitor.lowerRoot(this, NodeOwner(this, null))
 
     return moduleWithFqNames.copy(