Fixes after rebase

Author: trilis

compiler/test/data/typescriptBodies/constructorWithPropertyDeclaration.kt

@@ -1,4 +1,4 @@
-// [test] withPropertyDeclaration.kt
+// [test] constructorWithPropertyDeclaration.kt
 @file:Suppress("INTERFACE_WITH_SUPERCLASS", "OVERRIDING_FINAL_MEMBER", "RETURN_TYPE_MISMATCH_ON_OVERRIDE", "CONFLICTING_OVERLOADS", "EXTERNAL_DELEGATION")
 
 import kotlin.js.*

model-lowerings-common/src/org/jetbrains/dukat/model/commonLowerings/ModelWithOwnerTypeLowering.kt

@@ -186,7 +186,7 @@ interface ModelWithOwnerTypeLowering : ModelWithOwnerLowering {
         val declaration = ownerContext.node
         return declaration.copy(
                 primaryConstructor = declaration.primaryConstructor?.let { constructorModel ->
-                    constructorModel.copy(parameters = constructorModel.parameters.map { lowerParameterModel(ownerContext.wrap(it)) })
+                    constructorModel.copy(parameters = constructorModel.parameters.map { lowerCallableParameterModel(ownerContext.wrap(it)) })
                 },
                 members = declaration.members.mapNotNull { member -> lowerMemberModel(NodeOwner(member, ownerContext), parentModule) },
                 typeParameters = declaration.typeParameters.map { typeParameterModel ->  lowerTypeParameterModel(ownerContext.wrap(typeParameterModel)) },

typescript/ts-node-lowering/src/org/jetrbains/dukat/nodeLowering/NodeTypeLowering.kt

@@ -2,6 +2,7 @@ package org.jetrbains.dukat.nodeLowering
 
 import org.jetbrains.dukat.ast.model.nodes.ClassNode
 import org.jetbrains.dukat.ast.model.nodes.ConstructorNode
+import org.jetbrains.dukat.ast.model.nodes.ConstructorParameterNode
 import org.jetbrains.dukat.ast.model.nodes.ModuleNode
 import org.jetbrains.dukat.ast.model.nodes.FunctionNode
 import org.jetbrains.dukat.ast.model.nodes.FunctionTypeNode
@@ -143,13 +144,21 @@ interface NodeTypeLowering : TopLevelNodeLowering {
         )
     }
 
-    override fun lowerPropertyParameterNode(declaration: PropertyParameterNode): PropertyParameterNode {
+    fun lowerPropertyParameterNode(declaration: PropertyParameterNode): PropertyParameterNode {
         return declaration.copy(
             name = lowerIdentificator(declaration.name),
             type = lowerType(declaration.type)
         )
     }
 
+    fun lowerConstructorParameterNode(declaration: ConstructorParameterNode): ConstructorParameterNode {
+        return when (declaration) {
+            is ParameterNode -> lowerParameterNode(declaration)
+            is PropertyParameterNode -> lowerPropertyParameterNode(declaration)
+            else -> declaration
+        }
+    }
+
     override fun lowerVariableNode(declaration: VariableNode): VariableNode {
         return declaration.copy(name = lowerIdentificator(declaration.name), type = lowerType(declaration.type))
     }

typescript/ts-node-lowering/src/org/jetrbains/dukat/nodeLowering/TopLevelNodeLowering.kt

@@ -3,15 +3,11 @@ package org.jetrbains.dukat.nodeLowering
 import org.jetbrains.dukat.ast.model.duplicate
 import org.jetbrains.dukat.ast.model.nodes.ClassLikeNode
 import org.jetbrains.dukat.ast.model.nodes.ClassNode
-import org.jetbrains.dukat.ast.model.nodes.ConstructorParameterNode
-import org.jetbrains.dukat.ast.model.nodes.ModuleNode
 import org.jetbrains.dukat.ast.model.nodes.EnumNode
 import org.jetbrains.dukat.ast.model.nodes.FunctionNode
 import org.jetbrains.dukat.ast.model.nodes.InterfaceNode
 import org.jetbrains.dukat.ast.model.nodes.ModuleNode
 import org.jetbrains.dukat.ast.model.nodes.ObjectNode
-import org.jetbrains.dukat.ast.model.nodes.ParameterNode
-import org.jetbrains.dukat.ast.model.nodes.PropertyParameterNode
 import org.jetbrains.dukat.ast.model.nodes.TopLevelNode
 import org.jetbrains.dukat.ast.model.nodes.TypeAliasNode
 import org.jetbrains.dukat.ast.model.nodes.VariableNode
@@ -25,14 +21,6 @@ interface TopLevelNodeLowering {
     fun lowerEnumNode(declaration: EnumNode, owner: ModuleNode): EnumNode = declaration
     fun lowerTypeAliasNode(declaration: TypeAliasNode, owner: ModuleNode): TypeAliasNode = declaration
 
-    fun lowerConstructorParameterNode(declaration: ConstructorParameterNode): ConstructorParameterNode {
-        return when (declaration) {
-            is ParameterNode -> lowerParameterNode(declaration)
-            is PropertyParameterNode -> lowerPropertyParameterNode(declaration)
-            else -> declaration
-        }
-    }
-
     fun lowerClassLikeNode(declaration: ClassLikeNode, owner: ModuleNode): ClassLikeNode {
         return when (declaration) {
             is InterfaceNode -> lowerInterfaceNode(declaration)

typescript/ts-node-lowering/src/org/jetrbains/dukat/nodeLowering/lowerings/introduceModels.kt

@@ -337,7 +337,7 @@ internal class DocumentConverter(private val moduleNode: ModuleNode, private val
         // TODO: how ClassModel end up here?
         return when (this) {
             is ConstructorNode -> ConstructorModel(
-                    parameters = parameters.map { param -> param.process().copy() },
+                    parameters = parameters.map { param -> param.process() },
                     typeParameters = convertTypeParams(typeParameters)
             )
             is MethodNode -> process()

typescript/ts-node-lowering/src/org/jetrbains/dukat/nodeLowering/lowerings/specifyUnionType.kt

@@ -6,7 +6,6 @@ import org.jetbrains.dukat.ast.model.makeNullable
 import org.jetbrains.dukat.ast.model.nodes.ClassNode
 import org.jetbrains.dukat.ast.model.nodes.ConstructorNode
 import org.jetbrains.dukat.ast.model.nodes.ConstructorParameterNode
-import org.jetbrains.dukat.ast.model.nodes.ModuleNode
 import org.jetbrains.dukat.ast.model.nodes.FunctionNode
 import org.jetbrains.dukat.ast.model.nodes.InterfaceNode
 import org.jetbrains.dukat.ast.model.nodes.MethodNode