Fixed check of runtime usage of of mapping DSL for multiple object mappie (#257)

Author: stefankoppier

compiler-plugin/src/main/kotlin/tech/mappie/fir/analysis/CompileTimeDslReceiverChecker.kt

@@ -11,22 +11,25 @@ import org.jetbrains.kotlin.fir.types.resolvedType
 import tech.mappie.fir.analysis.MappieErrors.COMPILE_TIME_EXTENSION_RECEIVER
 import tech.mappie.fir.analysis.MappieErrors.COMPILE_TIME_RECEIVER
 import tech.mappie.util.ALL_MAPPING_FUNCTIONS
+import tech.mappie.util.CLASS_ID_MULTIPLE_OBJECT_MAPPING_CONSTRUCTOR
 import tech.mappie.util.CLASS_ID_OBJECT_MAPPING_CONSTRUCTOR
 
 class CompileTimeDslReceiverChecker : FirFunctionCallChecker(MppCheckerKind.Common) {
 
+    private val targets = listOf(CLASS_ID_OBJECT_MAPPING_CONSTRUCTOR, CLASS_ID_MULTIPLE_OBJECT_MAPPING_CONSTRUCTOR)
+
     context(context: CheckerContext, reporter: DiagnosticReporter)
     override fun check(expression: FirFunctionCall) {
         val name = expression.calleeReference.name
         if (name in ALL_MAPPING_FUNCTIONS) {
             return
         }
 
-        if (expression.dispatchReceiver?.resolvedType?.classId == CLASS_ID_OBJECT_MAPPING_CONSTRUCTOR) {
+        if (expression.dispatchReceiver?.resolvedType?.classId in targets) {
             reporter.reportOn(expression.source, COMPILE_TIME_RECEIVER, name)
         }
 
-        if (expression.extensionReceiver?.resolvedType?.classId == CLASS_ID_OBJECT_MAPPING_CONSTRUCTOR) {
+        if (expression.extensionReceiver?.resolvedType?.classId in targets) {
             reporter.reportOn(expression.source, COMPILE_TIME_EXTENSION_RECEIVER, name)
         }
     }

compiler-plugin/src/main/kotlin/tech/mappie/fir/analysis/ToCallChecker.kt

@@ -22,6 +22,7 @@ import tech.mappie.fir.analysis.MappieErrors.UNKNOWN_NAME_ERROR
 import tech.mappie.fir.util.toConstant
 import tech.mappie.fir.util.hasCallableId
 import tech.mappie.fir.util.isJavaGetter
+import tech.mappie.util.CLASS_ID_MULTIPLE_OBJECT_MAPPING_CONSTRUCTOR
 import tech.mappie.util.CLASS_ID_OBJECT_MAPPING_CONSTRUCTOR
 import tech.mappie.util.IDENTIFIER_TO
 
@@ -30,7 +31,7 @@ class ToCallChecker : FirFunctionCallChecker(MppCheckerKind.Common) {
     @OptIn(SymbolInternals::class)
     context(context: CheckerContext, reporter: DiagnosticReporter)
     override fun check(expression: FirFunctionCall) {
-        if (expression.hasCallableId(CallableId(CLASS_ID_OBJECT_MAPPING_CONSTRUCTOR, IDENTIFIER_TO))) {
+        if (expression.isToCall()) {
             val name = expression.arguments.first().toConstant()?.value as? String?
 
             if (name == null) {
@@ -63,6 +64,10 @@ class ToCallChecker : FirFunctionCallChecker(MppCheckerKind.Common) {
         }
     }
 
+    private fun FirFunctionCall.isToCall() =
+        hasCallableId(CallableId(CLASS_ID_OBJECT_MAPPING_CONSTRUCTOR, IDENTIFIER_TO))
+            || hasCallableId(CallableId(CLASS_ID_MULTIPLE_OBJECT_MAPPING_CONSTRUCTOR, IDENTIFIER_TO))
+
     context (context: CheckerContext)
     private fun FirFunctionCall.getTargetRegularClassSymbol() =
         dispatchReceiver?.resolvedType?.typeArguments?.last()?.type?.toRegularClassSymbol(context.session)

compiler-plugin/src/main/kotlin/tech/mappie/util/Identifiers.kt

@@ -58,6 +58,8 @@ val PACKAGE_TECH_MAPPIE_API_CONFIG = FqName("tech.mappie.api.config")
 
 val CLASS_ID_OBJECT_MAPPING_CONSTRUCTOR = ClassId(PACKAGE_TECH_MAPPIE_API, Name.identifier("ObjectMappingConstructor"))
 
+val CLASS_ID_MULTIPLE_OBJECT_MAPPING_CONSTRUCTOR = ClassId(PACKAGE_TECH_MAPPIE_API, Name.identifier("MultipleObjectMappingConstructor"))
+
 val CLASS_ID_ENUM_MAPPING_CONSTRUCTOR = ClassId(PACKAGE_TECH_MAPPIE_API, Name.identifier("EnumMappingConstructor"))
 
 val CLASS_ID_MAPPIE = ClassId(PACKAGE_TECH_MAPPIE_API, Name.identifier("Mappie"))

compiler-plugin/src/test/kotlin/tech/mappie/testing/objects/FromValueTest.kt

@@ -97,6 +97,31 @@ class FromValueTest {
         }
     }
 
+    @Test
+    fun `map property fromValue using extension receiver on mapping dsl in ObjectMappie2 should fail`() {
+        compile(directory) {
+            file("Test.kt",
+                """
+                import tech.mappie.api.ObjectMappie2
+                import tech.mappie.testing.objects.FromValueTest.*
+
+                class Mapper : ObjectMappie2<Unit, Unit, Output>() {
+                    override fun map(first: Unit, second: Unit) = mapping {
+                        to::value fromValue run {
+                            "test"
+                        }
+                    }
+                }
+                """
+            )
+        } satisfies {
+            isCompilationError()
+            hasErrorMessage(6,
+                "The function 'run' was called as an extension method on the mapping dsl which does not exist after compilation",
+            )
+        }
+    }
+
     @Test
     fun `map property fromValue using dispatch receiver on mapping dsl should fail`() {
         compile(directory) {

website/src/changelog.md

@@ -2,6 +2,10 @@
 title: "Changelog"
 layout: "layouts/changelog.html"
 changelog:
+  - date: "tbd"
+    title: "v2.2.20-1.6.0"
+    items:
+      - "Fixed check of runtime usage of of mapping DSL for multiple object mappie."
   - date: "2025-09-10"
     title: "v2.2.20-1.5.0"
     items: