added 2 more benchmarked projects; updated benchmark pngs

Author: RandomHashTags

.gitignore

@@ -7,11 +7,18 @@ DerivedData
 .netrc
 .vscode
 Package.resolved
-__BenchmarkBoilerplate.d
-__BenchmarkBoilerplate.o
-__BenchmarkBoilerplate.swiftdeps
-__BenchmarkBoilerplate.swiftdeps~
-Tag.d
-Tag.o
-Tag.swiftdeps
-Tags.d
+__BenchmarkBoilerplate.*
+Aria.*
+Attributes.*
+ChildOf.*
+DebugRender.*
+DebugXmlRender.*
+Elements.*
+Events.*
+Html4.*
+HtmlRender.*
+MediaType.*
+Node.*
+Tag.*
+Tags.*
+XmlRender.*

Benchmarks/Benchmarks/Benchmarks/Benchmarks.swift

@@ -10,6 +10,7 @@ import Utilities
 
 import TestElementary
 import TestPlot
+import TestSwiftHTMLBB
 import TestSwiftHTMLKit
 import TestSwiftHTMLPF
 import TestSwim
@@ -21,28 +22,29 @@ let benchmarks = {
     Benchmark.defaultConfiguration = .init(metrics: .all)
 
     let libraries:[String:HTMLGenerator] = [
+        "BinaryBirds" : SwiftHTMLBBTests(),
         "Elementary" : ElementaryTests(),
         "Plot" : PlotTests(),
+        "Pointfreeco" : SwiftHTMLPFTests(),
         "SwiftHTMLKit" : SwiftHTMLKitTests(),
-        "SwiftHTMLPF" : SwiftHTMLPFTests(),
-        //"Swim" : SwimTests(),
+        "Swim" : SwimTests(),
         "VaporHTMLKit" : VaporHTMLKitTests()
     ]
 
-    for (key, value) in libraries {
-        Benchmark(key + " static") {
+    /*for (key, value) in libraries {
+        Benchmark(key) {
             for _ in $0.scaledIterations {
                 blackHole(value.staticHTML())
             }
         }
-    }
+    }*/
 
-    /*let context:HTMLContext = HTMLContext()
+    let context:HTMLContext = HTMLContext()
     for (key, value) in libraries {
-        Benchmark(key + " dynamic") {
+        Benchmark(key) {
             for _ in $0.scaledIterations {
                 blackHole(value.dynamicHTML(context))
             }
         }
-    }*/
+    }
 }

Benchmarks/Benchmarks/SwiftHTMLBB/SwiftHTMLBB.swift

@@ -6,6 +6,39 @@
 //
 
 import Utilities
+import SwiftHtml
 
-package struct SwiftHTMLBBTests {
+package struct SwiftHTMLBBTests : HTMLGenerator {
+    let renderer:DocumentRenderer
+    package init() {
+        renderer = DocumentRenderer(minify: true, indent: 0)
+    }
+
+    package func staticHTML() -> String {
+        renderer.render(Document(.html) {
+            Html {
+                Body {
+                    H1("Swift HTML Benchmarks")
+                }
+            }
+        })
+    }
+
+    package func dynamicHTML(_ context: HTMLContext) -> String {
+        renderer.render(Document(.html) {
+            Html {
+                Body {
+                    H1(context.heading)
+                    Div {
+                        P(context.string)
+                    }.id("desc")
+                    H2(context.user.details_heading)
+                    H3(context.user.qualities_heading)
+                    Ul {
+                        context.user.qualities.map({ Li($0) })
+                    }.id("user-qualities")
+                }
+            }
+        })
+    }
 }

Benchmarks/Benchmarks/Swim/Swim.swift

@@ -5,10 +5,16 @@
 //  Created by Evan Anderson on 10/6/24.
 //
 
-/*
 import Utilities
 import Swim
-import HTML
+
+extension Node {
+    var rendered: String {
+        var result = ""
+        write(to: &result)
+        return result
+    }
+}
 
 package struct SwimTests : HTMLGenerator {
     package init() {}
@@ -20,6 +26,21 @@ package struct SwimTests : HTMLGenerator {
                     "Swift HTML Benchmarks"
                 }
             }
-        }
+        }.rendered
+    }
+    package func dynamicHTML(_ context: HTMLContext) -> String {
+        html {
+            body {
+                h1 { context.heading }
+                div(id: "desc") {
+                    p { context.string }
+                }
+                h2 { context.user.details_heading }
+                h3 { context.user.qualities_heading }
+                ul(id: "user-qualities") {
+                    context.user.qualities.map({ quality in li { quality} })
+                }
+            }
+        }.rendered
     }
-}*/
+}

Benchmarks/Package.swift

@@ -14,10 +14,10 @@ let package = Package(
         .package(url: "https://github.com/sliemeobn/elementary", from: "0.3.4"),
         .package(url: "https://github.com/vapor-community/HTMLKit", from: "2.8.1"),
         .package(url: "https://github.com/pointfreeco/swift-html", from: "0.4.1"),
-        //.package(name: "BBHTML", url: "https://github.com/BinaryBirds/swift-html", from: "1.7.0") // conflicting package name
+        .package(url: "https://github.com/RandomHashTags/fork-bb-swift-html", branch: "main"),
         .package(url: "https://github.com/JohnSundell/Plot", from: "0.14.0"),
         //.package(url: "https://github.com/toucansites/toucan", from: "1.0.0-alpha.1"), // unstable
-        //.package(url: "https://github.com/robb/Swim", from: "0.4.0"), // compile problem
+        .package(url: "https://github.com/RandomHashTags/fork-Swim", branch: "main"),
         .package(url: "https://github.com/dokun1/Vaux", from: "0.2.0"), // result limitation
         .package(url: "https://github.com/vapor/leaf", from: "4.4.0"),
     ],
@@ -54,7 +54,7 @@ let package = Package(
             name: "TestSwiftHTMLBB",
             dependencies: [
                 "Utilities",
-                //.product(name: "SwiftHtml", package: "BBHTML")
+                .product(name: "SwiftHtml", package: "fork-bb-swift-html")
             ],
             path: "Benchmarks/SwiftHTMLBB"
         ),
@@ -71,16 +71,15 @@ let package = Package(
             name: "TestSwiftHTMLPF",
             dependencies: [
                 "Utilities",
-                .product(name: "Html", package: "swift-html"),
+                .product(name: "Html", package: "swift-html")
             ],
             path: "Benchmarks/SwiftHTMLPF"
         ),
         .target(
             name: "TestSwim",
             dependencies: [
                 "Utilities",
-                /*.product(name: "Swim", package: "Swim"),
-                .product(name: "HTML", package: "Swim")*/
+                .product(name: "Swim", package: "fork-Swim")
             ],
             path: "Benchmarks/Swim"
         ),

Benchmarks/img/throughput_dynamic.png

@@ -148,10 +148,12 @@ Use the `HTMLElementAttribute.event(<type>, "<value>")`.
 
 ## Benchmarks
 - Libraries tested
+  - [BinaryBuilds/swift-html](https://github.com/BinaryBirds/swift-html) v1.7.0 (fixed version [here](https://github.com/RandomHashTags/fork-bb-swift-html))
   - [sliemeobn/elementary](https://github.com/sliemeobn/elementary) v0.3.4
   - [JohnSundell/Plot](https://github.com/JohnSundell/Plot) v0.14.0
   - [RandomHashTags/swift-htmlkit](https://github.com/RandomHashTags/swift-htmlkit) v0.5.0 (this library)
   - [pointfreeco/swift-html](https://github.com/pointfreeco/swift-html) v0.4.1
+  - [robb/Swim](https://github.com/robb/Swim) v0.4.0 (fixed version [here](https://github.com/RandomHashTags/fork-Swim))
   - [vapor-community/HTMLKit](https://github.com/vapor-community/HTMLKit) v2.8.1
 
 Using iMac (i9 9900k, 72GB RAM, 2TB) with macOS 15.0 and the Swift 6 compiler.