Fixes ignoring transient fields in zio-schema based ADT codecs

desert-core/src/main/scala/io/github/vigoo/desert/internal/AdtCodec.scala

@@ -396,7 +396,7 @@ object AdtCodec {
           }
         }
 
-        override def serialize(value: SerializedEvolutionStep)(implicit context: SerializationContext): Unit =
+        override def serialize(value: SerializedEvolutionStep)(implicit context: SerializationContext): Unit = {
           value match {
             case FieldAddedToNewChunk(size)  =>
               writeVarInt(size, optimizeForPositive = false)
@@ -409,6 +409,7 @@ object AdtCodec {
             case UnknownEvolutionStep        =>
               writeVarInt(Codes.Unknown, optimizeForPositive = false)
           }
+        }
       }
   }
 

desert-shapeless/src/test/scala/io/github/vigoo/desert/shapeless/TransientSpec.scala

@@ -2,7 +2,8 @@ package io.github.vigoo.desert.shapeless
 
 import io.github.vigoo.desert.Evolution.FieldAdded
 import io.github.vigoo.desert._
-import zio.test.{Spec, TestEnvironment, ZIOSpecDefault}
+import zio.Chunk
+import zio.test.{Spec, TestEnvironment, ZIOSpecDefault, assertTrue}
 
 object TransientSpec extends ZIOSpecDefault with SerializationProperties {
   case class TypeWithoutCodec(value: Int)
@@ -24,12 +25,19 @@ object TransientSpec extends ZIOSpecDefault with SerializationProperties {
 
   case class Case3(x: String) extends SumWithTransientCons
 
+  @evolutionSteps(
+    Evolution.FieldAdded("x", 0),
+    Evolution.FieldRemoved("z")
+  )
+  case class Point(x: Int, y: Int, @transientField(None) cachedStr: Option[String])
+
   private implicit val typeRegistry: TypeRegistry = TypeRegistry.empty
 
   implicit val ttCodec: BinaryCodec[TransientTest]         = DerivedBinaryCodec.derive
   implicit val case1Codec: BinaryCodec[Case1]              = DerivedBinaryCodec.derive
   implicit val case3Codec: BinaryCodec[Case3]              = DerivedBinaryCodec.derive
   implicit val swtCodec: BinaryCodec[SumWithTransientCons] = DerivedBinaryCodec.derive
+  implicit val pointCodec: BinaryCodec[Point]              = DerivedBinaryCodec.derive
 
   override def spec: Spec[TestEnvironment, Any] =
     suite("Support for transient modifiers")(
@@ -51,6 +59,12 @@ object TransientSpec extends ZIOSpecDefault with SerializationProperties {
       },
       test("serializing a transient constructor fails") {
         cannotBeSerializedAndReadBack[SumWithTransientCons, SumWithTransientCons](Case2(TypeWithoutCodec(1)))
+      },
+      test("expected binary format") {
+        val point                 = Point(1, -10, None)
+        val bytes                 = serializeToArray(point).map(Chunk.fromArray)
+        val expected: Chunk[Byte] = Chunk(2, 8, 8, 3, 2, 122, -1, -1, -1, -10, 0, 0, 0, 1)
+        assertTrue(bytes.toOption.get == expected)
       }
     )
 }

desert-zio-schema/src/main/scala/io/github/vigoo/desert/zioschema/DerivedBinaryCodec.scala

@@ -36,10 +36,12 @@ object DerivedBinaryCodec extends DerivedBinaryCodecVersionSpecific {
         fields: => Chunk[Deriver.WrappedF[BinaryCodec, _]],
         summoned: => Option[BinaryCodec[A]]
     ): BinaryCodec[A] = {
+      val transientFields               = getTransientFields(record.fields)
       val preparedSerializationCommands =
-        record.fields
-          .zip(fields)
-          .map { case (field, fieldCodec) =>
+        record.fields.zipWithIndex
+          .filter { case (field, _) => !transientFields.contains(field.name) }
+          .map { case (field, idx) =>
+            val fieldCodec = fields(idx)
             (field.name, field.get, () => fieldCodec.unwrap.asInstanceOf[BinaryCodec[Any]])
           }
           .toList
@@ -50,7 +52,7 @@ object DerivedBinaryCodec extends DerivedBinaryCodecVersionSpecific {
             evolutionSteps = getEvolutionStepsFromAnnotation(record.annotations),
             typeName = record.id.name,
             constructors = Vector(record.id.name),
-            transientFields = getTransientFields(record.fields),
+            transientFields = transientFields,
             getSerializationCommands = (value: A) =>
               preparedSerializationCommands.map { case (fieldName, getter, codec) =>
                 AdtCodec.SerializationCommand.WriteField[Any](

desert-zio-schema/src/test/scala/io/github/vigoo/desert/zioschema/TransientSpec.scala

@@ -3,14 +3,17 @@ package io.github.vigoo.desert.zioschema
 import io.github.vigoo.desert.Evolution.FieldAdded
 import io.github.vigoo.desert.{
   BinaryCodec,
+  Evolution,
   SerializationProperties,
   TypeRegistry,
   evolutionSteps,
+  serializeToArray,
   transientConstructor,
   transientField
 }
+import zio.Chunk
 import zio.schema.{DeriveSchema, Schema}
-import zio.test.{Spec, TestEnvironment, ZIOSpecDefault}
+import zio.test.{Spec, TestEnvironment, ZIOSpecDefault, assertTrue}
 
 object TransientSpec extends ZIOSpecDefault with SerializationProperties {
   case class TypeWithoutCodec(value: Int)
@@ -32,13 +35,21 @@ object TransientSpec extends ZIOSpecDefault with SerializationProperties {
 
   case class Case3(x: String) extends SumWithTransientCons
 
+  @evolutionSteps(
+    Evolution.FieldAdded("x", 0),
+    Evolution.FieldRemoved("z")
+  )
+  case class Point(x: Int, y: Int, @transientField(None) cachedStr: Option[String])
+
   private implicit val typeRegistry: TypeRegistry = TypeRegistry.empty
 
   implicit val ttSchema: Schema[TransientTest]         = DeriveSchema.gen[TransientTest]
   implicit val swtSchema: Schema[SumWithTransientCons] = DeriveSchema.gen[SumWithTransientCons]
+  implicit val pointSchema: Schema[Point]              = DeriveSchema.gen[Point]
 
   implicit val ttCodec: BinaryCodec[TransientTest]         = DerivedBinaryCodec.derive[TransientTest]
   implicit val swtCodec: BinaryCodec[SumWithTransientCons] = DerivedBinaryCodec.derive[SumWithTransientCons]
+  implicit val pointCodec: BinaryCodec[Point]              = DerivedBinaryCodec.derive[Point]
 
   override def spec: Spec[TestEnvironment, Any] =
     suite("Support for transient modifiers")(
@@ -60,6 +71,12 @@ object TransientSpec extends ZIOSpecDefault with SerializationProperties {
       },
       test("serializing a transient constructor fails") {
         cannotBeSerializedAndReadBack[SumWithTransientCons, SumWithTransientCons](Case2(TypeWithoutCodec(1)))
+      },
+      test("expected binary format") {
+        val point                 = Point(1, -10, None)
+        val bytes                 = serializeToArray(point).map(Chunk.fromArray)
+        val expected: Chunk[Byte] = Chunk(2, 8, 8, 3, 2, 122, -1, -1, -1, -10, 0, 0, 0, 1)
+        assertTrue(bytes.toOption.get == expected)
       }
     )
 }