Merge pull request #409 from VirtusLab/pprazak/fix-407

VirtusLab · Feb 28, 2024 · b7ede29 · b7ede29
2 parents 0563595 + 186439a
commit b7ede29
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/core/src/main/scala/besom/internal/codecs.scala b/core/src/main/scala/besom/internal/codecs.scala
@@ -689,13 +689,13 @@ object Encoder:
   import Constants.*
   import besom.json.*
 
-  def encoderSum[A](mirror: Mirror.SumOf[A], nameEncoderPairs: List[(String, Encoder[?])]): Encoder[A] =
+  def encoderSum[A](mirror: Mirror.SumOf[A], nameEncoderPairs: => List[(String, Encoder[?])]): Encoder[A] =
     new Encoder[A]:
       // TODO We only serialize dumb enums!!
       // private val encoderMap                                    = nameEncoderPairs.toMap
       override def encode(a: A): Result[(Set[Resource], Value)] = Result.pure(Set.empty -> a.toString.asValue)
 
-  def encoderProduct[A](nameEncoderPairs: List[(String, Encoder[?])]): Encoder[A] =
+  def encoderProduct[A](nameEncoderPairs: => List[(String, Encoder[?])]): Encoder[A] =
     new Encoder[A]:
       override def encode(a: A): Result[(Set[Resource], Value)] =
         Result

diff --git a/core/src/test/scala/besom/internal/EncoderTest.scala b/core/src/test/scala/besom/internal/EncoderTest.scala
@@ -454,3 +454,22 @@ object Regression383Test:
     besom.internal.Encoder.derived[SecretArgs]
   given argsEncoder(using besom.types.Context): besom.types.ArgsEncoder[SecretArgs] =
     besom.internal.ArgsEncoder.derived[SecretArgs]
+end Regression383Test
+
+class RecurrentArgsTest extends munit.FunSuite with ValueAssertions:
+  case class Recurrent(value: Option[Recurrent])
+  object Recurrent:
+    given encoder(using besom.types.Context): besom.types.Encoder[Recurrent] =
+      besom.internal.Encoder.derived[Recurrent]
+
+  test("encode recurrent type") {
+    given Context = DummyContext().unsafeRunSync()
+    val e         = summon[Encoder[Recurrent]]
+
+    val (_, encoded) = e.encode(Recurrent(Some(Recurrent(Some(Recurrent(Some(Recurrent(None)))))))).unsafeRunSync()
+
+    val expected =
+      Map("value" -> Map("value" -> Map("value" -> Map().asValue).asValue).asValue).asValue
+    assertEqualsValue(encoded, expected)
+  }
+end RecurrentArgsTest