separate Unidoc.Group.ID more cleanly from Unidoc.Scalar

Author: tayloraswift

Sources/SwiftinitPages/Sections/GroupSections.swift

@@ -116,7 +116,7 @@ extension GroupSections
             case .polygon(let group):
                 guard
                 let first:Unidoc.Scalar = group.members.first,
-                let plane:SymbolGraph.Plane = .of(first.citizen)
+                let plane:SymbolGraph.Plane = first.plane
                 else
                 {
                     continue

Sources/SymbolGraphs/Grouping/SymbolGraph.AutogroupPlane.swift

@@ -13,8 +13,11 @@ extension SymbolGraph
         //
         //  These were once used alongside the vertex planes, but we don’t mix them anymore
         //  and arguably they shouldn’t be in the same enum at all.
+        @available(*, unavailable)
         case  autogroup     = 0xC0_000000
+        @available(*, unavailable)
         case `extension`    = 0xC2_000000
+        @available(*, unavailable)
         case  topic         = 0xC3_000000
 
         //  Used to identify vertices generated by the linker; never appear in a symbol graph.

Sources/SymbolGraphs/Grouping/SymbolGraph.ExtensionPlane.swift

@@ -22,16 +22,11 @@ extension Unidoc.Linker
         private
         var trees:[Unidoc.Scalar: TreeMembers]
 
-        private
-        var next:Unidoc.Counter<SymbolGraph.ForeignPlane>
-
         init(zone:Unidoc.Edition)
         {
             self.foreign = [:]
             self.local = [:]
             self.trees = [:]
-
-            self.next = .init(zone: zone)
         }
     }
 }
@@ -68,7 +63,8 @@ extension Unidoc.Linker.TreeMapper
 {
     mutating
     func register(foreign:Unidoc.Scalar,
-        with context:borrowing Unidoc.Linker) -> Unidoc.ForeignVertex
+        with context:borrowing Unidoc.Linker,
+        as index:Int) -> Unidoc.ForeignVertex
     {
         guard
         let snapshot:Unidoc.Linker.Graph = context[foreign.package]
@@ -92,7 +88,7 @@ extension Unidoc.Linker.TreeMapper
         /// Our policy for hashing out-of-package types is to hash if the type uses a
         /// hash suffix in its home package, even if the type would not require any
         /// disambiguation in this package.
-        let vertex:Unidoc.ForeignVertex = .init(id: self.next.id(),
+        let vertex:Unidoc.ForeignVertex = .init(id: context.current.id + index * .foreign,
             extendee: foreign,
             scope: snapshot.scope(of: node).map { context.expand($0) } ?? [],
             flags: .init(

Sources/SymbolGraphs/Grouping/SymbolGraph.TopicPlane.swift

@@ -0,0 +1,22 @@
+extension Unidoc.Linker.Tables
+{
+    struct Counter
+    {
+        private
+        var index:Int
+
+        init()
+        {
+            self.index = 0
+        }
+    }
+}
+extension Unidoc.Linker.Tables.Counter
+{
+    mutating
+    func callAsFunction() -> Int
+    {
+        defer { self.index += 1 }
+        return  self.index
+    }
+}

Sources/SymbolGraphs/Planes/SymbolGraph.Plane.swift

@@ -0,0 +1,35 @@
+import UnidocRecords
+
+extension Unidoc.Linker.Tables
+{
+    struct Next
+    {
+        private
+        var polygons:Counter
+        private
+        var topics:Counter
+        private
+        let base:Unidoc.Edition
+
+        init(base:Unidoc.Edition)
+        {
+            self.polygons = .init()
+            self.topics = .init()
+            self.base = base
+        }
+    }
+}
+extension Unidoc.Linker.Tables.Next
+{
+    mutating
+    func polygon() -> Unidoc.Group.ID
+    {
+        self.base[group: self.polygons() * .polygon]
+    }
+
+    mutating
+    func topic() -> Unidoc.Group.ID
+    {
+        self.base[group: self.topics() * .topic]
+    }
+}

Sources/UnidocLinker/Curation/Unidoc.Counter.swift

@@ -35,11 +35,7 @@ extension Unidoc.Linker
         var groupContainingMember:[Int32: Unidoc.Group.ID]
 
         private
-        var next:
-        (
-            polygon:Unidoc.Counter<SymbolGraph.AutogroupPlane>,
-            topic:Unidoc.Counter<SymbolGraph.TopicPlane>
-        )
+        var next:Next
 
         private(set)
         var extensions:Extensions
@@ -63,8 +59,7 @@ extension Unidoc.Linker
             self.extensionContainingNested = extensions.byNested()
             self.groupContainingMember = [:]
 
-            self.next.polygon = .init(zone: self.context.current.id)
-            self.next.topic = .init(zone: self.context.current.id)
+            self.next = .init(base: self.context.current.id)
 
             self.extensions = extensions
             self.articles = []
@@ -144,7 +139,7 @@ extension Unidoc.Linker.Tables
     mutating
     func linkProducts() -> [Unidoc.ProductVertex]
     {
-        var productPolygon:Unidoc.Group.Polygon = .init(id: self.next.polygon.id(),
+        var productPolygon:Unidoc.Group.Polygon = .init(id: self.next.polygon(),
             scope: self.current.id.global)
 
         var products:[Unidoc.ProductVertex] = []
@@ -188,7 +183,7 @@ extension Unidoc.Linker.Tables
 
         //  Create a synthetic topic containing all the cultures. This will become a “See Also”
         //  for their module pages, unless they belong to a custom topic group.
-        let culturePolygon:Unidoc.Group.Polygon = .init(id: self.next.polygon.id(),
+        let culturePolygon:Unidoc.Group.Polygon = .init(id: self.next.polygon(),
             scope: self.current.id.global,
             members: self.current.cultures.indices.sorted
             {
@@ -335,8 +330,8 @@ extension Unidoc.Linker.Tables
                     continue
                 }
 
-                //  Create top-level autogroup.
-                self.groups.polygons.append(.init(id: self.next.polygon.id(),
+                //  Create top-level polygon.
+                self.groups.polygons.append(.init(id: self.next.polygon(),
                     scope: namespace.culture,
                     members: self.context.sort(lexically: consume miscellaneous)))
             }
@@ -363,7 +358,7 @@ extension Unidoc.Linker.Tables
     {
         for topic:SymbolGraph.Topic in topics
         {
-            var record:Unidoc.Group.Topic = .init(id: self.next.topic.id(),
+            var record:Unidoc.Group.Topic = .init(id: self.next.topic(),
                 culture: namespace.culture,
                 scope: owner)