Update layout and style

Author: mattt

Package.resolved

@@ -10,7 +10,7 @@ let package = Package(
         .package(url: "https://github.com/SwiftDocOrg/SwiftSemantics.git", .branch("swift-5.2")),
         .package(url: "https://github.com/SwiftDocOrg/CommonMark.git", .branch("master")),
         .package(url: "https://github.com/SwiftDocOrg/SwiftMarkup.git", .upToNextMinor(from: "0.0.5")),
-        .package(url: "https://github.com/SwiftDocOrg/GraphViz.git", .revision("ce0327a62c4b5a5ddd4741406ea54f164f228a54")),
+        .package(url: "https://github.com/SwiftDocOrg/GraphViz.git", .revision("03405c13dc1c31f50c08bbec6e7587cbee1c7fb3")),
         .package(url: "https://github.com/NSHipster/HypertextLiteral.git", .upToNextMinor(from: "0.0.2")),
         .package(url: "https://github.com/SwiftDocOrg/Markup.git", .revision("bcc9bff98749f8ed92221375591a1afd61b02f1a")),
         .package(url: "https://github.com/NSHipster/SwiftSyntaxHighlighter.git", .revision("fe39b4ec07e1e37872adf4b506d223ab27cf8cea")),

Package.swift

@@ -17,8 +17,8 @@ public final class Interface: Codable {
         return Dictionary(grouping: symbols, by: { $0.id })
     }()
 
-    public lazy var symbolsGroupedByName: [String: [Symbol]] = {
-        return Dictionary(grouping: symbols, by: { $0.name })
+    public lazy var symbolsGroupedByQualifiedName: [String: [Symbol]] = {
+        return Dictionary(grouping: symbols, by: { $0.id.description })
     }()
 
     public private(set) lazy var topLevelSymbols: [Symbol] = {
@@ -101,10 +101,10 @@ public final class Interface: Codable {
                 inheritedTypeNames = Set(inheritedTypeNames.flatMap { $0.split(separator: "&").map { $0.trimmingCharacters(in: .whitespaces) } })
 
                 for name in inheritedTypeNames {
-                    let inheritedTypes = symbols.filter({ ($0.api is Class || $0.api is Protocol) && $0.id.matches(name) })
+                    let inheritedTypes = symbols.filter({ ($0.api is Class || $0.api is Protocol) && $0.id.description == name })
                     if inheritedTypes.isEmpty {
                         let inherited = Symbol(api: Unknown(name: name), context: [], declaration: nil, documentation: nil, sourceLocation: nil)
-                        relationships.insert(Relationship(subject: symbol, predicate: .inheritsFrom, object: inherited))
+                        relationships.insert(Relationship(subject: symbol, predicate: .conformsTo, object: inherited))
                     } else {
                         for inherited in inheritedTypes {
                             let predicate: Relationship.Predicate

Sources/SwiftDoc/Interface.swift

@@ -43,7 +43,7 @@ public final class Symbol {
             return true
         }
 
-        if let symbol = context.compactMap({ $0 as? Symbol }).first,
+        if let symbol = context.compactMap({ $0 as? Symbol }).last,
             symbol.api.modifiers.contains(where: { $0.name == "public" })
         {
             switch symbol.api {

Sources/SwiftDoc/Symbol.swift

@@ -8,23 +8,31 @@ extension Symbol {
     var node: Node {
         var node = Node(id.description)
         node.fontName = "Menlo"
+        node.shape = .box
+        node.style = .rounded
+
+        node.width = 3
+        node.height = 0.5
+        node.fixedSize = .shape
 
         if !(api is Unknown) {
             node.href = "/" + path(for: self)
         }
 
         switch api {
         case let `class` as Class:
-            node.shape = .ellipse
+            node.class = "class"
             if `class`.modifiers.contains(where: { $0.name == "final" }) {
                 node.strokeWidth = 2.0
             }
+        case is Enumeration:
+            node.class = "enumeration"
         case is Structure:
-            node.shape = .box
-            node.style = .rounded
+            node.class = "structure"
         case is Protocol:
-            node.shape = .ellipse
-            node.style = .dashed
+            node.class = "protocol"
+        case is Unknown:
+            node.class = "unknown"
         default:
             break
         }
@@ -42,6 +50,7 @@ extension Symbol {
 
         var symbolNode = self.node
         symbolNode.strokeWidth = 3.0
+        symbolNode.class = [symbolNode.class, "current"].compactMap { $0 }.joined(separator: " ")
 
         graph.append(symbolNode)
 
@@ -64,12 +73,8 @@ extension Relationship {
         let to = object.node
 
         var edge = Edge(from: from.id, to: to.id)
-        switch predicate {
-        case .conformsTo:
-            edge.style = .dashed
-        default:
-            break
-        }
+        edge.class = predicate.rawValue
+        edge.preferredEdgeLength = 1.5
 
         return edge
     }