Implement alias type args

Author: OndrejSpanel

airframe-surface/src/main/scala-3/org/opengrabeso/airframe/surface/CompileTimeSurfaceFactory.scala

@@ -224,21 +224,28 @@ private[surface] class CompileTimeSurfaceFactory[Q <: Quotes](using quotes: Q):
             //println(s"Match 2 $symbolInOwner as ${t.simplified.show}")
             surfaceOf(t.simplified)
 
+    private def extractTypeArgs(t: TypeRepr): Expr[Seq[Surface]] = {
+      //println(s"extractTypeArgs of ${t.show}: ${typeArgsOf(t).map(_.show).mkString("[", ",", "]")}")
+      Expr.ofSeq(typeArgsOf(t).map(s => extractSymbol(s)))
+    }
+
     private def aliasFactory: Factory = {
       case t if t.typeSymbol.typeRef.isOpaqueAlias =>
         // Treat opaque types in Scala 3 as alias types
         val alias    = t.typeSymbol
         val inner    = extractSymbol(t)
         val name     = Expr(alias.name)
         val fullName = Expr(fullTypeNameOf(t))
-        '{ Alias(${ name }, ${ fullName }, ${ inner }) }
+        val typeArgs = extractTypeArgs(t)
+        '{ Alias(${ name }, ${ fullName }, ${ inner }, ${ typeArgs }) }
       case t if t.typeSymbol.isType && t.typeSymbol.isAliasType && !belongsToScalaDefault(t) =>
         // println(s"=== alias factory: ${t}, ${dealiased}, ${t.simplified}")
         val inner = extractSymbol(t)
         val s        = t.typeSymbol
         val name     = Expr(s.name)
         val fullName = Expr(fullTypeNameOf(t.asType))
-        '{ Alias(${ name }, ${ fullName }, ${ inner }) }
+        val typeArgs = extractTypeArgs(t)
+        '{ Alias(${ name }, ${ fullName }, ${ inner }, ${ typeArgs }) }
     }
 
     private def higherKindedTypeFactory: Factory = {
@@ -372,7 +379,7 @@ private[surface] class CompileTimeSurfaceFactory[Q <: Quotes](using quotes: Q):
 
     private def genericTypeFactory: Factory = {
       case t if t =:= TypeRepr.of[Any] =>
-        '{ Alias("Any", "scala.Any", AnyRefSurface) }
+        '{ Alias("Any", "scala.Any", AnyRefSurface, Seq.empty) }
       case a: AppliedType =>
         val typeArgs = a.args.map(surfaceOf(_))
         '{ new GenericSurface(${ clsOf(a) }, typeArgs = ${ Expr.ofSeq(typeArgs) }.toIndexedSeq, params = Seq.empty, docString = ${Expr(a.typeSymbol.docstring)}) }

airframe-surface/src/main/scala/org/opengrabeso/airframe/surface/Surfaces.scala

@@ -152,8 +152,9 @@ object Primitive {
   case object BigInteger extends PrimitiveSurface(classOf[java.math.BigInteger])
 }
 
-case class Alias(override val name: String, override val fullName: String, ref: Surface)
-    extends GenericSurface(ref.rawType, typeArgs = ref.typeArgs, params = ref.params, docString = ref.docString) {
+case class Alias(
+  override val name: String, override val fullName: String, ref: Surface, aliasTypeArgs: Seq[Surface] 
+) extends GenericSurface(ref.rawType, typeArgs = ref.typeArgs, params = ref.params, docString = ref.docString) {
   override def toString: String     = s"${name}:=${ref.name}"
   override def isAlias: Boolean     = true
   override def isPrimitive: Boolean = ref.isPrimitive

airframe-surface/src/test/scala-3/org/opengrabeso/airframe/surface/Scala3NewTypeTest.scala

@@ -62,6 +62,20 @@ class Scala3NewTypeTest extends AnyFunSuite with should.Matchers:
     s.name shouldBe "Function1[MyEnv,String]"
   }
 
+  opaque type TypedString[T] = String
+
+  test("opaque types with type parameters") {
+    val s = Surface.of[TypedString[Int]]
+    s.name shouldBe "TypedString"
+    s.fullName shouldBe "org.opengrabeso.airframe.surface.Scala3NewTypeTest.TypedString[Int]"
+    s should not be Surface.of[String]
+    s match {
+      case a: Alias =>
+        a.aliasTypeArgs.head.name shouldBe "Int"
+    }
+    s.dealias shouldBe Surface.of[String]
+  }
+
   case class MyString(env: MyEnv)
 
   test("opaque type in constructor args") {

build.sbt

@@ -14,8 +14,8 @@ publish / skip := true
 
 publishLocal / skip := true
 
-val VERSION = "0.5.6"
-val SCALA_3 = "3.3.4"
+val VERSION = "0.6.0-SNAPSHOT"
+val SCALA_3 = "3.3.6"
 
 // Reload build.sbt on changes
 Global / onChangedBuildSource := ReloadOnSourceChanges
@@ -69,7 +69,7 @@ lazy val surface =
       name        := "light-surface",
       Compile / packageDoc / publishArtifact := false,
       description := "A library for extracting object structure surface",
-      libraryDependencies += "org.scalatest" %%% "scalatest" % "3.2.18" % Test,
+      libraryDependencies += "org.scalatest" %%% "scalatest" % "3.2.19" % Test,
     )
     .jsSettings(jsBuildSettings)