a

pablf · Jun 30, 2024 · 0c577ea · 0c577ea
1 parent 09ca54e
commit 0c577ea
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 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
@@ -360,10 +360,9 @@ private case class DeriveSchema()(using val ctx: Quotes) {
     val cases = typesAndLabels.map { case (tpe, label) => deriveCase[T](tpe, label, newStack) }
 
     val numParentFields: Int = TypeRepr.of[T].typeSymbol.declaredFields.length
-    val childrens = TypeRepr.of[T].typeSymbol.children
     val childrenFields = children.map(_.declaredFields.length)
     val childrenFieldsConstructor = children.map(_.caseFields.length)
-    val isSimpleEnum: Boolean = childrenFieldsConstructor.forall( _ == 0) && childrenFields.forall( _ <= numParentFields) && children.flatMap(_.children).isEmpty
+    val isSimpleEnum: Boolean = childrenFieldsConstructor.forall( _ == 0) && childrenFields.forall( _ <= numParentFields) && types.flatMap(_.children).isEmpty
     val hasSimpleEnumAnn: Boolean = TypeRepr.of[T].typeSymbol.hasAnnotation(TypeRepr.of[_root_.zio.schema.annotation.simpleEnum].typeSymbol)
 
     val docAnnotationExpr = TypeRepr.of[T].typeSymbol.docstring.map { docstring =>

diff --git a/zio-schema-json/shared/src/test/scala-2/zio/schema/codec/JsonCodecSpec.scala b/zio-schema-json/shared/src/test/scala-2/zio/schema/codec/JsonCodecSpec.scala
@@ -299,6 +299,9 @@ object JsonCodecSpec extends ZIOSpecDefault {
           charSequenceToByteChunk(""""FinalElem"""")
         )
       },
+      test("fails when adding manually @simpleEnum to non-simple enumerations") {
+        assertZIO(ZIO.attempt(JsonCodec.schemaBasedBinaryCodec(cfg)(schema)).either)(isLeft(anything))
+      },
       test("case class") {
         assertEncodes(
           searchRequestWithTransientFieldSchema,
@@ -1763,7 +1766,12 @@ object JsonCodecSpec extends ZIOSpecDefault {
     implicit val schema: zio.schema.Schema[IntermediateEnum] = zio.schema.DeriveSchema.gen[IntermediateEnum]
   }
 
+  sealed trait NonSimpleEnum
 
+  object NonSimpleEnum {
+    case class Leaf(a: Int)         extends NonSimpleEnum
+    implicit val schema: zio.schema.Schema[NonSimpleEnum] = zio.schema.DeriveSchema.gen[NonSimpleEnum].annotate(simpleEnum())
+  }
 
   sealed trait Color