From 2cd2130602a26711ad685381c0d4daafc7372d7b Mon Sep 17 00:00:00 2001
From: Hendrik Cannoodt <hendrik.cannoodt@gmail.com>
Date: Fri, 15 Nov 2024 00:09:29 +0100
Subject: [PATCH] Get annotations of subclass fieldMembers too and flatten
 everything

should do that for the class annotations too
---
 .../scala/io/viash/helpers/Mirroring.scala    | 49 ++++++++++++-------
 .../scala/io/viash/schema/SchemaTest.scala    |  2 +-
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/main/scala/io/viash/helpers/Mirroring.scala b/src/main/scala/io/viash/helpers/Mirroring.scala
index 0c2109218..1ce17dc25 100644
--- a/src/main/scala/io/viash/helpers/Mirroring.scala
+++ b/src/main/scala/io/viash/helpers/Mirroring.scala
@@ -29,7 +29,7 @@ inline def internalFunctionalityFieldsOf[T]: List[String] = ${ internalFunctiona
 inline def deprecatedFieldsOf[T]: Vector[(String, String, String, String)] = ${ deprecatedFieldsOfImpl[T] }
 inline def removedFieldsOf[T]: Vector[(String, String, String, String)] = ${ removedFieldsOfImpl[T] }
 inline def annotationsOf[T]: List[(String, List[String])] = ${ annotationsOfImpl[T] }
-inline def membersOf[T]: List[String] = ${ membersOfImpl[T] }
+// inline def membersOf[T]: List[String] = ${ membersOfImpl[T] }
 inline def memberTypeAnnotationsOf[T]: List[(String, String, List[(String, List[String])])] = ${ memberTypeAnnotationsOfImpl[T] }
 inline def historyOf[T]: List[String] = ${ historyOfImpl[T] }
 
@@ -181,23 +181,22 @@ def annotationsOfImpl[T: Type](using Quotes): Expr[List[(String, List[String])]]
     values
   }
 
+  // TODO get annotations from base classes and flatten
   val annots = tpe.annotations
     .filter(_.tpe.typeSymbol.fullName.startsWith("io.viash"))
     .map(ann => (ann.tpe.typeSymbol.name, annotationToStrings(ann)))
 
   Expr(annots)
 
-def membersOfImpl[T: Type](using Quotes): Expr[List[String]] = {
-  import quotes.reflect.*
-  val tpe = TypeRepr.of[T].typeSymbol
-  val memberSymbols = tpe.fieldMembers.map(_.name)
-  Expr(memberSymbols)
-}
+// def membersOfImpl[T: Type](using Quotes): Expr[List[String]] = {
+//   import quotes.reflect.*
+//   val tpe = TypeRepr.of[T].typeSymbol
+//   val memberSymbols = tpe.caseFields.map(_.name)
+//   Expr(memberSymbols)
+// }
 
 def memberTypeAnnotationsOfImpl[T: Type](using Quotes): Expr[List[(String, String, List[(String, List[String])])]] = {
   import quotes.reflect.*
-  val tpe = TypeRepr.of[T].typeSymbol
-  val memberSymbols = tpe.fieldMembers
 
   def unfinishedStringStripMargin(s: String, marginChar: Char = '|'): String = {
     s.replaceAll("\\\\n", "\n").stripMargin(marginChar)
@@ -243,18 +242,30 @@ def memberTypeAnnotationsOfImpl[T: Type](using Quotes): Expr[List[(String, Strin
     values
   }
 
-  val annots = 
-    memberSymbols
-      .map{ case m => 
-        val name = m.name
-        val mTpe = "foo"
-        val annotations = m.annotations
-          .filter(_.tpe.typeSymbol.fullName.startsWith("io.viash"))
-          .map(ann => (ann.tpe.typeSymbol.name, annotationToStrings(ann)))
-        (name, mTpe, annotations)
+  val tpe = TypeRepr.of[T].typeSymbol
+  val baseClasses = TypeRepr.of[T].baseClasses.filter(_.fullName.startsWith("io.viash"))
+
+  // base classes don't have case fields, so we need to get the member fields from the base classes and filter them
+  val caseFieldNames = tpe.caseFields.map(_.name)
+
+  val annots =
+    baseClasses
+      .map{ case bc => 
+        bc.fieldMembers
+          .filter(m => caseFieldNames.contains(m.name))
+          .map(m => 
+            val name = m.name
+            val mTpe = "foo"
+            val annotations = m.annotations
+              .filter(_.tpe.typeSymbol.fullName.startsWith("io.viash"))
+              .map(ann => (ann.tpe.typeSymbol.name, annotationToStrings(ann)))
+            (name, mTpe, annotations)
+          )
       }
+  // flatten the list of lists by name
+  val annotsFlattened = annots.flatten.groupBy(_._1).map{ case (k, v) => (k, v.head._2, v.flatMap(_._3)) }.toList
 
-  Expr(annots)
+  Expr(annotsFlattened)
 }
 
 def historyOfImpl[T: Type](using Quotes): Expr[List[String]] = {
diff --git a/src/test/scala/io/viash/schema/SchemaTest.scala b/src/test/scala/io/viash/schema/SchemaTest.scala
index 02db07448..81895e5bc 100644
--- a/src/test/scala/io/viash/schema/SchemaTest.scala
+++ b/src/test/scala/io/viash/schema/SchemaTest.scala
@@ -40,7 +40,7 @@ class SchemaTest extends AnyFunSuite with BeforeAndAfterAll with PrivateMethodTe
      case _ => ()
     }
     
-    assert(nonAnnotated.size == 9) // CollectedSchemas has 9 members, all of them unannotated
+    assert(nonAnnotated.size == 10) // CollectedSchemas has 9 members, all of them unannotated + 1 __this__ member
   }
 
   test("Check formatting of deprecation annotations") {