clean up temporary hacks, resolve #89

tayloraswift · tayloraswift · commit b290ea258191 · 2023-12-19T19:07:16.000-06:00
diff --git a/Sources/SwiftinitPages/Contexts/IdentifiablePageContext.swift b/Sources/SwiftinitPages/Contexts/IdentifiablePageContext.swift
@@ -169,7 +169,7 @@ extension IdentifiablePageContext where ID:VersionedPageIdentifier
             return .init(display: path?.description ?? "", target: $1)
         }
     }
-    func link(file:Unidoc.Scalar, line:Int? = nil) -> HTML.SourceLink?
+    func link(file:Unidoc.Scalar, line:Int? = nil) -> Swiftinit.SourceLink?
     {
         if  let origin:Unidoc.PackageMetadata.Repo.Origin = self.repo?.origin,
             let refname:String = self.volumes[file.zone]?.refname,
diff --git a/Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Docs (ext).swift b/Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Docs (ext).swift
@@ -18,7 +18,7 @@ extension Swiftinit.Docs:Swiftinit.VolumeRoot
         switch vertex
         {
         case .article(let vertex):
-            let sidebar:HTML.Sidebar<Self>? = .module(volume: context.page.volume,
+            let sidebar:Swiftinit.Sidebar<Self>? = .module(volume: context.page.volume,
                 tree: tree)
             let groups:GroupSections = .init(context.page,
                 organizing: consume groups,
@@ -33,7 +33,7 @@ extension Swiftinit.Docs:Swiftinit.VolumeRoot
             resource = page.resource(format: context.format)
 
         case .culture(let vertex):
-            let sidebar:HTML.Sidebar<Self>? = .module(volume: context.page.volume,
+            let sidebar:Swiftinit.Sidebar<Self>? = .module(volume: context.page.volume,
                 tree: tree)
             let groups:GroupSections = .init(context.page,
                 organizing: consume groups,
@@ -47,7 +47,7 @@ extension Swiftinit.Docs:Swiftinit.VolumeRoot
             resource = page.resource(format: context.format)
 
         case .decl(let vertex):
-            let sidebar:HTML.Sidebar<Self>? = .module(volume: context.page.volume,
+            let sidebar:Swiftinit.Sidebar<Self>? = .module(volume: context.page.volume,
                 tree: tree)
             let groups:GroupSections = .init(context.page,
                 organizing: consume groups,
diff --git a/Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Docs.Article.swift b/Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Docs.Article.swift
@@ -12,7 +12,7 @@ extension Swiftinit.Docs
         let context:IdentifiablePageContext<Unidoc.Scalar>
 
         let canonical:CanonicalVersion?
-        let sidebar:HTML.Sidebar<Swiftinit.Docs>?
+        let sidebar:Swiftinit.Sidebar<Swiftinit.Docs>?
 
         private
         let vertex:Unidoc.Vertex.Article
@@ -22,7 +22,7 @@ extension Swiftinit.Docs
 
         init(_ context:IdentifiablePageContext<Unidoc.Scalar>,
             canonical:CanonicalVersion?,
-            sidebar:HTML.Sidebar<Swiftinit.Docs>?,
+            sidebar:Swiftinit.Sidebar<Swiftinit.Docs>?,
             vertex:Unidoc.Vertex.Article,
             groups:GroupSections)
         {
diff --git a/Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Docs.Decl.swift b/Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Docs.Decl.swift
@@ -16,7 +16,7 @@ extension Swiftinit.Docs
         let context:IdentifiablePageContext<Unidoc.Scalar>
 
         let canonical:CanonicalVersion?
-        let sidebar:HTML.Sidebar<Swiftinit.Docs>?
+        let sidebar:Swiftinit.Sidebar<Swiftinit.Docs>?
 
         private
         let vertex:Unidoc.Vertex.Decl
@@ -28,7 +28,7 @@ extension Swiftinit.Docs
 
         init(_ context:IdentifiablePageContext<Unidoc.Scalar>,
             canonical:CanonicalVersion?,
-            sidebar:HTML.Sidebar<Swiftinit.Docs>?,
+            sidebar:Swiftinit.Sidebar<Swiftinit.Docs>?,
             vertex:Unidoc.Vertex.Decl,
             groups:GroupSections) throws
         {
diff --git a/Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Docs.Foreign.swift b/Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Docs.Foreign.swift
@@ -65,7 +65,7 @@ extension Swiftinit.Docs.Foreign:Swiftinit.ApplicationPage
 }
 extension Swiftinit.Docs.Foreign:Swiftinit.VersionedPage
 {
-    var sidebar:HTML.Sidebar<Swiftinit.Docs>? { .package(volume: self.context.volume) }
+    var sidebar:Swiftinit.Sidebar<Swiftinit.Docs>? { .package(volume: self.context.volume) }
 
     func main(_ main:inout HTML.ContentEncoder, format:Swiftinit.RenderFormat)
     {
@@ -94,7 +94,10 @@ extension Swiftinit.Docs.Foreign:Swiftinit.VersionedPage
                     $0[.code] { $0[link: extendee?.target] = self.stem.last }
                     $0 += ", \(self.demonym.phrase) from "
 
-                    $0[.a] { $0.href = "\(Swiftinit.Docs[other])" } = other.symbol.package == .swift
+                    $0[.a]
+                    {
+                        $0.href = "\(Swiftinit.Docs[other])"
+                    } = other.symbol.package == .swift
                         ? "the Swift standard library"
                         : other.title
 
diff --git a/Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Docs.Module.swift b/Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Docs.Module.swift
@@ -12,7 +12,7 @@ extension Swiftinit.Docs
         let context:IdentifiablePageContext<Unidoc.Scalar>
 
         let canonical:CanonicalVersion?
-        let sidebar:HTML.Sidebar<Swiftinit.Docs>?
+        let sidebar:Swiftinit.Sidebar<Swiftinit.Docs>?
 
         private
         let vertex:Unidoc.Vertex.Culture
@@ -21,7 +21,7 @@ extension Swiftinit.Docs
 
         init(_ context:IdentifiablePageContext<Unidoc.Scalar>,
             canonical:CanonicalVersion?,
-            sidebar:HTML.Sidebar<Swiftinit.Docs>?,
+            sidebar:Swiftinit.Sidebar<Swiftinit.Docs>?,
             vertex:Unidoc.Vertex.Culture,
             groups:GroupSections)
         {
diff --git a/Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Docs.NotFound.swift b/Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Docs.NotFound.swift
@@ -7,9 +7,10 @@ extension Swiftinit.Docs
     struct NotFound
     {
         let context:IdentifiablePageContext<Never?>
-        let sidebar:HTML.Sidebar<Swiftinit.Docs>?
+        let sidebar:Swiftinit.Sidebar<Swiftinit.Docs>?
 
-        init(_ context:IdentifiablePageContext<Never?>, sidebar:HTML.Sidebar<Swiftinit.Docs>?)
+        init(_ context:IdentifiablePageContext<Never?>,
+            sidebar:Swiftinit.Sidebar<Swiftinit.Docs>?)
         {
             self.context = context
             self.sidebar = sidebar
diff --git a/Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Docs.Package.swift b/Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Docs.Package.swift
@@ -69,7 +69,7 @@ extension Swiftinit.Docs.Package:Swiftinit.ApplicationPage
 }
 extension Swiftinit.Docs.Package:Swiftinit.VersionedPage
 {
-    var sidebar:HTML.Sidebar<Swiftinit.Docs>? { .package(volume: self.context.volume) }
+    var sidebar:Swiftinit.Sidebar<Swiftinit.Docs>? { .package(volume: self.context.volume) }
 
     func main(_ main:inout HTML.ContentEncoder, format:Swiftinit.RenderFormat)
     {
@@ -116,7 +116,7 @@ extension Swiftinit.Docs.Package:Swiftinit.VersionedPage
                 switch self.repo?.origin
                 {
                 case .github(let path)?:
-                    $0 += HTML.SourceLink.init(file: path.dropFirst(),
+                    $0 += Swiftinit.SourceLink.init(file: path.dropFirst(),
                         target: "https://github.com\(path)/tree/\(refname)")
 
                 case nil:
@@ -190,7 +190,8 @@ extension Swiftinit.Docs.Package:Swiftinit.VersionedPage
                     }
                     $0[.tbody]
                     {
-                        for dependency:Unidoc.VolumeMetadata.Dependency in self.volume.dependencies
+                        for dependency:Unidoc.VolumeMetadata.Dependency in
+                            self.volume.dependencies
                         {
                             $0[.tr]
                             {
diff --git a/Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Stats (ext).swift b/Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Stats (ext).swift
@@ -21,7 +21,7 @@ extension Swiftinit.Stats:Swiftinit.VolumeRoot
             throw Unidoc.VertexTypeError.article
 
         case .culture(let vertex):
-            let sidebar:HTML.Sidebar<Self>? = .package(volume: context.page.volume)
+            let sidebar:Swiftinit.Sidebar<Self>? = .package(volume: context.page.volume)
             let page:Module = .init(context.page,
                 canonical: context.canonical,
                 sidebar: sidebar,
@@ -38,7 +38,7 @@ extension Swiftinit.Stats:Swiftinit.VolumeRoot
             throw Unidoc.VertexTypeError.foreign
 
         case .global(let vertex):
-            let sidebar:HTML.Sidebar<Self>? = .package(volume: context.page.volume)
+            let sidebar:Swiftinit.Sidebar<Self>? = .package(volume: context.page.volume)
             let page:Package = .init(context.page,
                 canonical: context.canonical,
                 sidebar: sidebar,
diff --git a/Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Stats.Module.swift b/Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Stats.Module.swift
@@ -12,14 +12,14 @@ extension Swiftinit.Stats
         let context:IdentifiablePageContext<Unidoc.Scalar>
 
         let canonical:CanonicalVersion?
-        let sidebar:HTML.Sidebar<Swiftinit.Stats>?
+        let sidebar:Swiftinit.Sidebar<Swiftinit.Stats>?
 
         private
         let vertex:Unidoc.Vertex.Culture
 
         init(_ context:IdentifiablePageContext<Unidoc.Scalar>,
             canonical:CanonicalVersion?,
-            sidebar:HTML.Sidebar<Swiftinit.Stats>?,
+            sidebar:Swiftinit.Sidebar<Swiftinit.Stats>?,
             vertex:Unidoc.Vertex.Culture)
         {
             self.context = context
diff --git a/Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Stats.Package.swift b/Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Stats.Package.swift
@@ -12,14 +12,14 @@ extension Swiftinit.Stats
         let context:IdentifiablePageContext<Unidoc.Scalar>
 
         let canonical:CanonicalVersion?
-        let sidebar:HTML.Sidebar<Swiftinit.Stats>?
+        let sidebar:Swiftinit.Sidebar<Swiftinit.Stats>?
 
         private
         let vertex:Unidoc.Vertex.Global
 
         init(_ context:IdentifiablePageContext<Unidoc.Scalar>,
             canonical:CanonicalVersion?,
-            sidebar:HTML.Sidebar<Swiftinit.Stats>?,
+            sidebar:Swiftinit.Sidebar<Swiftinit.Stats>?,
             vertex:Unidoc.Vertex.Global)
         {
             self.context = context
diff --git a/Sources/SwiftinitPages/UI/Swiftinit.Sidebar.swift b/Sources/SwiftinitPages/UI/Swiftinit.Sidebar.swift
@@ -3,10 +3,10 @@ import UnidocQueries
 import UnidocRecords
 import URI
 
-extension HTML
+extension Swiftinit
 {
     @frozen public
-    struct Sidebar<Root> where Root:Swiftinit.VolumeRoot
+    struct Sidebar<Root> where Root:VolumeRoot
     {
         private
         let volume:Unidoc.VolumeMetadata
@@ -21,7 +21,7 @@ extension HTML
         }
     }
 }
-extension HTML.Sidebar
+extension Swiftinit.Sidebar
 {
     static
     func package(volume:Unidoc.VolumeMetadata) -> Self
@@ -42,7 +42,7 @@ extension HTML.Sidebar
         return .init(volume: volume, nouns: nouns)
     }
 }
-extension HTML.Sidebar:HyperTextOutputStreamable
+extension Swiftinit.Sidebar:HyperTextOutputStreamable
 {
     public static
     func += (html:inout HTML.ContentEncoder, self:Self)
@@ -84,28 +84,18 @@ extension HTML.Sidebar:HyperTextOutputStreamable
                     $0[.a] { $0.href = "\(uri)" ; $0.class = "text" } = text
 
                 case .stem(let citizenship):
-                    //  The URI is only valid if the principal volume API version is at
-                    //  least 1.0!
-                    if  case .foreign = citizenship,
-                        self.volume.abi < .v(1, 0)
+                    $0[.a]
                     {
-                        $0[.span] = name
-                    }
-                    else
-                    {
-                        $0[.a]
-                        {
-                            $0.href = "\(uri)"
+                        $0.href = "\(uri)"
 
-                            switch citizenship
-                            {
-                            case .culture:  break
-                            case .package:  $0.class = "extension local"
-                            case .foreign:  $0.class = "extension foreign"
-                            }
+                        switch citizenship
+                        {
+                        case .culture:  break
+                        case .package:  $0.class = "extension local"
+                        case .foreign:  $0.class = "extension foreign"
+                        }
 
-                        } = name
-                    }
+                    } = name
                 }
             }
             for _:Int in 1 ..< depth
diff --git a/Sources/SwiftinitPages/UI/Swiftinit.SourceLink.swift b/Sources/SwiftinitPages/UI/Swiftinit.SourceLink.swift
@@ -1,6 +1,6 @@
 import HTML
 
-extension HTML
+extension Swiftinit
 {
     struct SourceLink:Equatable, Sendable
     {
@@ -16,7 +16,7 @@ extension HTML
         }
     }
 }
-extension HTML.SourceLink:HyperTextOutputStreamable
+extension Swiftinit.SourceLink:HyperTextOutputStreamable
 {
     static
     func += (html:inout HTML.ContentEncoder, self:Self)
diff --git a/Sources/UnidocDB/UnidocDatabase.swift b/Sources/UnidocDB/UnidocDatabase.swift
@@ -320,17 +320,6 @@ extension UnidocDatabase
 
         var snapshot:Unidoc.Snapshot = stored
 
-        //  Single-use migration: we need to scale the ABI version numbers by one component.
-        //  No way to do this in an aggregation or an update, it turns it into a double!
-        if  snapshot.metadata.abi.components.major > 0
-        {
-            snapshot.metadata.abi = .v(
-                0,
-                UInt16.init(snapshot.metadata.abi.components.major),
-                snapshot.metadata.abi.components.minor)
-        }
-        //  END hack.
-
         let volume:Unidoc.Volume = try await self.link(&snapshot,
             realm: package.realm,
             with: session)

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ extension IdentifiablePageContext where ID:VersionedPageIdentifier`
`169`	`169`	`return .init(display: path?.description ?? "", target: $1)`
`170`	`170`	`}`
`171`	`171`	`}`
`172`		`- func link(file:Unidoc.Scalar, line:Int? = nil) -> HTML.SourceLink?`
	`172`	`+ func link(file:Unidoc.Scalar, line:Int? = nil) -> Swiftinit.SourceLink?`
`173`	`173`	`{`
`174`	`174`	`if let origin:Unidoc.PackageMetadata.Repo.Origin = self.repo?.origin,`
`175`	`175`	`let refname:String = self.volumes[file.zone]?.refname,`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ extension Swiftinit.Docs.Foreign:Swiftinit.ApplicationPage`
`65`	`65`	`}`
`66`	`66`	`extension Swiftinit.Docs.Foreign:Swiftinit.VersionedPage`
`67`	`67`	`{`
`68`		`- var sidebar:HTML.Sidebar<Swiftinit.Docs>? { .package(volume: self.context.volume) }`
	`68`	`+ var sidebar:Swiftinit.Sidebar<Swiftinit.Docs>? { .package(volume: self.context.volume) }`
`69`	`69`
`70`	`70`	`func main(_ main:inout HTML.ContentEncoder, format:Swiftinit.RenderFormat)`
`71`	`71`	`{`
`@@ -94,7 +94,10 @@ extension Swiftinit.Docs.Foreign:Swiftinit.VersionedPage`
`94`	`94`	`$0[.code] { $0[link: extendee?.target] = self.stem.last }`
`95`	`95`	`$0 += ", \(self.demonym.phrase) from "`
`96`	`96`
`97`		`- $0[.a] { $0.href = "\(Swiftinit.Docs[other])" } = other.symbol.package == .swift`
	`97`	`+ $0[.a]`
	`98`	`+ {`
	`99`	`+ $0.href = "\(Swiftinit.Docs[other])"`
	`100`	`+ } = other.symbol.package == .swift`
`98`	`101`	`? "the Swift standard library"`
`99`	`102`	`: other.title`
`100`	`103`
Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,10 @@ extension Swiftinit.Docs`
`7`	`7`	`struct NotFound`
`8`	`8`	`{`
`9`	`9`	`let context:IdentifiablePageContext<Never?>`
`10`		`- let sidebar:HTML.Sidebar<Swiftinit.Docs>?`
	`10`	`+ let sidebar:Swiftinit.Sidebar<Swiftinit.Docs>?`
`11`	`11`
`12`		`- init(_ context:IdentifiablePageContext<Never?>, sidebar:HTML.Sidebar<Swiftinit.Docs>?)`
	`12`	`+ init(_ context:IdentifiablePageContext<Never?>,`
	`13`	`+ sidebar:Swiftinit.Sidebar<Swiftinit.Docs>?)`
`13`	`14`	`{`
`14`	`15`	`self.context = context`
`15`	`16`	`self.sidebar = sidebar`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ extension Swiftinit.Docs.Package:Swiftinit.ApplicationPage`
`69`	`69`	`}`
`70`	`70`	`extension Swiftinit.Docs.Package:Swiftinit.VersionedPage`
`71`	`71`	`{`
`72`		`- var sidebar:HTML.Sidebar<Swiftinit.Docs>? { .package(volume: self.context.volume) }`
	`72`	`+ var sidebar:Swiftinit.Sidebar<Swiftinit.Docs>? { .package(volume: self.context.volume) }`
`73`	`73`
`74`	`74`	`func main(_ main:inout HTML.ContentEncoder, format:Swiftinit.RenderFormat)`
`75`	`75`	`{`
`@@ -116,7 +116,7 @@ extension Swiftinit.Docs.Package:Swiftinit.VersionedPage`
`116`	`116`	`switch self.repo?.origin`
`117`	`117`	`{`
`118`	`118`	`case .github(let path)?:`
`119`		`- $0 += HTML.SourceLink.init(file: path.dropFirst(),`
	`119`	`+ $0 += Swiftinit.SourceLink.init(file: path.dropFirst(),`
`120`	`120`	`target: "https://github.com\(path)/tree/\(refname)")`
`121`	`121`
`122`	`122`	`case nil:`
`@@ -190,7 +190,8 @@ extension Swiftinit.Docs.Package:Swiftinit.VersionedPage`
`190`	`190`	`}`
`191`	`191`	`$0[.tbody]`
`192`	`192`	`{`
`193`		`- for dependency:Unidoc.VolumeMetadata.Dependency in self.volume.dependencies`
	`193`	`+ for dependency:Unidoc.VolumeMetadata.Dependency in`
	`194`	`+ self.volume.dependencies`
`194`	`195`	`{`
`195`	`196`	`$0[.tr]`
`196`	`197`	`{`