Polishing

core/src/main/scala-3/caliban/schema/ArgBuilderDerivation.scala

@@ -14,7 +14,7 @@ trait ArgBuilderDerivation {
     inline erasedValue[(Label, A)] match {
       case (_: (name *: names), _: (t *: ts)) =>
         val label = constValue[name].toString
-        val annotations = Macros.anns[t]
+        val annotations = Macros.annotations[t]
         val builder = summonInline[ArgBuilder[t]].asInstanceOf[ArgBuilder[Any]]
         (label, annotations, builder) :: recurse[names, ts]
       case (_: EmptyTuple, _) => Nil
@@ -47,7 +47,7 @@ trait ArgBuilderDerivation {
 
       case m: Mirror.ProductOf[A] =>
         lazy val fields = recurse[m.MirroredElemLabels, m.MirroredElemTypes]
-        lazy val annotations = Macros.paramAnns[A].to(Map)
+        lazy val annotations = Macros.paramAnnotations[A].to(Map)
         new ArgBuilder[A] {
           def build(input: InputValue): Either[ExecutionError, A] = {
             fields.map { (label, _, builder) =>

core/src/main/scala-3/caliban/schema/macros/Macros.scala

@@ -3,33 +3,33 @@ package caliban.schema.macros
 import scala.quoted.*
 
 private[caliban] object Macros {
-  inline def anns[T]: List[Any] = ${anns[T]}
-  inline def paramAnns[T]: List[(String, List[Any])] = ${paramAnns[T]}
+  inline def annotations[T]: List[Any] = ${annotationsImpl[T]}
+  inline def paramAnnotations[T]: List[(String, List[Any])] = ${paramAnnotationsImpl[T]}
 
-  def paramAnns[T: Type](using qctx: Quotes): Expr[List[(String, List[Any])]] = {
+  def annotationsImpl[T: Type](using qctx: Quotes): Expr[List[Any]] = {
     import qctx.reflect.*
 
     val tpe = TypeRepr.of[T]
 
     Expr.ofList {
-      tpe.typeSymbol.primaryConstructor.paramSymss.flatten.map { field =>
-        Expr(field.name) -> field.annotations.filter { a =>
-          a.tpe.typeSymbol.maybeOwner.isNoSymbol ||
-            a.tpe.typeSymbol.owner.fullName != "scala.annotation.internal"
-        }.map(_.asExpr.asInstanceOf[Expr[Any]])
-      }.filter(_._2.nonEmpty).map { (name, anns) => Expr.ofTuple(name, Expr.ofList(anns)) }
+      tpe.typeSymbol.annotations.filter { a =>
+        a.tpe.typeSymbol.maybeOwner.isNoSymbol || a.tpe.typeSymbol.owner.fullName != "scala.annotation.internal"
+      }.map(_.asExpr.asInstanceOf[Expr[Any]])
     }
   }
 
-  def anns[T: Type](using qctx: Quotes): Expr[List[Any]] = {
+  def paramAnnotationsImpl[T: Type](using qctx: Quotes): Expr[List[(String, List[Any])]] = {
     import qctx.reflect.*
 
     val tpe = TypeRepr.of[T]
 
     Expr.ofList {
-      tpe.typeSymbol.annotations.filter { a =>
-        a.tpe.typeSymbol.maybeOwner.isNoSymbol || a.tpe.typeSymbol.owner.fullName != "scala.annotation.internal"
-      }.map(_.asExpr.asInstanceOf[Expr[Any]])
+      tpe.typeSymbol.primaryConstructor.paramSymss.flatten.map { field =>
+        Expr(field.name) -> field.annotations.filter { a =>
+          a.tpe.typeSymbol.maybeOwner.isNoSymbol ||
+            a.tpe.typeSymbol.owner.fullName != "scala.annotation.internal"
+        }.map(_.asExpr.asInstanceOf[Expr[Any]])
+      }.filter(_._2.nonEmpty).map { (name, anns) => Expr.ofTuple(name, Expr.ofList(anns)) }
     }
   }
 }