Embedded

README.md

@@ -23,6 +23,7 @@ The **Kotlin Object Multiplatform Mapper** provides you a possibility to generat
     * [Disable AutoCast](#disable-autocast)
     * [Change Convert Function Name](#change-convert-function-name)
   * [@MapName](#mapname-annotation)
+  * [@MapEmbedded](#mapembedded-annotation)
   * [@MapConverter](#use-converter)
   * [@MapDefault](#use-resolver)
   * [@NullSubstitute](#use-nullsubstitute)
@@ -83,7 +84,7 @@ plugins {
     id("com.google.devtools.ksp") version "2.3.9"
 }
 
-val kommVersion = "0.50.9"
+val kommVersion = "0.60.0"
 
 depensencies {
     implementation("com.ucasoft.komm:komm-annotations:$kommVersion")
@@ -96,7 +97,7 @@ plugins {
     id("com.google.devtools.ksp") version "2.3.9"
 }
 
-val kommVersion = "0.50.9"
+val kommVersion = "0.60.0"
 
 kotlin {
     jvm {
@@ -264,6 +265,64 @@ fun SourceObject.toDestinationObject(): DestinationObject = DestinationObject(
 }
 ```
 
+### @MapEmbedded annotation
+Use `@MapEmbedded` when several destination properties should be mapped from the same nested source property.
+KOMM checks only the first nested level. Direct source properties have priority over embedded properties.
+If two embedded properties can provide the same destination property, generation fails and the mapping should be made explicit.
+
+#### Classes declaration
+```kotlin
+data class Account(
+    val id: Long,
+    val name: String
+)
+
+data class AccountWithCurrencies(
+    val account: Account,
+    val currencies: List<AccountCurrency>
+)
+
+@KOMMMap(from = [AccountWithCurrencies::class])
+@MapEmbedded("account")
+data class AccountDto(
+    val name: String,
+    val currencies: List<AccountCurrencyDto>
+) {
+    var id: Long = 0L
+}
+```
+#### Generated extension function
+```kotlin
+fun AccountWithCurrencies.toAccountDto(): AccountDto = AccountDto(
+    name = account.name,
+    currencies = currencies.map { it.toAccountCurrencyDto() }
+).also {
+    it.id = account.id
+}
+```
+#### Nullable embedded source
+```kotlin
+data class AccountWithCurrencies(
+    val account: Account?,
+    val currencies: List<AccountCurrency>
+)
+
+@KOMMMap(from = [AccountWithCurrencies::class])
+@MapEmbedded("account")
+data class AccountDto(
+    @NullSubstitute(MapDefault(StringResolver::class))
+    val name: String,
+    val currencies: List<AccountCurrencyDto>
+)
+```
+#### Generated extension function
+```kotlin
+fun AccountWithCurrencies.toAccountDto(): AccountDto = AccountDto(
+    name = account?.name ?: StringResolver(null).resolve(),
+    currencies = currencies.map { it.toAccountCurrencyDto() }
+)
+```
+
 ### Use Converter
 #### Converter declaration
 ```kotlin
@@ -469,7 +528,7 @@ plugins {
     id("com.google.devtools.ksp") version "2.3.9"
 }
 
-val kommVersion = "0.50.9"
+val kommVersion = "0.60.0"
 
 depensencies {
     implementation("com.ucasoft.komm:komm-annotations:$kommVersion")
@@ -483,7 +542,7 @@ plugins {
     id("com.google.devtools.ksp") version "2.3.9"
 }
 
-val kommVersion = "0.50.9"
+val kommVersion = "0.60.0"
 
 //...
 
@@ -543,7 +602,7 @@ plugins {
     id("com.google.devtools.ksp") version "2.3.9"
 }
 
-val kommVersion = "0.50.9"
+val kommVersion = "0.60.0"
 
 depensencies {
     implementation("com.ucasoft.komm:komm-annotations:$kommVersion")
@@ -587,7 +646,7 @@ plugins {
     id("com.google.devtools.ksp") version "2.3.9"
 }
 
-val kommVersion = "0.50.9"
+val kommVersion = "0.60.0"
 
 depensencies {
     implementation("com.ucasoft.komm:komm-annotations:$kommVersion")
@@ -601,7 +660,7 @@ plugins {
     id("com.google.devtools.ksp") version "2.3.9"
 }
 
-val kommVersion = "0.50.9"
+val kommVersion = "0.60.0"
 
 //...
 
@@ -701,4 +760,4 @@ fun SourceObject.toDestinationObject(): toDestinationObject = toDestinationObjec
     (DestinationObject.DestinationEnum.entries.any { it.name == direction.name }) direction.name else "OTHER")
     else null) ?: DirectionResolver(null).resolve()
 )
-```
+```

build.gradle.kts

@@ -12,7 +12,7 @@ tasks.wrapper {
 allprojects {
     group = "com.ucasoft.komm"
 
-    version = "0.50.9"
+    version = "0.60.0"
 
     repositories {
         mavenCentral()

komm-annotations/src/main/kotlin/com/ucasoft/komm/annotations/MapEmbedded.kt

@@ -0,0 +1,8 @@
+package com.ucasoft.komm.annotations
+
+import kotlin.reflect.KClass
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.SOURCE)
+@Repeatable
+annotation class MapEmbedded(val name: String, val `for`: Array<KClass<*>> = [])

komm-processor/src/main/kotlin/com/ucasoft/komm/processor/KOMMAnnotationFinder.kt

@@ -76,6 +76,14 @@ class KOMMAnnotationFinder(private val forClass: KSType) {
     fun getSuitedNamedAnnotation(member: KSPropertyDeclaration) =
         filterAnnotationsByClass(forClass.toClassName(), getSuitedNamedAnnotationsForClass(member), member)
 
+    fun getSuitedEmbeddedAnnotations(classDeclaration: KSClassDeclaration): List<KSAnnotation> =
+        classDeclaration.annotations
+            .filter { it.shortName.asString() == MapEmbedded::class.simpleName }
+            .associateWith(::associateWithFor)
+            .filter { it.value.isEmpty() || it.value.contains(forClass.toClassName()) }
+            .keys
+            .toList()
+
     private fun getSuitedNamedAnnotationsForClass(member: KSPropertyDeclaration) =
         member.annotations.filter { it.shortName.asString() in namedAnnotations }
             .associateWith(::associateWithFor)