Fix computed Scala 3 jsonHint derivation

Author: 987Nabil

zio-json/shared/src/main/scala-3/zio/json/macros.scala

@@ -231,6 +231,13 @@ private[json] final case class SumMeta(
 // =======================================================================================
 private[json] object MacroHelpers {
 
+  private def extractJsonHintName(using Quotes)(annotation: quotes.reflect.Term): Option[Expr[String]] = {
+    annotation.asExpr match {
+      case '{ new zio.json.jsonHint($name: String) } => Some(name)
+      case _                                         => None
+    }
+  }
+
   // =====================================================================================
   // Consolidated single-pass metadata extraction macros
   // =====================================================================================
@@ -349,21 +356,21 @@ private[json] object MacroHelpers {
 
     val subTypes = leafTypes(sym)
     val infos = subTypes.map { subSym =>
-      val hintAnnotation = subSym.annotations.map(_.asExpr).collectFirst {
-        case '{ new zio.json.jsonHint(${ Expr(name) }: String) } => name
-      }
+      val hintAnnotation = subSym.annotations.collectFirst(Function.unlift(extractJsonHintName))
       val hasHint = hintAnnotation.isDefined
       val hintName = hintAnnotation.getOrElse {
-        if (subSym.flags.is(Flags.Module)) subSym.companionModule.name
-        else subSym.name
+        Expr(
+          if (subSym.flags.is(Flags.Module)) subSym.companionModule.name
+          else subSym.name
+        )
       }
       val isObj = subSym.flags.is(Flags.Module) ||
         (subSym.flags.is(Flags.Enum) && subSym.flags.is(Flags.JavaStatic)) ||
         (subSym.flags.is(Flags.Enum) && subSym.flags.is(Flags.Case) && subSym.caseFields.isEmpty && !subSym.flags.is(
           Flags.Trait
         ))
       val hasFields = subSym.caseFields.nonEmpty
-      (Expr(hintName), Expr(isObj), Expr(hasFields), Expr(hasHint))
+      (hintName, Expr(isObj), Expr(hasFields), Expr(hasHint))
     }
     val subtypeInfoExpr = '{
       Array(${
@@ -502,21 +509,21 @@ private[json] object MacroHelpers {
 
     val subTypes = leafTypes(sym)
     val infos    = subTypes.map { subSym =>
-      val hintAnnotation = subSym.annotations.map(_.asExpr).collectFirst {
-        case '{ new zio.json.jsonHint(${ Expr(name) }: String) } => name
-      }
+      val hintAnnotation = subSym.annotations.collectFirst(Function.unlift(extractJsonHintName))
       val hasHint  = hintAnnotation.isDefined
       val hintName = hintAnnotation.getOrElse {
-        if (subSym.flags.is(Flags.Module)) subSym.companionModule.name
-        else subSym.name
+        Expr(
+          if (subSym.flags.is(Flags.Module)) subSym.companionModule.name
+          else subSym.name
+        )
       }
       val isObj = subSym.flags.is(Flags.Module) ||
         (subSym.flags.is(Flags.Enum) && subSym.flags.is(Flags.JavaStatic)) ||
         (subSym.flags.is(Flags.Enum) && subSym.flags.is(Flags.Case) && subSym.caseFields.isEmpty && !subSym.flags.is(
           Flags.Trait
         ))
       val hasFields = subSym.caseFields.nonEmpty
-      (Expr(hintName), Expr(isObj), Expr(hasFields), Expr(hasHint))
+      (hintName, Expr(isObj), Expr(hasFields), Expr(hasHint))
     }
     '{
       Array(${

zio-json/shared/src/test/scala-3/zio/json/DecoderVersionSpecificSpec.scala

@@ -147,6 +147,19 @@ object DecoderVersionSpecificSpec extends ZIOSpecDefault {
           assertTrue("""{"$type":"Qux"}""".fromJson[Foo] == Right(Foo.Qux)) &&
           assertTrue("""{"$type":"Barrr"}""".fromJson[Foo] == Right(Foo.Bar))
         },
+        test("Derives for a sum sealed trait Enumeration type with computed jsonHint") {
+          @jsonDiscriminator("$type")
+          sealed trait Foo
+          object Foo:
+            @jsonHint("Bar" + "rr")
+            case object Bar extends Foo
+            case object Baz extends Foo
+
+            given JsonCodec[Foo] = DeriveJsonCodec.gen[Foo]
+
+          assertTrue((Foo.Bar: Foo).toJson == """{"$type":"Barrr"}""") &&
+          assertTrue("""{"$type":"Barrr"}""".fromJson[Foo] == Right(Foo.Bar))
+        },
         test("skip JSON encoded in a string value") {
           @jsonDiscriminator("type")
           sealed trait Example derives JsonDecoder {