Don't fully qualify reference to types when not needed (#98)

Author: epabst

src/main/kotlin/converter/typeUtils.kt

@@ -219,7 +219,11 @@ private fun ObjectTypeToKotlinTypeMapper.buildFqn(symbol: Symbol): KtQualifiedNa
     // TODO: make something better for the case when we have more than one declaration for this symbol.
     // For example see how it work for testData/typeAlias/typeParams.d.ts after renaming `MyHeaders` to `Headers`
     val declaration = symbol.declarations?.singleOrNull()
-    return declaration?.let { buildFqn(it) } ?: KtQualifiedName(typeChecker.getFullyQualifiedName(symbol))
+    return declaration?.let { buildFqn(it) } ?: KtQualifiedName(symbolToString(symbol))
+}
+
+private fun ObjectTypeToKotlinTypeMapper.symbolToString(symbol: Symbol): String {
+    return enclosingDeclaration?.let { typeChecker.symbolToString(symbol, it) } ?: typeChecker.symbolToString(symbol)
 }
 
 private fun ObjectTypeToKotlinTypeMapper.buildFqn(declaration: Node): KtQualifiedName? {

src/main/kotlin/ts2kt/TypeScriptToKotlin.kt

@@ -229,7 +229,8 @@ class TypeScriptToKotlin(
                 declarations = innerPackagePartBuilder.members,
                 defaultAnnotations = additionalAnnotations,
                 typeChecker = typeChecker,
-                currentPackage = newQualifier.joinToString(".")
+                currentPackage = newQualifier.joinToString("."),
+                enclosingDeclaration = node
         )
         val tr = TypeScriptToKotlin(
                 currentPackagePartBuilder = innerPackagePartBuilder,

src/main/kotlin/ts2kt/mappingObjectTypeToKotlinType.kt

@@ -24,6 +24,7 @@ interface ObjectTypeToKotlinTypeMapper {
     fun getKotlinTypeForObjectType(objectType: TypeLiteralNode): KtType
     fun withTypeParameters(typeParameters: NodeArray<TypeParameterDeclaration>?): ObjectTypeToKotlinTypeMapper
     val currentPackage: String
+    val enclosingDeclaration: Node?
     val typeChecker: TypeChecker
     // TODO: support recursive type aliases, see recursiveType.d.ts
     val typesInMappingProcess: MutableSet<Type>
@@ -34,6 +35,7 @@ data class ObjectTypeToKotlinTypeMapperImpl(
         val defaultAnnotations: List<KtAnnotation>,
         val declarations: MutableList<KtMember>,
         override val currentPackage: String,
+        override val enclosingDeclaration: Node? = null,
         val typeParameterDeclarations: List<TypeParameterDeclaration> = listOf(),
         val cache: MutableMap<String, KtType> = hashMapOf()
 ) : ObjectTypeToKotlinTypeMapper {

testData/objectType/asTypeAliasInNamespaces.d.kt

@@ -4,7 +4,7 @@ package asTypeAliasInNamespaces.a
 external interface I {
     fun foo(): String
 }
-external fun foo(): a.I = definedExternally
+external fun foo(): I = definedExternally
 external fun bar(): b.I = definedExternally
 
 // ------------------------------------------------------------------------------------------
@@ -14,5 +14,5 @@ package asTypeAliasInNamespaces.b
 external interface I {
     fun foo(): String
 }
-external fun foo(): b.I = definedExternally
+external fun foo(): I = definedExternally
 external fun bar(): a.I = definedExternally

testData/objectType/useExportedType.d.kt

@@ -0,0 +1,9 @@
+package useExportedType
+
+external interface StructureType {
+    var name: String
+    var details: String? get() = definedExternally; set(value) = definedExternally
+}
+external interface Registry {
+    fun register(type: StructureType)
+}

testData/objectType/useExportedType.d.ts

@@ -0,0 +1,8 @@
+export type StructureType = {
+    name: string;
+    details?: string;
+};
+
+export interface Registry {
+    register(type: StructureType)
+}