updated staticHTML() implementations; added a unit test and...

- added custom rendering for some libraries due to result limitations

Author: RandomHashTags

Benchmarks/Benchmarks/Elementary/Elementary.swift

@@ -12,23 +12,34 @@ package struct ElementaryTests : HTMLGenerator {
     package init() {}
 
     package func staticHTML() -> String {
-        html { body { h1 { "Swift HTML Benchmarks" }} }.render()
+        StaticView().render()
     }
     package func dynamicHTML(_ context: HTMLContext) -> String {
         html {
             body {
                 h1 { context.heading }
-                div(attributes: [.id("desc")]) {
+                div(attributes: [.id(context.desc_id)]) {
                     p { context.string }
                 }
                 h2 { context.user.details_heading }
                 h3 { context.user.qualities_heading }
-                ul(attributes: [.id("user-qualities")]) {
+                ul(attributes: [.id(context.user.qualities_id)]) {
                     for quality in context.user.qualities {
                         li { quality }
                     }
                 }
             }
         }.render()
     }
+}
+
+struct StaticView : HTMLDocument {
+    var title:String = "StaticView"
+
+    var head : some HTML {
+        ""
+    }
+    var body : some HTML {
+        h1 { "Swift HTML Benchmarks" }
+    }
 }

Benchmarks/Benchmarks/Plot/Plot.swift

@@ -13,6 +13,9 @@ package struct PlotTests : HTMLGenerator {
 
     package func staticHTML() -> String {
         HTML(
+            .head(
+                .element(named: "title", text: "StaticView")
+            ),
             .body(
                 .h1("Swift HTML Benchmarks")
             )
@@ -42,9 +45,9 @@ struct Context {
 
     init(_ context: Utilities.HTMLContext) {
         heading = H1(context.heading)
-        desc = Div(Paragraph(context.string).id("desc"))
+        desc = Div(Paragraph(context.string).id(context.desc_id))
         details_heading = H2(context.user.details_heading)
         qualities_heading = H3(context.user.qualities_heading)
-        qualities = List(context.user.qualities).id("user-qualities")
+        qualities = List(context.user.qualities).id(context.user.qualities_id)
     }
 }

Benchmarks/Benchmarks/SwiftHTMLBB/SwiftHTMLBB.swift

@@ -17,6 +17,9 @@ package struct SwiftHTMLBBTests : HTMLGenerator {
     package func staticHTML() -> String {
         renderer.render(Document(.html) {
             Html {
+                Head {
+                    Title("StaticView")
+                }
                 Body {
                     H1("Swift HTML Benchmarks")
                 }
@@ -31,12 +34,12 @@ package struct SwiftHTMLBBTests : HTMLGenerator {
                     H1(context.heading)
                     Div {
                         P(context.string)
-                    }.id("desc")
+                    }.id(context.desc_id)
                     H2(context.user.details_heading)
                     H3(context.user.qualities_heading)
                     Ul {
                         context.user.qualities.map({ Li($0) })
-                    }.id("user-qualities")
+                    }.id(context.user.qualities_id)
                 }
             }
         })

Benchmarks/Benchmarks/SwiftHTMLKit/SwiftHTMLKit.swift

@@ -13,6 +13,9 @@ package struct SwiftHTMLKitTests : HTMLGenerator {
 
     package func staticHTML() -> String {
         #html([
+            #head([
+                #title(["StaticView"])
+            ]),
             #body([
                 #h1(["Swift HTML Benchmarks"])
             ])
@@ -23,12 +26,12 @@ package struct SwiftHTMLKitTests : HTMLGenerator {
         return #html([
             #body([
                 #h1(["\(context.heading)"]),
-                #div(attributes: [.id("desc")], [
+                #div(attributes: [.id(context.desc_id)], [
                     #p(["\(context.string)"])
                 ]),
                 #h2(["\(context.user.details_heading)"]),
                 #h3(["\(context.user.qualities_heading)"]),
-                #ul(attributes: [.id("user-qualities")], ["\(qualities)"])
+                #ul(attributes: [.id(context.user.qualities_id)], ["\(qualities)"])
             ])
         ])
     }

Benchmarks/Benchmarks/SwiftHTMLPF/SwiftHTMLPF.swift

@@ -12,7 +12,16 @@ package struct SwiftHTMLPFTests : HTMLGenerator {
     package init() {}
 
     package func staticHTML() -> String {
-        render(.document(.html(.body(.h1("Swift HTML Benchmarks")))))
+        render(
+            .document(
+                .html(
+                    .head(
+                        .title("StaticView")
+                    ),
+                    .body(.h1("Swift HTML Benchmarks"))
+                )
+            )
+        )
     }
 
     package func dynamicHTML(_ context: HTMLContext) -> String {
@@ -21,10 +30,10 @@ package struct SwiftHTMLPFTests : HTMLGenerator {
                 .html(
                     .body(
                         .h1(.raw(context.heading)),
-                        .div(attributes: [.id("desc")], .p(.raw(context.string))),
+                        .div(attributes: [.id(context.desc_id)], .p(.raw(context.string))),
                         .h2(.raw(context.user.details_heading)),
                         .h3(.raw(context.user.qualities_heading)),
-                        .ul(attributes: [.id("user-qualities")], .fragment(context.user.qualities.map({ quality in .li(.raw(quality)) })))
+                        .ul(attributes: [.id(context.user.qualities_id)], .fragment(context.user.qualities.map({ quality in .li(.raw(quality)) })))
                     )
                 )
             )

Benchmarks/Benchmarks/Swim/Swim.swift

@@ -9,10 +9,18 @@ import Utilities
 import Swim
 
 extension Node {
-    var rendered: String {
-        var result = ""
-        write(to: &result)
-        return result
+    var rendered : String {
+        switch self {
+        case .element(let name, let attributes, let child):
+            let attributes_string:String = attributes.isEmpty ? "" : " " + attributes.map({ $0 + "=\"" + $1 + "\"" }).joined(separator: " ")
+            return (name == "html" ? "<!DOCTYPE html>" : "") + "<" + name + attributes_string + ">" + (child?.rendered ?? "") + "</" + name + ">"
+        case .text(let string): return string
+        case .raw(let string): return string
+        case .comment(let _): return ""
+        case .documentType(let string): return string
+        case .fragment(let children): return children.map({ $0.rendered }).joined()
+        case .trim: return ""
+        }
     }
 }
 
@@ -21,6 +29,9 @@ package struct SwimTests : HTMLGenerator {
 
     package func staticHTML() -> String {
         html {
+            head {
+                title { "StaticView" }
+            }
             body {
                 h1 {
                     "Swift HTML Benchmarks"
@@ -32,12 +43,12 @@ package struct SwimTests : HTMLGenerator {
         html {
             body {
                 h1 { context.heading }
-                div(id: "desc") {
+                div(id: context.desc_id) {
                     p { context.string }
                 }
                 h2 { context.user.details_heading }
                 h3 { context.user.qualities_heading }
-                ul(id: "user-qualities") {
+                ul(id: context.user.qualities_id) {
                     context.user.qualities.map({ quality in li { quality} })
                 }
             }

Benchmarks/Benchmarks/UnitTests/UnitTests.swift

@@ -7,11 +7,44 @@
 
 import Testing
 import Utilities
+import SwiftHTMLKit
 
+import TestElementary
+import TestPlot
+import TestSwiftHTMLBB
+import TestSwiftHTMLKit
+import TestSwiftHTMLPF
+import TestSwim
+import TestToucan
+import TestVaporHTMLKit
 import TestVaux
 
 struct UnitTests {
-    @Test func vaux() {
-        #expect(VauxTests().staticHTML() != "")
+    let libraries:[String:HTMLGenerator] = [
+        "BinaryBirds" : SwiftHTMLBBTests(),
+        "Elementary" : ElementaryTests(),
+        "Plot" : PlotTests(),
+        "Pointfreeco" : SwiftHTMLPFTests(),
+        "SwiftHTMLKit" : SwiftHTMLKitTests(),
+        "Swim" : SwimTests(),
+        "VaporHTMLKit" : VaporHTMLKitTests(),
+        "Vaux" : VauxTests()
+    ]
+    @Test func staticHTML() {
+        let expected_value:String = #html([
+            #head([
+                #title(["StaticView"])
+            ]),
+            #body([
+                #h1(["Swift HTML Benchmarks"])
+            ])
+        ])
+        for (key, value) in libraries {
+            var string:String = value.staticHTML()
+            if key == "Swim" {
+                string = string.replacingOccurrences(of: "\n", with: "")
+            }
+            #expect(string == expected_value, Comment(rawValue: key))
+        }
     }
 }

Benchmarks/Benchmarks/Utilities/Utilities.swift

@@ -35,13 +35,14 @@ package actor Cache {
 
 // MARK: HTMLContext
 package struct HTMLContext {
-    package let heading:String
+    package let heading:String, desc_id:String
     package let string:String, integer:Int, double:Double, float:Float, boolean:Bool
     package let now:Date
     package let user:User
 
     package init() {
         heading = "Dynamic HTML Benchmark"
+        desc_id = "desc"
         // 1 paragraph of lorem ipsum
         string = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam tempor euismod arcu, sed elementum erat lobortis vel. Fusce nec orci purus. Maecenas a rutrum elit, in pellentesque nisl. Cras nec dapibus turpis. Donec finibus auctor arcu, vehicula maximus eros tincidunt et. Praesent nulla urna, imperdiet quis nunc id, auctor varius justo. Integer fringilla tincidunt lectus, et egestas massa molestie ut. Aliquam at augue pulvinar ante dignissim dignissim a at augue. Donec nisi elit, faucibus a ante a, interdum ultrices lacus. Fusce faucibus odio at est imperdiet, id sodales ipsum hendrerit. Nullam vehicula velit non metus malesuada ornare. Proin consequat id nulla sed porttitor."
         integer = 293785
@@ -55,7 +56,7 @@ package struct HTMLContext {
     }
 }
 package struct User {
-    package let details_heading:String, qualities_heading:String
+    package let details_heading:String, qualities_heading:String, qualities_id:String
 
     package let id:UInt64, email:String, username:String
     package let qualities:[String]
@@ -64,6 +65,7 @@ package struct User {
     init() {
         details_heading = "User Details"
         qualities_heading = "Qualities"
+        qualities_id = "user-qualities"
 
         id = 63821
         email = "[email protected]"

Benchmarks/Benchmarks/VaporHTMLKit/VaporHTMLKit.swift

@@ -13,22 +13,25 @@ package struct VaporHTMLKitTests : HTMLGenerator {
     let renderer:Renderer
     package init() {
         renderer = Renderer()
-        try! renderer.add(layout: SimpleView())
+        try! renderer.add(layout: StaticView())
         try! renderer.add(layout: DynamicView(context: Utilities.HTMLContext()))
     }
 
     package func staticHTML() -> String {
-        return try! renderer.render(layout: SimpleView.self)
+        return try! renderer.render(layout: StaticView.self)
     }
     package func dynamicHTML(_ context: Utilities.HTMLContext) -> String {
         return try! renderer.render(layout: DynamicView.self, with: context)
     }
 }
 
-struct SimpleView : View {
+struct StaticView : View {
     var body : AnyContent {
         Document(.html5)
         Html {
+            Head {
+                Title { "StaticView" }
+            }
             Body {
                 Heading1 { "Swift HTML Benchmarks" }
             }
@@ -46,12 +49,12 @@ struct DynamicView : View {
                 Heading1 { context.heading }
                 Div {
                     P { context.string }
-                }.id("desc")
+                }.id(context.desc_id)
                 Heading2 { context.user.details_heading }
                 Heading3 { context.user.qualities_heading }
                 Ul {
                     context.user.qualities.map({ quality in Li { quality } })
-                }.id("user-qualities")
+                }.id(context.user.qualities_id)
             }
         }
     }

Benchmarks/Benchmarks/Vaux/Vaux.swift

@@ -6,11 +6,36 @@
 //
 
 import Utilities
-import Vaux
+@testable import Vaux
 import Foundation
 
 extension HTML {
-    var rendered : String { String(describing: self) }
+    var render : String {
+        if let node:HTMLNode = self as? HTMLNode {
+            return node.rendered
+        } else if let node:MultiNode = self as? MultiNode {
+            return node.children.map({ $0.render }).joined()
+        } else {
+            return String(describing: self)
+        }
+    }
+}
+
+extension HTMLNode {
+    var rendered : String {
+        guard let tag:String = getTag() else { return String(describing: self) }
+        var string:String
+        if tag == "html" {
+            string = "<!DOCTYPE html>"
+        } else {
+            string = ""
+        }
+        string += "<" + tag + ">"
+        if let child = self.child {
+            string += child.render
+        }
+        return string + "</" + tag + ">" // Vaux doesn't take into account void elements
+    }
 }
 
 package struct VauxTests : HTMLGenerator {
@@ -22,12 +47,15 @@ package struct VauxTests : HTMLGenerator {
 
     package func staticHTML() -> String {
         html {
+            head {
+                title("StaticView")
+            }
             body {
                 heading(.h1) {
                     "Swift HTML Benchmarks"
                 }
             }
-        }.rendered
+        }.render
     }
 
     package func dynamicHTML(_ context: HTMLContext) -> String {
@@ -36,15 +64,15 @@ package struct VauxTests : HTMLGenerator {
                 heading(.h1) { context.heading }
                 div {
                     paragraph { context.string }
-                }.id("desc")
+                }.id(context.desc_id)
                 heading(.h2) { context.user.details_heading }
                 heading(.h3) { context.user.qualities_heading }
                 list {
                     forEach(context.user.qualities) {
                         listItem(label: $0)
                     }
-                }.id("user-qualities")
+                }.id(context.user.qualities_id)
             }
-        }.rendered
+        }.render
     }
 }