Fix iterable plugins

Author: Scogun

build.gradle.kts

@@ -12,7 +12,7 @@ tasks.wrapper {
 allprojects {
     group = "com.ucasoft.komm"
 
-    version = "2.2.20-0.28.7-RC1"
+    version = "2.2.20-0.28.9-RC2"
 
     repositories {
         mavenCentral()

komm-plugins-iterable/src/main/kotlin/com/ucasoft/komm/plugins/iterable/BaseIterablePlugin.kt

@@ -3,6 +3,7 @@ package com.ucasoft.komm.plugins.iterable
 import com.google.devtools.ksp.getAllSuperTypes
 import com.google.devtools.ksp.symbol.KSClassDeclaration
 import com.google.devtools.ksp.symbol.KSDeclaration
+import com.google.devtools.ksp.symbol.KSName
 import com.google.devtools.ksp.symbol.KSPropertyDeclaration
 import com.google.devtools.ksp.symbol.KSType
 import com.squareup.kotlinpoet.ClassName
@@ -28,6 +29,9 @@ abstract class BaseIterablePlugin: KOMMCastPlugin {
         return Pair(sourceIsNullable, destinationIsNullOrNullSubstitute)
     }
 
-    protected fun ClassName.isAssignableFrom(other: ClassName) =
-        this == other || other.simpleName.endsWith(this.simpleName)
+    protected fun KSName.isAssignableFrom(other: ClassName) =
+        other.simpleName.endsWith(this.getShortName())
+
+    protected fun KSName.isAssignableFrom(other: String) =
+        other.endsWith(this.getShortName())
 }

komm-plugins-iterable/src/main/kotlin/com/ucasoft/komm/plugins/iterable/IterablePlugin.kt

@@ -21,15 +21,15 @@ class IterablePlugin: BaseIterablePlugin() {
         val destinationParam = destinationType.arguments.first()
         val sourceParam = sourceType.arguments.first()
         val stringBuilder = StringBuilder(sourceName)
-        var fromCastDeclaration = sourceType.toClassName()
+        var fromCastDeclaration = sourceType.declaration.qualifiedName!!.getShortName()
         val (sourceIsNullable, destinationIsNullOrNullSubstitute) = parseMappingData(sourceType, sourceProperty, destinationType, destinationProperty)
         stringBuilder.append(addSafeNullCall(sourceIsNullable, safeCallOrNullAssertion(destinationIsNullOrNullSubstitute)))
         if (!destinationParam.type!!.resolve().isAssignableFrom(sourceParam.type!!.resolve())) {
             stringBuilder.append(".map{ it.to${destinationParam.type}() }")
-            fromCastDeclaration = LIST
+            fromCastDeclaration = LIST.simpleName
         }
-        if (!destinationType.toClassName().isAssignableFrom(fromCastDeclaration)) {
-            stringBuilder.append("${addSafeNullCall(sourceIsNullable && destinationIsNullOrNullSubstitute)}.to${destinationType.toClassName().simpleName}()")
+        if (!destinationType.declaration.qualifiedName!!.isAssignableFrom(fromCastDeclaration)) {
+            stringBuilder.append("${addSafeNullCall(sourceIsNullable && destinationIsNullOrNullSubstitute)}.to${destinationType.declaration.qualifiedName!!.getShortName()}()")
         }
         return stringBuilder.toString().trimEnd('?')
     }

komm-plugins-iterable/src/main/kotlin/com/ucasoft/komm/plugins/iterable/IterableStringPlugin.kt

@@ -35,8 +35,8 @@ class IterableStringPlugin: BaseIterablePlugin() {
             stringBuilder.append(")")
         } else {
             stringBuilder.append(".split(\"$delimiter\")")
-            if (!destinationType.toClassName().isAssignableFrom(LIST)) {
-                stringBuilder.append("${addSafeNullCall(sourceIsNullable && destinationIsNullOrNullSubstitute)}.to${destinationType.toClassName().simpleName}()")
+            if (!destinationType.declaration.qualifiedName!!.isAssignableFrom(LIST)) {
+                stringBuilder.append("${addSafeNullCall(sourceIsNullable && destinationIsNullOrNullSubstitute)}.to${destinationType.declaration.qualifiedName!!.getShortName()}()")
             }
         }
 

komm-plugins-iterable/src/test/kotlin/com/ucasoft/komm/plugins/iterable/BaseIterablePluginTests.kt

@@ -38,6 +38,10 @@ open class BaseIterablePluginTests {
                     kType.toString().contains(".MutableList") -> MUTABLE_LIST.canonicalName
                     else -> (kType.classifier as KClass<*>).qualifiedName!!
                 }
+                every { this@with.getShortName() } returns when {
+                    kType.toString().contains(".MutableList") -> MUTABLE_LIST.simpleName
+                    else -> (kType.classifier as KClass<*>).simpleName!!
+                }
                 this
             }
             this