Fix deriving schema for generic types on scala 3

zio · Jul 31, 2023 · 85d4fd4 · 85d4fd4
1 parent 1b48895
commit 85d4fd4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/zio-schema-derivation/shared/src/main/scala-3/zio/schema/DeriveSchema.scala b/zio-schema-derivation/shared/src/main/scala-3/zio/schema/DeriveSchema.scala
@@ -51,6 +51,8 @@ private case class DeriveSchema()(using val ctx: Quotes) extends ReflectionUtils
       case Some(ref) =>
         '{ Schema.defer(${ref.asExprOf[Schema[T]]}) }
       case None => 
+        val summoned = if (!top) Expr.summon[Schema[T]] else None
+        summoned.map( s => '{ Schema.defer(${s}) }).getOrElse(
         typeRepr.asType match {
           case '[List[a]] =>
             val schema = deriveSchema[a](stack)
@@ -77,14 +79,6 @@ private case class DeriveSchema()(using val ctx: Quotes) extends ReflectionUtils
             val schema = deriveSchema[a](stack)
             '{ Schema.chunk(Schema.defer(${schema})) }.asExprOf[Schema[T]]
           case _ => 
-            val summoned = if (!top) Expr.summon[Schema[T]] else None
-            summoned match {
-              case Some(schema) =>
-                // println(s"FOR TYPE ${typeRepr.show}")
-                // println(s"STACK ${stack.find(typeRepr)}")
-                // println(s"Found schema ${schema.show}")
-                schema
-              case _ =>
                 Mirror(typeRepr) match {
                   case Some(mirror) =>
                     mirror.mirrorType match {
@@ -102,8 +96,8 @@ private case class DeriveSchema()(using val ctx: Quotes) extends ReflectionUtils
                       report.errorAndAbort(s"Deriving schema for ${typeRepr.show} is not supported")
                     }
               }
-            }
         }
+        )
     }
 
     //println()

diff --git a/zio-schema-derivation/shared/src/test/scala/zio/schema/DeriveSchemaSpec.scala b/zio-schema-derivation/shared/src/test/scala/zio/schema/DeriveSchemaSpec.scala
@@ -77,6 +77,12 @@ object DeriveSchemaSpec extends ZIOSpecDefault with VersionSpecificDeriveSchemaS
     implicit lazy val schema: Schema[Recursive] = DeriveSchema.gen[Recursive]
   }
 
+  case class GenericType[T](t: T)
+
+  object GenericType {
+    implicit def schema[T: Schema]: Schema[GenericType[T]] = DeriveSchema.gen[GenericType[T]]
+  }
+
   case class Cyclic(field1: Long, child: CyclicChild1)
 
   object Cyclic {