Merge pull request #325 from goshacodes/fix_complex_sum_types

Fixed incorrect (but working) writer/reader generation for complex sum types
tethys-json · Oct 23, 2024 · 0d95509 · 0d95509
2 parents 16c3f2f + aa560cb
commit 0d95509
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/modules/core/src/main/scala-3/tethys/derivation/ConfigurationMacroUtils.scala b/modules/core/src/main/scala-3/tethys/derivation/ConfigurationMacroUtils.scala
@@ -752,17 +752,19 @@ trait ConfigurationMacroUtils:
       case '[t *: ts]    => TypeRepr.of[t] :: typeReprsOf[ts]
 
   def getAllChildren(tpe: TypeRepr): List[TypeRepr] =
-    tpe.asType match
-      case '[t] =>
-        Expr.summon[scala.deriving.Mirror.Of[t]] match
-          case Some('{
-                $m: scala.deriving.Mirror.SumOf[t] {
-                  type MirroredElemTypes = subs
-                }
-              }) =>
-            typeReprsOf[subs].flatMap(getAllChildren)
-          case _ =>
-            List(tpe)
+    def loop(tpe: TypeRepr): List[TypeRepr] =
+      tpe.asType match
+        case '[t] =>
+          Expr.summon[scala.deriving.Mirror.Of[t]] match
+            case Some('{
+                  $m: scala.deriving.Mirror.SumOf[t] {
+                    type MirroredElemTypes = subs
+                  }
+                }) =>
+              typeReprsOf[subs].flatMap(loop)
+            case _ =>
+              List(tpe)
+    loop(tpe).distinct
 
   case class SelectedField(name: String, selector: Term)