finish replacing Unidoc.PackageMetadata.Repo with Unidoc.PackageRepo

Author: tayloraswift

Sources/SwiftinitPages/Contexts/IdentifiablePageContext.swift

@@ -18,10 +18,10 @@ class IdentifiablePageContext<ID> where ID:Hashable
     private
     var cache:Cache
 
-    let repo:Unidoc.PackageMetadata.Repo?
+    let repo:Unidoc.PackageRepo?
 
     private
-    init(cache:Cache, repo:Unidoc.PackageMetadata.Repo?)
+    init(cache:Cache, repo:Unidoc.PackageRepo?)
     {
         self.outlines = []
         self.cache = cache
@@ -49,7 +49,7 @@ extension IdentifiablePageContext
 extension IdentifiablePageContext<Unidoc.Scalar>
 {
     convenience
-    init(principal scalar:Unidoc.Scalar, volume:Unidoc.VolumeMetadata, repo:Unidoc.PackageMetadata.Repo?)
+    init(principal scalar:Unidoc.Scalar, volume:Unidoc.VolumeMetadata, repo:Unidoc.PackageRepo?)
     {
         self.init(cache: .init(
                 vertices: .init(principal: scalar),
@@ -60,7 +60,7 @@ extension IdentifiablePageContext<Unidoc.Scalar>
 extension IdentifiablePageContext<Never?>
 {
     convenience
-    init(principal volume:Unidoc.VolumeMetadata, repo:Unidoc.PackageMetadata.Repo?)
+    init(principal volume:Unidoc.VolumeMetadata, repo:Unidoc.PackageRepo?)
     {
         self.init(cache: .init(
                 vertices: .init(principal: nil),
@@ -165,19 +165,19 @@ extension IdentifiablePageContext where ID:VersionedPageIdentifier
     }
     func link(file:Unidoc.Scalar, line:Int? = nil) -> Swiftinit.SourceLink?
     {
-        if  let origin:Unidoc.PackageMetadata.Repo.Origin = self.repo?.origin,
+        if  let origin:Unidoc.PackageRepo.AnyOrigin = self.repo?.origin,
             let refname:String = self.volumes[file.edition]?.refname,
-            let file:Unidoc.Vertex.File = self.vertices[file]?.file,
-            let blob:String = origin.blob(refname: refname, file: file.symbol)
+            let file:Unidoc.Vertex.File = self.vertices[file]?.file
         {
-            .init(
+            let blob:String = origin.blob(refname: refname, file: file.symbol)
+            return .init(
                 file: file.symbol.last,
                 line: line,
                 target: line.map { "\(blob)#L\($0 + 1)" } ?? blob)
         }
         else
         {
-            nil
+            return nil
         }
     }
 }

Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Docs.PackagePage.swift

@@ -40,7 +40,7 @@ extension Swiftinit.Docs
 extension Swiftinit.Docs.PackagePage
 {
     private
-    var repo:Unidoc.PackageMetadata.Repo? { self.context.repo }
+    var repo:Unidoc.PackageRepo? { self.context.repo }
 }
 extension Swiftinit.Docs.PackagePage:Swiftinit.RenderablePage
 {
@@ -103,46 +103,44 @@ extension Swiftinit.Docs.PackagePage:Swiftinit.VersionedPage
 
             $0[.h1] = self.title
 
-            switch self.repo
+            switch self.repo?.origin
             {
-            case .github(let repo)?:
-                $0[.p] = repo.about
+            case .github(let origin)?:
+                $0[.p] = origin.about
 
-            case nil:
-                break
-            }
-            if  let refname:String = self.volume.refname
-            {
-                switch self.repo?.origin
+                guard
+                let refname:String = self.volume.refname
+                else
                 {
-                case .github(let path)?:
-                    $0 += Swiftinit.SourceLink.init(file: path.dropFirst(),
-                        target: "https://github.com\(path)/tree/\(refname)")
-
-                case nil:
                     break
                 }
+
+                $0 += Swiftinit.SourceLink.init(file: "\(origin.owner)/\(origin.name)",
+                    target: "\(origin.https)/tree/\(refname)")
+
+            case nil:
+                break
             }
         }
 
         main[.section] { $0.class = "notice canonical" } = self.canonical
 
         main[.section, { $0.class = "details" }]
         {
-            if  let repo:Unidoc.PackageMetadata.Repo = self.repo
+            if  let repo:Unidoc.PackageRepo = self.repo
             {
                 let heading:AutomaticHeading = .packageRepository
                 $0[.h2] { $0.id = heading.id } = heading
 
                 $0[.dl]
                 {
-                    switch repo
+                    switch repo.origin
                     {
-                    case .github(let repo):
+                    case .github(let origin):
                         $0[.dt] = "Provider"
                         $0[.dd] = "GitHub"
 
-                        if  let license:GitHub.Repo.License = repo.license
+                        if  let license:Unidoc.PackageLicense = repo.license
                         {
                             $0[.dt] = "License"
                             $0[.dd] = license.name
@@ -155,10 +153,10 @@ extension Swiftinit.Docs.PackagePage:Swiftinit.VersionedPage
                         }
 
                         //  If the repo belongs to a person, show the owner.
-                        if  repo.owner.login != "apple"
+                        if  origin.owner != "apple"
                         {
                             $0[.dt] = "Owner"
-                            $0[.dd] = repo.owner
+                            $0[.dd] = origin.owner
                         }
                     }
                 }

Sources/UnidocQueries/Volumes/Unidoc.PrincipalOutput.swift

@@ -12,37 +12,37 @@ extension Unidoc
     struct PrincipalOutput:Equatable, Sendable
     {
         public
-        let matches:[Unidoc.Vertex]
+        let matches:[Vertex]
 
         public
-        let vertex:Unidoc.Vertex?
+        let vertex:Vertex?
         public
-        let vertexInLatest:Unidoc.Vertex?
+        let vertexInLatest:Vertex?
 
         public
-        let groups:[Unidoc.Group]
+        let groups:[Group]
 
         public
-        let volume:Unidoc.VolumeMetadata
+        let volume:VolumeMetadata
         public
-        let volumeOfLatest:Unidoc.VolumeMetadata?
+        let volumeOfLatest:VolumeMetadata?
 
         public
-        let repo:PackageMetadata.Repo?
+        let repo:PackageRepo?
 
         public
-        let tree:Unidoc.TypeTree?
+        let tree:TypeTree?
 
         @inlinable internal
         init(
-            matches:[Unidoc.Vertex],
-            vertex:Unidoc.Vertex?,
-            vertexInLatest:Unidoc.Vertex?,
-            groups:[Unidoc.Group],
-            volume:Unidoc.VolumeMetadata,
-            volumeOfLatest:Unidoc.VolumeMetadata?,
-            repo:PackageMetadata.Repo?,
-            tree:Unidoc.TypeTree?)
+            matches:[Vertex],
+            vertex:Vertex?,
+            vertexInLatest:Vertex?,
+            groups:[Group],
+            volume:VolumeMetadata,
+            volumeOfLatest:VolumeMetadata?,
+            repo:PackageRepo?,
+            tree:TypeTree?)
         {
             self.matches = matches