Add tests for Scala 3 generic tuples + code clean up

Author: plokhotnyuk

jsoniter-scala-macros/shared/src/main/scala-3/com/github/plokhotnyuk/jsoniter_scala/macros/JsonCodecMaker.scala

@@ -777,13 +777,13 @@ object JsonCodecMaker {
 
       def isTuple(tpe: TypeRepr): Boolean = tpe <:< TypeRepr.of[Tuple]
 
-      def isTupleXXL(tpe: TypeRepr): Boolean = tpe match {
+      def isGenericTuple(tpe: TypeRepr): Boolean = tpe match {
         case AppliedType(tTpe, _) if tTpe =:= TypeRepr.of[*:] => true
         case _                                                => false
       }
 
-      def tupleXXLTypeArgs(tpe: TypeRepr): List[TypeRepr] = tpe match {
-        case AppliedType(_, List(typeArg, tail)) => typeArg.dealias :: tupleXXLTypeArgs(tail)
+      def genericTupleTypeArgs(tpe: TypeRepr): List[TypeRepr] = tpe match {
+        case AppliedType(_, List(typeArg, tail)) => typeArg.dealias :: genericTupleTypeArgs(tail)
         case _                                   => Nil
       }
 
@@ -2637,9 +2637,9 @@ object JsonCodecMaker {
             } else $in.readNullOrTokenError($default, '"')
           }
         } else if (isTuple(tpe)) withDecoderFor(methodKey, default, in) { (in, default) =>
-          val isXXL = isTupleXXL(tpe)
+          val isGeneric = isGenericTuple(tpe)
           val indexedTypes =
-            if (isXXL) tupleXXLTypeArgs(tpe)
+            if (isGeneric) genericTupleTypeArgs(tpe)
             else typeArgs(tpe)
           val valDefs = indexedTypes.map {
             var i = 0
@@ -2660,7 +2660,7 @@ object JsonCodecMaker {
           }
           val readCreateBlock = Block(valDefs, '{
             if ($in.isNextToken(']')) ${
-              if (isXXL) {
+              if (isGeneric) {
                 Expr.ofTupleFromSeq(valDefs.map(x => Ref(x.symbol).asExprOf[Any]))
               } else {
                 Apply(TypeApply(Select.unique(New(Inferred(tpe)), "<init>"),
@@ -3110,9 +3110,9 @@ object JsonCodecMaker {
             else '{ $out.writeNonEscapedAsciiVal(($tx.name: String)) }
           }
         } else if (isTuple(tpe)) withEncoderFor(methodKey, m, out) { (out, x) =>
-          val isXXL = isTupleXXL(tpe)
+          val isGeneric = isGenericTuple(tpe)
           val indexedTypes =
-            if (isXXL) tupleXXLTypeArgs(tpe)
+            if (isGeneric) genericTupleTypeArgs(tpe)
             else typeArgs(tpe)
           val writeFields = indexedTypes.map {
             var i = 0
@@ -3121,7 +3121,7 @@ object JsonCodecMaker {
               te.asType match
                 case '[t] =>
                   val select =
-                    if (isXXL) {
+                    if (isGeneric) {
                       val getter =
                         Select.unique(x.asTerm, "productElement").appliedTo(Literal(IntConstant(i - 1))).asExprOf[Any]
                       '{ $getter.asInstanceOf[t] }.asExprOf[t]

jsoniter-scala-macros/shared/src/test/scala-3/com/github/plokhotnyuk/jsoniter_scala/macros/JsonCodecMakerNewTypeSpec.scala

@@ -62,6 +62,11 @@ class JsonCodecMakerNewTypeSpec extends VerifyingSpec {
         (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, "24"),
         """[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,"24"]""")
     }
+    "serialize and deserialize Scala 3 generic tuples" in {
+      verifySerDeser(make[(Byte *: Short *: Int *: Long *: EmptyTuple)],
+        (1: Byte) *: (2: Short) *: 3 *: 4L *: EmptyTuple,
+        """[1,2,3,4]""")
+    }
     "serialize and deserialize Scala 3 immutable array" in {
       val json = """{"aa":[[1,2],[3,4]],"a":[1,2,3,4]}"""
       val iArrays = IArrays(IArray(IArray[Int](1, 2), IArray[Int](3, 4)), IArray[BigInt](1, 2, 3, 4))