Fix lenses generation for data classes with secondary constructors (#…

…1244)

modules/meta/arrow-meta/models/src/main/java/arrow/ap/objects/iso/IsoSecondaryConstructor.kt

@@ -0,0 +1,10 @@
+package arrow.ap.objects.iso
+
+import arrow.optics.OpticsTarget
+import arrow.optics.optics
+
+@optics([OpticsTarget.ISO])
+data class IsoSecondaryConstructor(val fieldNumber: Int, val fieldString: String) {
+  constructor(number: Int): this(number, number.toString())
+  companion object
+}

modules/meta/arrow-meta/models/src/main/java/arrow/ap/objects/lens/LensSecondaryConstructor.kt

@@ -0,0 +1,10 @@
+package arrow.ap.objects.lens
+
+import arrow.optics.OpticsTarget
+import arrow.optics.optics
+
+@optics([OpticsTarget.LENS])
+data class LensSecondaryConstructor(val field: String) {
+  constructor(number: Int): this(number.toString())
+  companion object
+}

modules/meta/arrow-meta/models/src/main/java/arrow/ap/objects/optional/OptionalSecondaryConstructor.kt

@@ -0,0 +1,10 @@
+package arrow.ap.objects.optional
+
+import arrow.optics.OpticsTarget
+import arrow.optics.optics
+
+@optics([OpticsTarget.OPTIONAL])
+data class OptionalSecondaryConstructor(val field: String?) {
+  constructor(number: Int?): this(number?.toString())
+  companion object
+}

modules/meta/arrow-meta/src/main/java/arrow/common/utils/ProcessorUtils.kt

@@ -13,6 +13,7 @@ import me.eugeniomarletti.kotlin.metadata.kotlinMetadata
 import me.eugeniomarletti.kotlin.metadata.modality
 import me.eugeniomarletti.kotlin.metadata.proto
 import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf
+import me.eugeniomarletti.kotlin.metadata.shadow.metadata.deserialization.Flags
 import me.eugeniomarletti.kotlin.metadata.shadow.metadata.deserialization.TypeTable
 import me.eugeniomarletti.kotlin.metadata.shadow.metadata.deserialization.supertypes
 import me.eugeniomarletti.kotlin.metadata.shadow.serialization.deserialization.getName
@@ -28,7 +29,7 @@ interface ProcessorUtils : KotlinMetadataUtils {
     .let { it as KotlinClassMetadata }.data
     .let { (nameResolver, classProto) ->
       classProto.constructorOrBuilderList
-        .first()
+        .first { it.isPrimary }
         .valueParameterList
         .map(ProtoBuf.ValueParameter::getName)
         .map(nameResolver::getString)
@@ -43,7 +44,7 @@ interface ProcessorUtils : KotlinMetadataUtils {
     .let { it as KotlinClassMetadata }.data
     .let { data ->
       data.proto.constructorOrBuilderList
-        .first()
+        .first { it.isPrimary }
         .valueParameterList
         .map { it.type.extractFullName(data) }
     }
@@ -98,6 +99,9 @@ interface ProcessorUtils : KotlinMetadataUtils {
 
 }
 
+private val ProtoBuf.ConstructorOrBuilder.isPrimary: Boolean get() = !isSecondary
+private val ProtoBuf.ConstructorOrBuilder.isSecondary: Boolean get() = Flags.IS_SECONDARY[flags]
+
 fun String.removeBackticks() = replace("`", "")
 
 fun knownError(message: String, element: Element? = null): Nothing =

modules/meta/arrow-meta/src/test/java/arrow/ap/tests/IsoTest.kt

@@ -43,6 +43,13 @@ class IsoTest : APTest("arrow.ap.objects.iso") {
       processor = OpticsProcessor()
     ))
 
+    testProcessor(AnnotationProcessor(
+      name = "Isos will be generated for data class with secondary constructors",
+      sourceFiles = listOf("IsoSecondaryConstructor.java"),
+      destFile = "IsoSecondaryConstructor.kt",
+      processor = OpticsProcessor()
+    ))
+
   }
 
 }

modules/meta/arrow-meta/src/test/java/arrow/ap/tests/LensTest.kt

@@ -32,6 +32,13 @@ class LensTest : APTest("arrow.ap.objects.lens") {
       processor = OpticsProcessor()
     ))
 
+    testProcessor(AnnotationProcessor(
+      name = "Lenses will be generated for secondary constructor arguments",
+      sourceFiles = listOf("LensSecondaryConstructor.java"),
+      destFile = "LensSecondaryConstructor.kt",
+      processor = OpticsProcessor()
+    ))
+
   }
 
 }

modules/meta/arrow-meta/src/test/java/arrow/ap/tests/OptionalTest.kt

@@ -32,6 +32,13 @@ class OptionalTest : APTest("arrow.ap.objects.optional") {
       processor = OpticsProcessor()
     ))
 
+    testProcessor(AnnotationProcessor(
+      name = "Optionals will be generated for secondary constructor arguments",
+      sourceFiles = listOf("OptionalSecondaryConstructor.java"),
+      destFile = "OptionalSecondaryConstructor.kt",
+      processor = OpticsProcessor()
+    ))
+
   }
 
 }

modules/meta/arrow-meta/src/test/resources/arrow/ap/objects/iso/IsoSecondaryConstructor.kt

@@ -0,0 +1,8 @@
+package `arrow`.`ap`.`objects`.`iso`
+
+
+
+inline val `arrow`.`ap`.`objects`.`iso`.`IsoSecondaryConstructor`.Companion.iso: arrow.optics.Iso<`arrow`.`ap`.`objects`.`iso`.`IsoSecondaryConstructor`, arrow.core.Tuple2<`kotlin`.`Int`, `kotlin`.`String`>> inline get()= arrow.optics.Iso(
+  get = { isoSecondaryConstructor: `arrow`.`ap`.`objects`.`iso`.`IsoSecondaryConstructor` -> arrow.core.Tuple2(isoSecondaryConstructor.`fieldNumber`, isoSecondaryConstructor.`fieldString`) },
+  reverseGet = { tuple: arrow.core.Tuple2<`kotlin`.`Int`, `kotlin`.`String`> -> `arrow`.`ap`.`objects`.`iso`.`IsoSecondaryConstructor`(tuple.a, tuple.b) }
+)

modules/meta/arrow-meta/src/test/resources/arrow/ap/objects/lens/LensSecondaryConstructor.kt

@@ -0,0 +1,8 @@
+package `arrow`.`ap`.`objects`.`lens`
+
+
+
+inline val `arrow`.`ap`.`objects`.`lens`.`LensSecondaryConstructor`.Companion.field: arrow.optics.Lens<`arrow`.`ap`.`objects`.`lens`.`LensSecondaryConstructor`, `kotlin`.`String`> inline get()= arrow.optics.Lens(
+  get = { lensSecondaryConstructor: `arrow`.`ap`.`objects`.`lens`.`LensSecondaryConstructor` -> lensSecondaryConstructor.`field` },
+  set = { lensSecondaryConstructor: `arrow`.`ap`.`objects`.`lens`.`LensSecondaryConstructor`, value: `kotlin`.`String` -> lensSecondaryConstructor.copy(`field` = value) }
+)

modules/meta/arrow-meta/src/test/resources/arrow/ap/objects/optional/OptionalSecondaryConstructor.kt

@@ -0,0 +1,10 @@
+package `arrow`.`ap`.`objects`.`optional`
+
+import arrow.core.left
+import arrow.core.right
+import arrow.core.toOption
+
+inline val `arrow`.`ap`.`objects`.`optional`.`OptionalSecondaryConstructor`.Companion.field: arrow.optics.Optional<`arrow`.`ap`.`objects`.`optional`.`OptionalSecondaryConstructor`, `kotlin`.`String`> inline get()= arrow.optics.Optional(
+  getOrModify = { optionalSecondaryConstructor: `arrow`.`ap`.`objects`.`optional`.`OptionalSecondaryConstructor` -> optionalSecondaryConstructor.`field`?.right() ?: optionalSecondaryConstructor.left() },
+  set = { optionalSecondaryConstructor: `arrow`.`ap`.`objects`.`optional`.`OptionalSecondaryConstructor`, value: `kotlin`.`String` -> optionalSecondaryConstructor.copy(`field` = value) }
+)