Merge branch 'master' into improve-parallelMap

Author: kean

Changelog.md

@@ -18,6 +18,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   #62 by @victor-pavlychko.
 - Fixed rendering of type relationships section when no graph data is available.
   #62 by @victor-pavlychko.
+- Fixed rendering of protocol requirements in the HTML version.
+  #76 by @victor-pavlychko.
 
 
 ## [1.0.0-beta.2] - 2020-04-08

Sources/swift-doc/Supporting Types/Components/Relationships.swift

@@ -95,7 +95,7 @@ struct Relationships: Component {
         return #"""
         <section id="relationships">
             <h2 hidden>Relationships</h2>
-                \#(graphHTML.flatMap { graphHTML in
+                \#(graphHTML.flatMap { (graphHTML) -> HypertextLiteral.HTML in
                     return #"""
                     <figure>
                         \#(graphHTML)

Sources/swift-doc/Supporting Types/Components/Requirements.swift

@@ -13,13 +13,16 @@ struct Requirements: Component {
         self.module = module
     }
 
+    var sections: [(title: String, requirements: [Symbol])] {
+        return [
+            ("Requirements",  module.interface.requirements(of: symbol)),
+            ("Optional Requirements", module.interface.optionalRequirements(of: symbol))
+        ].filter { !$0.requirements.isEmpty }
+    }
+
     // MARK: - Component
 
     var fragment: Fragment {
-        let sections: [(title: String, requirements: [Symbol])] = [
-            ("Requirements",  module.interface.requirements(of: symbol)),
-            ("Optional Requirements", module.interface.optionalRequirements(of: symbol))
-        ].filter { !$0.requirements.isEmpty}
         guard !sections.isEmpty else { return Fragment { "" } }
 
         return Fragment {
@@ -37,7 +40,26 @@ struct Requirements: Component {
 
     var html: HypertextLiteral.HTML {
         return #"""
+        \#(sections.map { section -> HypertextLiteral.HTML in
+            #"""
+                <section id=\#(section.title.lowercased())>
+                    <h2>\#(section.title)</h2>
+
+                    \#(section.requirements.map { member -> HypertextLiteral.HTML in
+                        let descriptor = String(describing: type(of: symbol.api)).lowercased()
 
+                        return #"""
+                        <div role="article" class="\#(descriptor)" id=\#(member.id.description.lowercased().replacingOccurrences(of: " ", with: "-"))>
+                            <h3>
+                                <code>\#(softbreak(member.name))</code>
+                            </h3>
+                            \#(Documentation(for: member, in: module).html)
+                        </div>
+                        """#
+                    })
+                </section>
+            """#
+        })
         """#
     }
 }