remove dotty.dokka.model.api package

Author: romanowski

scala3doc/src/dotty/dokka/ScalaModuleCreator.scala

@@ -1,7 +1,6 @@
 package dotty.dokka
 
 import dotty.dokka.tasty.DokkaTastyInspector
-import dotty.dokka.model.api._
 import collection.JavaConverters._
 
 case class Module(rootPackage: Member, members: Map[DRI, Member])

scala3doc/src/dotty/dokka/SourceLinks.scala

@@ -2,7 +2,6 @@ package dotty.dokka
 
 import java.nio.file.Path
 import java.nio.file.Paths
-import dotty.dokka.model.api._
 import dotty.tools.dotc.core.Contexts.Context
 import scala.util.matching.Regex
 

scala3doc/src/dotty/dokka/model/api/api.scala renamed to scala3doc/src/dotty/dokka/api.scala

@@ -1,6 +1,4 @@
 package dotty.dokka
-package model
-package api
 
 import dotty.dokka.tasty.comments.Comment
 
@@ -145,7 +143,7 @@ case class Member(
   dri: DRI,
   kind: Kind,
   visibility: Visibility = Visibility.Unrestricted,
-  modifiers: Seq[dotty.dokka.model.api.Modifier] = Nil,
+  modifiers: Seq[Modifier] = Nil,
   annotations: List[Annotation] = Nil,
   signature: Signature = Signature(),
   sources: Option[TastyDocumentableSource] = None,
@@ -169,7 +167,57 @@ extension[T] (member: Member)
   def asLink: LinkToType = LinkToType(member.signature, member.dri, member.kind)
   def membersBy(op: Member => Boolean): Seq[Member] = member.members.filter(op)
 
+  def withMembers(newMembers: Seq[Member]): Member = member.copy(members = newMembers)
+
+  def updateRecusivly(op: Member => Member): Member =
+    val newMembers = member.members.map(_.updateRecusivly(op))
+    op(member).withMembers(newMembers)
+
+  def withOrigin(origin: Origin): Member = member.copy(origin = origin)
+
+  def withKind(kind: Kind): Member = member.copy(kind = kind)
+
+  def withNewMembers(newMembers: Seq[Member]): Member =
+    member.copy(members = member.members ++ newMembers)
+
+  def withKnownChildren(knownChildren: Seq[LinkToType]): Member =
+    member.copy(knownChildren = knownChildren)
+
+  def withNewGraphEdges(edges: Seq[(LinkToType, LinkToType)]): Member =
+    member.copy(graph = member.graph ++ edges)
+
+  def getDirectParentsAsStrings: Seq[String] =
+    member.directParents.map(_.signature.getName).sorted
+
+  def getParentsAsStrings: Seq[String] =
+    member.parents.map(_.signature.getName).sorted
+
+  def getKnownChildrenAsStrings: Seq[String] =
+    member.knownChildren.map(_.signature.getName).sorted
+
 extension (members: Seq[Member]) def byInheritance =
   members.partition(_.inheritedFrom.isEmpty)
 
+extension (m: Module)
+  def updatePackages(op: Seq[Member] => Seq[Member]): Module =
+    val newRoot = m.rootPackage.withMembers(op(m.rootPackage.members))
+    m.copy(rootPackage = newRoot)
+
+  def updateMembers(op: Member => Member): Module =
+     updatePackages(_.map(p => p.updateRecusivly(op)))
+
+  def visitMembers(callback: Member => Unit): Unit =
+    def visitClasslike(c: Member): Unit =
+      callback(c)
+      c.members.foreach(visitClasslike(_))
+
+    visitClasslike(m.rootPackage)
+
+extension (s: Signature)
+  def getName: String =
+    s.map {
+      case s: String => s
+      case l: Link => l.name
+    }.mkString
+
 case class TastyDocumentableSource(val path: String, val lineNumber: Int)

scala3doc/src/dotty/dokka/model/api/internalExtensions.scala

@@ -10,8 +10,6 @@ import java.nio.file.Paths
 import util.Try
 import collection.JavaConverters._
 
-import dotty.dokka.model.api._
-
 class StaticSiteContext(
   val root: File,
   val args: Scala3doc.Args,

scala3doc/src/dotty/dokka/model/api/membersUtils.scala

@@ -3,7 +3,6 @@ package site
 
 import java.io.File
 import java.nio.file.Files
-import dotty.dokka.model.api._
 
 import com.vladsch.flexmark.ext.anchorlink.AnchorLinkExtension
 import com.vladsch.flexmark.ext.autolink.AutolinkExtension

scala3doc/src/dotty/dokka/site/StaticSiteContext.scala

@@ -3,8 +3,6 @@ package tasty
 
 import collection.JavaConverters._
 import dotty.dokka._
-import dotty.dokka.model.api.Annotation
-import dotty.dokka.model.api.TastyDocumentableSource
 import scala.quoted._
 
 trait BasicSupport:

scala3doc/src/dotty/dokka/site/common.scala

@@ -2,11 +2,7 @@ package dotty.dokka.tasty
 
 import collection.JavaConverters._
 import dotty.dokka._
-import dotty.dokka.model.api._
-import dotty.dokka.model.api.Modifier
-import dotty.dokka.model.api.Kind
-import dotty.dokka.model.api.ImplicitConversion
-import dotty.dokka.model.api.{Signature => DSignature, Link => DLink}
+import dotty.dokka.{Signature => DSignature}
 
 trait ClassLikeSupport:
   self: TastyParser =>
@@ -415,7 +411,7 @@ trait ClassLikeSupport:
     mkMember(valDef.symbol, kind, memberInfo.res.asSignature)(deprecated = valDef.symbol.isDeprecated())
 
   def mkMember(symbol: Symbol, kind: Kind, signature: DSignature)(
-    modifiers: Seq[dotty.dokka.model.api.Modifier] = symbol.getExtraModifiers(),
+    modifiers: Seq[Modifier] = symbol.getExtraModifiers(),
     origin: Origin = Origin.RegularlyDefined,
     inheritedFrom: Option[InheritedFrom] = None,
     graph: HierarchyGraph = HierarchyGraph.empty,

scala3doc/src/dotty/dokka/tasty/BasicSupport.scala

@@ -1,9 +1,6 @@
 package dotty.dokka
 package tasty
 
-import dotty.dokka._
-import dotty.dokka.model.api._
-
 import collection.JavaConverters._
 
 trait PackageSupport:

scala3doc/src/dotty/dokka/tasty/ClassLikeSupport.scala

@@ -1,9 +1,5 @@
-package dotty.dokka.tasty
-
-import dotty.dokka._
-import dotty.dokka.model.api.Visibility
-import dotty.dokka.model.api.VisibilityScope
-import dotty.dokka.model.api.Modifier
+package dotty.dokka
+package tasty
 
 import scala.quoted._
 

scala3doc/src/dotty/dokka/tasty/PackageSupport.scala

@@ -13,7 +13,6 @@ import dotty.tools.dotc
 import dotty.dokka.tasty.comments.MemberLookup
 import dotty.dokka.tasty.comments.QueryParser
 import dotty.dokka.tasty.comments.Comment
-import dotty.dokka.model.api._
 
 import java.nio.file.Paths
 import java.nio.file.Files

scala3doc/src/dotty/dokka/tasty/SymOps.scala

@@ -1,9 +1,8 @@
-package dotty.dokka.tasty
+package dotty.dokka
+package tasty
 
 import collection.JavaConverters._
 
-import dotty.dokka.model.api.Link
-
 trait TypesSupport:
   self: TastyParser =>
   import qctx.reflect._

scala3doc/src/dotty/dokka/tasty/TastyParser.scala

@@ -1,8 +1,5 @@
 package dotty.dokka
 
-import dotty.dokka.model._
-import dotty.dokka.model.api._
-
 class ImplicitMembersExtensionTransformer(using DocContext) extends(Module => Module):
   override def apply(original: Module): Module =
     val classlikeMap = original.members

scala3doc/src/dotty/dokka/tasty/TypesSupport.scala

@@ -1,8 +1,5 @@
 package dotty.dokka
 
-import dotty.dokka.model._
-import dotty.dokka.model.api._
-
 class InheritanceInformationTransformer(using DocContext) extends (Module => Module):
   override def apply(original: Module): Module =
     val subtypes = getSupertypes(original.rootPackage).groupBy(_._1).transform((k, v) => v.map(_._2))

scala3doc/src/dotty/dokka/transformers/ImplicitMembersExtensionTransformer.scala

@@ -1,8 +1,6 @@
-package dotty.dokka.translators
+package dotty.dokka
+package translators
 
-import dotty.dokka.model.api._
-
-import dotty.dokka._
 
 object FilterAttributes:
   def attributesFor(m: Member): Map[String, String] =

scala3doc/src/dotty/dokka/transformers/InheritanceInformationTransformer.scala

@@ -1,7 +1,5 @@
 package dotty.dokka
 
-import dotty.dokka.model.api._
-
 object ScalaSignatureProvider:
   def rawSignature(documentable: Member, builder: SignatureBuilder): SignatureBuilder =
     documentable.kind match

scala3doc/src/dotty/dokka/translators/FilterAttributes.scala

@@ -1,8 +1,5 @@
 package dotty.dokka
 
-
-import dotty.dokka.model.api._
-
 case class InlineSignatureBuilder(names: Signature = Nil, preName: Signature = Nil) extends SignatureBuilder:
   override def text(str: String): SignatureBuilder = copy(names = str +: names)
   override def name(str: String, dri: DRI): SignatureBuilder = copy(names = Nil, preName = names)

scala3doc/src/dotty/dokka/translators/ScalaSignatureProvider.scala

@@ -1,8 +1,6 @@
 package dotty.dokka
 
-import dotty.dokka.model._
 import HTML._
-import dotty.dokka.model.api._
 
 object DotDiagramBuilder:
   def build(diagram: HierarchyGraph, renderer: SignatureRenderer)(using DocContext): String =

scala3doc/src/dotty/dokka/translators/ScalaSignatureUtils.scala

@@ -5,7 +5,6 @@ import HTML._
 import collection.JavaConverters._
 import java.net.URI
 import java.net.URL
-import dotty.dokka.model.api._
 import dotty.dokka.site._
 import scala.util.Try
 import org.jsoup.Jsoup

scala3doc/src/dotty/renderers/DotDiagramBuilder.scala

@@ -5,7 +5,6 @@ import HTML._
 import collection.JavaConverters._
 import java.net.URI
 import java.net.URL
-import dotty.dokka.model.api._
 import dotty.dokka.site._
 import scala.util.Try
 import org.jsoup.Jsoup

scala3doc/src/dotty/renderers/HtmlRenderer.scala

@@ -1,6 +1,5 @@
 package dotty.dokka
 
-import dotty.dokka.model.api._
 import scala.collection.immutable.SortedMap
 import dotty.dokka.HTML._
 import collection.JavaConverters._

scala3doc/src/dotty/renderers/Locations.scala

@@ -5,7 +5,6 @@ import HTML._
 import collection.JavaConverters._
 import java.net.URI
 import java.net.URL
-import dotty.dokka.model.api._
 import dotty.dokka.site._
 import scala.util.Try
 import org.jsoup.Jsoup
@@ -109,7 +108,7 @@ trait Resources(using ctx: DocContext) extends Locations, Writer:
             val sig = Signature(member.kind.name, " ") ++ Seq(Link(member.name, member.dri)) ++ signatureBuilder.names.reverse
             val entry = mkEntry(member.dri, member.name, flattenToText(sig), descr)
             val children = member
-                .membersBy(m => m.kind != dotty.dokka.model.api.Kind.Package && !m.kind.isInstanceOf[Classlike])
+                .membersBy(m => m.kind != Kind.Package && !m.kind.isInstanceOf[Classlike])
                 .filter(m => m.origin == Origin.RegularlyDefined && m.inheritedFrom.isEmpty)
             Seq(entry) ++ children.flatMap(processMember)
 

scala3doc/src/dotty/renderers/MemberRenderer.scala

@@ -5,8 +5,6 @@ import collection.JavaConverters._
 import java.net.URI
 import java.net.URL
 import java.util.{List => JList, Set => JSet}
-import dotty.dokka.model.api.Link
-import dotty.dokka.model.api.HierarchyGraph
 import scala.util.Try
 import org.jsoup.Jsoup
 import java.nio.file.Paths

scala3doc/src/dotty/renderers/Resources.scala

@@ -5,7 +5,6 @@ import HTML._
 import collection.JavaConverters._
 import java.net.URI
 import java.net.URL
-import dotty.dokka.model.api._
 import dotty.dokka.site._
 import scala.util.Try
 import org.jsoup.Jsoup

scala3doc/src/dotty/renderers/SignatureRenderer.scala

@@ -7,12 +7,10 @@ import dotty.dokka.test.BuildInfo
 import java.nio.file.Path;
 import org.jsoup.Jsoup
 
-import dotty.dokka.model.api._
-
-private enum Signature:
+private enum SignatureRes:
   case Expected(name: String, signature: String)
   case Unexpected(name: String)
-import Signature._
+import SignatureRes._
 
 abstract class SignatureTest(
   testName: String,
@@ -88,7 +86,7 @@ abstract class SignatureTest(
       nameMatch <- identifierRegex.findFirstMatchIn(afterKind)
     yield nameMatch.group(1)
 
-  private def signaturesFromSources(source: Source, kinds: Seq[String]): Seq[Signature] =
+  private def signaturesFromSources(source: Source, kinds: Seq[String]): Seq[SignatureRes] =
     source.getLines.map(_.trim)
         .filterNot(_.isEmpty)
         .filterNot(_.startWithAnyOfThese("=",":","{","}", "//"))

scala3doc/src/dotty/renderers/SiteRenderer.scala

@@ -1,7 +1,5 @@
 package dotty.dokka
 
-import dotty.dokka.model.api._
-
 class GenericSignaftures extends SignatureTest("genericSignatures", Seq("class"))
 
 class ObjectSignatures extends SignatureTest("objectSignatures", Seq("object"))
@@ -17,7 +15,7 @@ class SignatureTestSourceTest extends SignatureTest("signatureTestSource", Signa
 
 class ModifiersSignatureTest extends SignatureTest("modifiersSignatureTestSource", SignatureTest.all)
 
-class Visibility extends SignatureTest("visibility", SignatureTest.all)
+class VisibilityTest extends SignatureTest("visibility", SignatureTest.all)
 
 
 class GenericMethodsTest extends SignatureTest("genericMethods", Seq("def"))