Skip to content

Commit b2124d4

Browse files
committed
factor Unidoc.Vertex and child types into protocols
1 parent 9d206a8 commit b2124d4

File tree

50 files changed

+320
-266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+320
-266
lines changed

Sources/SwiftinitPages/CanonicalVersion.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ extension CanonicalVersion
5757

5858
let target:Target
5959

60-
if let vertex:Unidoc.Vertex = principal.vertexInLatest
60+
if let vertex:Unidoc.AnyVertex = principal.vertexInLatest
6161
{
6262
switch vertex
6363
{

Sources/SwiftinitPages/Contexts/IdentifiablePageContext.Cache.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ extension IdentifiablePageContext.Cache where ID:Swiftinit.VertexPageIdentifier
4848
}
4949
extension IdentifiablePageContext.Cache where ID:Swiftinit.VertexPageIdentifier
5050
{
51-
subscript(culture scalar:Unidoc.Scalar) -> (vertex:Unidoc.Vertex.Culture, url:String?)?
51+
subscript(culture scalar:Unidoc.Scalar) -> (vertex:Unidoc.CultureVertex, url:String?)?
5252
{
5353
mutating get
5454
{
@@ -63,7 +63,7 @@ extension IdentifiablePageContext.Cache where ID:Swiftinit.VertexPageIdentifier
6363
}
6464
}
6565

66-
subscript(article scalar:Unidoc.Scalar) -> (vertex:Unidoc.Vertex.Article, url:String?)?
66+
subscript(article scalar:Unidoc.Scalar) -> (vertex:Unidoc.ArticleVertex, url:String?)?
6767
{
6868
mutating get
6969
{
@@ -78,7 +78,7 @@ extension IdentifiablePageContext.Cache where ID:Swiftinit.VertexPageIdentifier
7878
}
7979
}
8080

81-
subscript(decl scalar:Unidoc.Scalar) -> (vertex:Unidoc.Vertex.Decl, url:String?)?
81+
subscript(decl scalar:Unidoc.Scalar) -> (vertex:Unidoc.DeclVertex, url:String?)?
8282
{
8383
mutating get
8484
{
@@ -94,13 +94,13 @@ extension IdentifiablePageContext.Cache where ID:Swiftinit.VertexPageIdentifier
9494
}
9595

9696
/// Returns the URL for the given scalar, as long as it does not point to a file.
97-
subscript(scalar:Unidoc.Scalar) -> (vertex:Unidoc.Vertex, url:String?)?
97+
subscript(scalar:Unidoc.Scalar) -> (vertex:Unidoc.AnyVertex, url:String?)?
9898
{
9999
mutating get
100100
{
101101
self.vertices[scalar].map
102102
{
103-
(vertex:Unidoc.Vertex) in
103+
(vertex:Unidoc.AnyVertex) in
104104

105105
let url:String? = self.load(scalar)
106106
{

Sources/SwiftinitPages/Contexts/IdentifiablePageContext.Vertices.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ extension IdentifiablePageContext
77
{
88
let principal:ID
99
private(set)
10-
var secondary:[Unidoc.Scalar: Unidoc.Vertex]
10+
var secondary:[Unidoc.Scalar: Unidoc.AnyVertex]
1111

1212
init(
1313
principal:ID,
14-
secondary:[Unidoc.Scalar: Unidoc.Vertex] = [:])
14+
secondary:[Unidoc.Scalar: Unidoc.AnyVertex] = [:])
1515
{
1616
self.principal = principal
1717
self.secondary = secondary
@@ -21,15 +21,15 @@ extension IdentifiablePageContext
2121
extension IdentifiablePageContext.Vertices where ID:Swiftinit.VertexPageIdentifier
2222
{
2323
mutating
24-
func add(_ masters:[Unidoc.Vertex])
24+
func add(_ masters:[Unidoc.AnyVertex])
2525
{
26-
for master:Unidoc.Vertex in masters where self.principal != master.id
26+
for master:Unidoc.AnyVertex in masters where self.principal != master.id
2727
{
2828
self.secondary[master.id] = master
2929
}
3030
}
3131

32-
subscript(_ scalar:Unidoc.Scalar) -> Unidoc.Vertex?
32+
subscript(_ scalar:Unidoc.Scalar) -> Unidoc.AnyVertex?
3333
{
3434
self.principal != scalar ? self.secondary[scalar] : nil
3535
}

Sources/SwiftinitPages/Contexts/IdentifiablePageContext.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ extension IdentifiablePageContext where ID:Swiftinit.VertexPageIdentifier
168168
guard
169169
let refname:String = self.volumes[file.edition]?.refname,
170170
let origin:Unidoc.PackageRepo.AnyOrigin = self.repo?.origin,
171-
let file:Unidoc.Vertex.File = self.vertices[file]?.file
171+
let file:Unidoc.FileVertex = self.vertices[file]?.file
172172
else
173173
{
174174
return nil

Sources/SwiftinitPages/Sections/GroupList.Card.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ extension GroupList
77
{
88
let overview:ProseSection?
99

10-
let vertex:Unidoc.Vertex
10+
let vertex:Unidoc.AnyVertex
1111
let target:String?
1212

13-
init(overview:ProseSection?, vertex:Unidoc.Vertex, target:String?)
13+
init(overview:ProseSection?, vertex:Unidoc.AnyVertex, target:String?)
1414
{
1515
self.overview = overview
1616
self.vertex = vertex

Sources/SwiftinitPages/Sections/GroupSections.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ extension GroupSections
5757
{
5858
init(_ context:IdentifiablePageContext<Unidoc.Scalar>,
5959
organizing groups:/*consuming*/ [Unidoc.Group],
60-
vertex:borrowing Unidoc.Vertex.Decl? = nil,
60+
vertex:borrowing Unidoc.DeclVertex? = nil,
6161
bias:Unidoc.Scalar? = nil,
6262
mode:Mode? = nil)
6363
{
6464
let container:Unidoc.Group.ID?
6565
let generics:Generics
66-
if let vertex:Unidoc.Vertex.Decl = copy vertex
66+
if let vertex:Unidoc.DeclVertex = copy vertex
6767
{
6868
self.init(consume context,
6969
requirements: vertex.requirements.isEmpty ? nil : vertex.requirements,

Sources/SwiftinitPages/Surfaces/Swiftinit.VertexEndpoint.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ protocol _SwiftinitVertexEndpoint:Mongo.SingleOutputEndpoint
2121
{
2222
static
2323
func response(
24-
vertex:consuming Unidoc.Vertex,
24+
vertex:consuming Unidoc.AnyVertex,
2525
groups:consuming [Unidoc.Group],
2626
tree:consuming Unidoc.TypeTree?,
2727
with context:IdentifiableResponseContext) throws -> HTTP.ServerResponse
@@ -43,7 +43,7 @@ extension Swiftinit.VertexEndpoint where Self:HTTP.ServerEndpoint
4343
}
4444

4545
guard
46-
let vertex:Unidoc.Vertex = principal.vertex
46+
let vertex:Unidoc.AnyVertex = principal.vertex
4747
else
4848
{
4949
let context:IdentifiablePageContext<Never?> = .init(

Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.Blog.Article.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ extension Swiftinit.Blog
1212
let context:IdentifiablePageContext<Unidoc.Scalar>
1313

1414
private
15-
let vertex:Unidoc.Vertex.Article
15+
let vertex:Unidoc.ArticleVertex
1616

17-
init(_ context:IdentifiablePageContext<Unidoc.Scalar>, vertex:Unidoc.Vertex.Article)
17+
init(_ context:IdentifiablePageContext<Unidoc.Scalar>, vertex:Unidoc.ArticleVertex)
1818
{
1919
self.context = context
2020
self.vertex = vertex

Sources/SwiftinitPages/Surfaces/Vertices/Swiftinit.BlogEndpoint.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ extension Swiftinit.BlogEndpoint:Swiftinit.VertexEndpoint, HTTP.ServerEndpoint
2727
{
2828
public static
2929
func response(
30-
vertex:consuming Unidoc.Vertex,
30+
vertex:consuming Unidoc.AnyVertex,
3131
groups:consuming [Unidoc.Group],
3232
tree:consuming Unidoc.TypeTree?,
3333
with context:IdentifiableResponseContext) throws -> HTTP.ServerResponse

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ extension Swiftinit.Docs
1515
let sidebar:Swiftinit.Sidebar<Swiftinit.Docs>?
1616

1717
private
18-
let vertex:Unidoc.Vertex.Article
18+
let vertex:Unidoc.ArticleVertex
1919
private
2020
let groups:GroupSections
2121

2222

2323
init(_ context:IdentifiablePageContext<Unidoc.Scalar>,
2424
canonical:CanonicalVersion?,
2525
sidebar:Swiftinit.Sidebar<Swiftinit.Docs>?,
26-
vertex:Unidoc.Vertex.Article,
26+
vertex:Unidoc.ArticleVertex,
2727
groups:GroupSections)
2828
{
2929
self.context = context

0 commit comments

Comments
 (0)