Fix #1107 by adding missing support of collections as types of value …

…and "one value" classes
plokhotnyuk · Jan 21, 2024 · 8e102b5 · 8e102b5
1 parent 051fc74
commit 8e102b5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/...shared/src/main/scala-3/com/github/plokhotnyuk/jsoniter_scala/macros/JsonCodecMaker.scala b/...shared/src/main/scala-3/com/github/plokhotnyuk/jsoniter_scala/macros/JsonCodecMaker.scala
@@ -2809,7 +2809,9 @@ object JsonCodecMaker {
         else if (tpe =:= TypeRepr.of[ZoneOffset]) '{ $out.writeVal(${m.asExprOf[ZoneOffset]}) }
         else if (isValueClass(tpe)) {
           val vtpe = valueClassValueType(tpe)
-          genWriteVal(Select(m.asTerm, valueClassValueSymbol(tpe)).asExpr, vtpe :: types, isStringified, None, out)
+          vtpe.asType match
+            case '[vt] =>
+              genWriteVal(Select(m.asTerm, valueClassValueSymbol(tpe)).asExprOf[vt], vtpe :: types, isStringified, None, out)
         } else if (isOption(tpe, types.tail)) {
           val tpe1 = typeArg1(tpe)
           tpe1.asType match

diff --git a/...ared/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/macros/JsonCodecMakerSpec.scala b/...ared/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/macros/JsonCodecMakerSpec.scala
@@ -16,6 +16,8 @@ case class UserId(id: String) extends AnyVal
 
 case class OrderId(value: Int) extends AnyVal
 
+case class UserIds(l: List[String]) extends AnyVal
+
 object Alias {
   type I = Int
 
@@ -1198,6 +1200,9 @@ class JsonCodecMakerSpec extends VerifyingSpec {
       verifySerDeser(make[ValueClassTypes],
         ValueClassTypes(UserId("123abc"), OrderId(123123)), """{"uid":"123abc","oid":123123}""")
     }
+    "serialize and deserialize collection fields of value classes" in {
+      verifySerDeser(make[UserIds], UserIds(List("VVV", "WWW")), """["VVV","WWW"]""")
+    }
     "serialize and deserialize top-level value classes" in {
       verifySerDeser(make[UserId], UserId("123abc"), """"123abc"""")
       verifySerDeser(make[OrderId], OrderId(123123), "123123")
@@ -1241,6 +1246,12 @@ class JsonCodecMakerSpec extends VerifyingSpec {
       verifySerDeser(make[Array[OrderId]](CodecMakerConfig.withInlineOneValueClasses(true)),
         _root_.scala.Array(OrderId(123123), OrderId(123456)), "[123123,123456]")
     }
+    "serialize and deserialize collection fields of one value classes" in {
+      case class UserIds(l: List[String])
+
+      verifySerDeser(make[UserIds](CodecMakerConfig.withInlineOneValueClasses(true)),
+        UserIds(List("VVV", "WWW")), """["VVV","WWW"]""")
+    }
     "serialize and deserialize case classes with options" in {
       verifySerDeser(codecOfOptions,
         Options(Option("VVV"), Option(BigInt(4)), Option(Set()), Option(1L), Option(_root_.java.lang.Long.valueOf(2L)),