good stuff

- fixed wrong placement of custom renderer text
- updated README executed command
- `title` value is now dynamic in benchmarks
- interpolation detection should now show compiler warning for every usage
- tried improving dynamic throughput to no avail

Author: RandomHashTags

Benchmarks/Benchmarks/Elementary/Elementary.swift

@@ -39,7 +39,7 @@ struct DynamicView {
         html {
             head {
                 meta(.custom(name: "charset", value: context.charset))
-                title { "DynamicView" }
+                title { context.title }
                 meta(.content(context.meta_description), .name("description"))
                 meta(.content(context.keywords_string), .name("keywords"))
             }

Benchmarks/Benchmarks/Networking/main.swift

@@ -35,14 +35,9 @@ let libraries:[String:HTMLGenerator] = [
 import Hummingbird
 
 struct HeaderMiddleware<Context: RequestContext> : RouterMiddleware {
-    let output:String
-
-    init(_ output: String = "Content-Type") {
-        self.output = output
-    }
     func handle(_ request: Request, context: Context, next: (Request, Context) async throws -> Response) async throws -> Response {
         var response = try await next(request, context)
-        response.headers[HTTPField.Name(output)!] = "text/html"
+        response.headers[HTTPField.Name("Content-Type")!] = "text/html"
         return response
     }
 }

Benchmarks/Benchmarks/Plot/Plot.swift

@@ -25,7 +25,7 @@ package struct PlotTests : HTMLGenerator {
         return HTML(
             .head(
                 .meta(.attribute(named: "charset", value: context.charset)),
-                .element(named: "title", text: "DynamicView"),
+                .element(named: "title", text: context.title),
                 .meta(.content(context.meta_description), .name("description")),
                 .meta(.content(context.keywords_string), .name("keywords"))
             ),

Benchmarks/Benchmarks/SwiftHTMLBB/SwiftHTMLBB.swift

@@ -32,7 +32,7 @@ package struct SwiftHTMLBBTests : HTMLGenerator {
             Html {
                 Head {
                     Meta().charset(context.charset)
-                    Title("DynamicView")
+                    Title(context.title)
                     Meta().content(context.meta_description).name("description")
                     Meta().content(context.keywords_string).name("keywords")
                 }

Benchmarks/Benchmarks/SwiftHTMLKit/SwiftHTMLKit.swift

@@ -12,14 +12,14 @@ package struct SwiftHTMLKitTests : HTMLGenerator {
     package init() {}
 
     package func staticHTML() -> String {
-        #html([
-            #head([
-                #title(["StaticView"])
-            ]),
-            #body([
-                #h1(["Swift HTML Benchmarks"])
-            ])
-        ])
+        #html(
+            #head(
+                #title("StaticView")
+            ),
+            #body(
+                #h1("Swift HTML Benchmarks")
+            )
+        )
     }
     // performance notes
     // - maping makes unneccessary copies and hurts throughput
@@ -30,24 +30,25 @@ package struct SwiftHTMLKitTests : HTMLGenerator {
     package func dynamicHTML(_ context: HTMLContext) -> String {
         var qualities:String = ""
         for quality in context.user.qualities {
-            qualities += #li(["\(quality)"])
+            qualities += #li("\(quality)")
         }
-        return #html([
-            #head([
+        let string:String = #html(
+            #head(
                 #meta(charset: "\(context.charset)"),
-                #title(["DynamicView"]),
+                #title("\(context.title)"),
                 #meta(content: "\(context.meta_description)", name: "description"),
                 #meta(content: "\(context.keywords_string)", name: "keywords")
-            ]),
-            #body([
-                #h1(["\(context.heading)"]),
-                #div(attributes: [.id(context.desc_id)], [
-                    #p(["\(context.string)"])
-                ]),
-                #h2(["\(context.user.details_heading)"]),
-                #h3(["\(context.user.qualities_heading)"]),
-                #ul(attributes: [.id(context.user.qualities_id)], ["\(qualities)"])
-            ])
-        ])
+            ),
+            #body(
+                #h1("\(context.heading)"),
+                #div(attributes: [.id(context.desc_id)],
+                    #p("\(context.string)")
+                ),
+                #h2("\(context.user.details_heading)"),
+                #h3("\(context.user.qualities_heading)"),
+                #ul(attributes: [.id(context.user.qualities_id)], "\(qualities)")
+            )
+        )
+        return string
     }
 }

Benchmarks/Benchmarks/SwiftHTMLPF/SwiftHTMLPF.swift

@@ -30,7 +30,7 @@ package struct SwiftHTMLPFTests : HTMLGenerator {
                 .html(
                     .head(
                         .meta(attributes: [.charset(.utf8)]),
-                        .title("DynamicView"),
+                        .title(context.title),
                         .meta(attributes: [.init("content", context.meta_description), .init("name", "description")]),
                         .meta(attributes: [.init("content", context.keywords_string), .init("name", "keywords")])
                     ),

Benchmarks/Benchmarks/Swim/Swim.swift

@@ -61,7 +61,7 @@ package struct SwimTests : HTMLGenerator {
         return html {
             head {
                 meta(charset: context.charset)
-                title { "DynamicView" }
+                title { context.title }
                 meta(customAttributes: ["content":context.meta_description, "name":"description"])
                 meta(customAttributes: ["content":context.keywords_string, "name":"keywords"])
             }

Benchmarks/Benchmarks/UnitTests/UnitTests.swift

@@ -31,14 +31,14 @@ struct UnitTests {
         "Vaux" : VauxTests()
     ]
     @Test func staticHTML() {
-        let expected_value:String = #html([
-            #head([
-                #title(["StaticView"])
-            ]),
-            #body([
-                #h1(["Swift HTML Benchmarks"])
-            ])
-        ])
+        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" {

Benchmarks/Benchmarks/Utilities/Utilities.swift

@@ -35,7 +35,7 @@ package actor Cache {
 
 // MARK: HTMLContext
 package struct HTMLContext {
-    package let charset:String, keywords:[String], meta_description:String
+    package let charset:String, title:String, keywords:[String], meta_description:String
     package let heading:String, desc_id:String
     package let string:String, integer:Int, double:Double, float:Float, boolean:Bool
     package let now:Date
@@ -52,13 +52,24 @@ package struct HTMLContext {
 
     package init() {
         charset = "utf-8"
+        title = "DynamicView"
         keywords = ["swift", "html", "benchmark"]
         meta_description = "This website is to benchmark the performance of different Swift DSL libraries."
 
         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."
+        // 5 paragraphs of lorem ipsum
+        string = """
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse eget ornare ligula, sit amet pretium justo. Nunc vestibulum sollicitudin sem sed ultricies. Nullam ultrices mattis rutrum. Quisque venenatis lacus non tortor aliquam elementum. Nullam dictum, dolor vel efficitur semper, metus nisi porta elit, in tincidunt nunc eros quis nunc. Aliquam id eros sed leo feugiat aliquet quis eget augue. Praesent molestie quis libero vulputate cursus. Aenean lobortis cursus lacinia. Quisque imperdiet suscipit mi in rutrum. Suspendisse potenti.
+
+        In condimentum non turpis non porta. In vehicula rutrum risus eget placerat. Nulla neque quam, dignissim eu luctus at, elementum at nisl. Cras volutpat mi sem, at congue felis pellentesque sed. Sed maximus orci vel enim iaculis condimentum. Integer maximus consectetur arcu quis aliquet. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Maecenas eget feugiat elit. Maecenas pellentesque, urna at iaculis pretium, diam lectus dapibus est, et fermentum nisl ex vel ligula. Aliquam dignissim dapibus est, nec tincidunt tortor sagittis in. Vestibulum id lacus a nunc auctor ultricies. Praesent ante sapien, ultricies vel lorem id, tempus mollis justo. Curabitur sollicitudin, augue hendrerit suscipit tristique, sem lacus consectetur leo, id eleifend diam tellus sit amet nulla. Etiam metus augue, consequat ut dictum a, aliquet nec neque. Vestibulum gravida vel ligula at interdum. Nam cursus sapien non malesuada lobortis.
+
+        Nulla in viverra mauris. Pellentesque non sollicitudin lacus, vitae pharetra neque. Praesent sodales odio nisi, quis condimentum orci ornare a. Aliquam erat volutpat. Maecenas purus mauris, aliquet rutrum metus eget, consectetur fringilla felis. Proin pulvinar tellus nulla, nec iaculis neque venenatis sed. In vel dui quam. Integer aliquam ligula ipsum, mattis commodo quam elementum ut. Aenean tortor neque, blandit fermentum velit ut, rutrum gravida ex.
+
+        Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec sed diam eget nibh semper varius. Phasellus sed feugiat turpis, sit amet pharetra erat. Integer eleifend tortor ut mauris lobortis consequat. Aliquam fermentum mollis fringilla. Morbi et enim in ligula luctus facilisis quis sed leo. Nullam ut suscipit arcu, eu hendrerit eros. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla maximus tempus dui. In aliquam neque ut urna euismod, vitae ullamcorper nisl fermentum. Integer ac ultricies erat, id volutpat leo. Morbi faucibus tortor at lectus feugiat, quis ultricies lectus dictum. Pellentesque congue blandit ligula, nec convallis lectus volutpat congue. Nam lobortis sapien nec nulla accumsan, a pharetra quam convallis. Donec vulputate rutrum dolor ac cursus. Mauris condimentum convallis malesuada.
+
+        Mauris eros quam, dictum id elementum et, pharetra in metus. Quisque fermentum congue risus, accumsan consectetur neque aliquam quis. Vestibulum ipsum massa, euismod faucibus est in, condimentum venenatis risus. Quisque congue vehicula tellus, et dignissim augue accumsan ac. Pellentesque tristique ornare ligula, vitae iaculis dui varius vel. Ut sed sem sed purus facilisis porta quis eu tortor. Donec in vehicula tortor. Sed eget aliquet enim. Mauris tincidunt placerat risus, ut gravida lacus vehicula eget. Curabitur ultrices sapien tortor, eu gravida velit efficitur sed. Suspendisse eu volutpat est, ut bibendum velit. Maecenas mollis sit amet sapien laoreet pulvinar. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Morbi lorem ante, volutpat et accumsan a, fermentum vel metus.
+        """
         integer = 293785
         double = 39848.9348019843
         float = 616905.2098238

Benchmarks/Benchmarks/VaporHTMLKit/VaporHTMLKit.swift

@@ -47,7 +47,7 @@ struct DynamicView : View {
         Html {
             Head {
                 Meta().charset(.utf8) // TODO: fix? | not dynamic
-                Title { "DynamicView" }
+                Title { context.title }
                 Meta().content(context.meta_description).name(.description)
                 Meta().content(context.keywords_string).name(.keywords)
             }

Benchmarks/Benchmarks/Vaux/Vaux.swift

@@ -86,7 +86,7 @@ package struct VauxTests : HTMLGenerator {
         html {
             head {
                 meta().attr("charset", context.charset)
-                title("DynamicView")
+                title(context.title)
                 meta().attr("content", context.meta_description).attr("name", "description")
                 meta().attr("content", context.keywords_string).attr("name", "keywords")
             }

Benchmarks/Package.swift

@@ -12,7 +12,8 @@ let package = Package(
         // dsls
         .package(url: "https://github.com/ordo-one/package-benchmark", from: "1.27.0"),
         .package(url: "https://github.com/swiftlang/swift-syntax", from: "600.0.0"),
-        .package(url: "https://github.com/RandomHashTags/swift-htmlkit", from: "0.5.0"),
+        .package(name: "swift-htmlkit", path: "../"),
+        //.package(url: "https://github.com/RandomHashTags/swift-htmlkit", from: "0.5.0"),
         .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"),

README.md

@@ -148,18 +148,18 @@ Use the `HTMLElementAttribute.event(<type>, "<value>")`.
 
 ## Benchmarks
 - Libraries tested
-  - [BinaryBuilds/swift-html](https://github.com/BinaryBirds/swift-html) v1.7.0 (patched version [here](https://github.com/RandomHashTags/fork-bb-swift-html); custom renderer [here](https://github.com/RandomHashTags/swift-htmlkit/blob/main/Benchmarks/Benchmarks/Swim/Swim.swift))
+  - [BinaryBuilds/swift-html](https://github.com/BinaryBirds/swift-html) v1.7.0 (patched 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 (patched version [here](https://github.com/RandomHashTags/fork-Swim))
+  - [robb/Swim](https://github.com/robb/Swim) v0.4.0 (patched version [here](https://github.com/RandomHashTags/fork-Swim); custom renderer [here](https://github.com/RandomHashTags/swift-htmlkit/blob/main/Benchmarks/Benchmarks/Swim/Swim.swift))
   - [vapor-community/HTMLKit](https://github.com/vapor-community/HTMLKit) v2.8.1
   - [dokun1/Vaux](https://github.com/dokun1/Vaux) v0.2.0 (patched version [here](https://github.com/RandomHashTags/fork-Vaux); custom renderer [here](https://github.com/RandomHashTags/swift-htmlkit/blob/main/Benchmarks/Benchmarks/Vaux/Vaux.swift))
 
 Test machine: iMac (i9 9900k, 72GB RAM, 2TB) running macOS 15.0 with the Swift 6 compiler.
 
-Executed command: `swift package -c release --allow-writing-to-package-directory benchmark --metric throughput  --format jmh`
+Executed command: `swift package -c release --allow-writing-to-package-directory benchmark --target Benchmarks --metric throughput --format jmh`
 
 ### Static
 <img src="Benchmarks/img/throughput_static.png">

Sources/HTMLKit/HTMLKit.swift

@@ -7,17 +7,64 @@
 
 import HTMLKitUtilities
 
+// MARK: StaticString equality
 public extension StaticString {
     static func == (left: Self, right: String) -> Bool { left.string == right }
 
     static func == (left: Self, right: Self) -> Bool { left.string == right.string }
     static func != (left: Self, right: Self) -> Bool { left.string != right.string }
-    var string : String { withUTF8Buffer { String(decoding: $0, as: UTF8.self) } }
+    var string : String {
+        withUTF8Buffer {
+            String(decoding: $0, as: UTF8.self)
+        }
+    }
+    /*func string(with replacements: [String]) -> String {
+        return withUTF8Buffer { p in
+            let values = p.split(separator: 96)
+            let last:Int = values.count-1
+            var amount:Int = p.count - last
+            for i in 0..<values.count-1 {
+                amount += replacements[i].count
+            }
+            let buffer:UnsafeMutableBufferPointer<UInt8> = .allocate(capacity: amount)
+            var new_index:Int = 0
+            for index in 0..<values.count {
+                let value:UnsafeBufferPointer<UInt8>.SubSequence = values[index]
+                for i in 0..<value.count {
+                    buffer[new_index] = value[value.index(value.startIndex, offsetBy: i)]
+                    new_index += 1
+                }
+                if index != last {
+                    for char in replacements[index] {
+                        buffer[new_index] = char.asciiValue!
+                        new_index += 1
+                    }
+                }
+            }
+            return String(decoding: buffer, as: UTF8.self)
+        }
+    }*/
 }
 public extension String {
     static func == (left: Self, right: StaticString) -> Bool { left == right.string }
 }
 
+/*
+// MARK: DynamicString
+public struct DynamicString {
+    public let string:StaticString
+    public let values:[String]
+
+    public init(string: StaticString, values: [String]) {
+        self.string = string
+        self.values = values
+    }
+
+    public var test : String {
+        return string.string
+    }
+}*/
+
 @freestanding(expression)
 public macro escapeHTML<T: ExpressibleByStringLiteral>(_ innerHTML: T...) -> T = #externalMacro(module: "HTMLKitMacros", type: "HTMLElement")