minor benchmark updates + 1 fix to optimizedLiteral(encodedResult:) regex

RandomHashTags · RandomHashTags · commit 2e6a0d90f087 · 2025-07-13T02:11:14.000-05:00
diff --git a/Benchmarks/Benchmarks/SwiftHTMLKit/SwiftHTMLKit.swift b/Benchmarks/Benchmarks/SwiftHTMLKit/SwiftHTMLKit.swift
@@ -69,24 +69,24 @@ package struct SwiftHTMLKitTests : HTMLGenerator {
         for quality in context.user.qualities {
             qualities += #html(li(quality))
         }
-        return #html(
-            html(
-                head(
-                    meta(charset: "\(context.charset)"),
-                    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)")
-                )
-            )
-        )
+        return #html {
+            html {
+                head {
+                    meta(charset: context.charset)
+                    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)
+                }
+            }
+        }
     }
 }
diff --git a/Benchmarks/Package.swift b/Benchmarks/Package.swift
@@ -13,9 +13,9 @@ let package = Package(
         .package(url: "https://github.com/swiftlang/swift-syntax", from: "600.0.0"),
         // dsls
         .package(name: "swift-htmlkit", path: "../"),
-        .package(url: "https://github.com/sliemeobn/elementary", exact: "0.4.1"),
+        .package(url: "https://github.com/sliemeobn/elementary", exact: "0.5.3"),
         .package(url: "https://github.com/vapor-community/HTMLKit", exact: "2.8.1"),
-        .package(url: "https://github.com/pointfreeco/swift-html", exact: "0.4.1"),
+        .package(url: "https://github.com/pointfreeco/swift-html", exact: "0.5.0"),
         .package(url: "https://github.com/RandomHashTags/fork-bb-swift-html", branch: "main"),
         .package(url: "https://github.com/JohnSundell/Plot", exact: "0.14.0"),
         //.package(url: "https://github.com/toucansites/toucan", from: "1.0.0-alpha.1"), // unstable
@@ -27,9 +27,9 @@ let package = Package(
         //.package(url: "https://github.com/vapor/leaf", exact: "4.4.0"), // tight integration with Vapor
 
         // networking
-        .package(url: "https://github.com/apple/swift-nio", from: "2.75.0"),
-        .package(url: "https://github.com/vapor/vapor", from: "4.106.0"),
-        .package(url: "https://github.com/hummingbird-project/hummingbird", from: "2.1.0")
+        .package(url: "https://github.com/apple/swift-nio", from: "2.84.0"),
+        .package(url: "https://github.com/vapor/vapor", from: "4.115.0"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird", from: "2.15.0")
     ],
     targets: [
         .target(
diff --git a/Sources/HTMLKitParse/ExpandHTMLMacro.swift b/Sources/HTMLKitParse/ExpandHTMLMacro.swift
@@ -110,7 +110,7 @@ extension HTMLKitUtilities {
     }
 
     static func optimizedLiteral(encodedResult: String) -> String {
-        let regex = try! Regex.init("( \\+ String\\(describing: [\\w\\s\\(\\)\\[\\]]+\\) \\+ )")
+        let regex = try! Regex.init("( \\+ String\\(describing: [\\.\\w\\s\\(\\)\\[\\]]+\\) \\+ )")
         var interpolation = encodedResult.matches(of: regex)
         guard !interpolation.isEmpty else {
             return encodedResult
diff --git a/Tests/HTMLKitTests/InterpolationTests.swift b/Tests/HTMLKitTests/InterpolationTests.swift
@@ -72,7 +72,7 @@ struct InterpolationTests {
     // MARK: multi-line func
     @Test func interpolationMultilineFunc() {
         var expected:String = "<div>Bikini Bottom: Spongebob Squarepants, Patrick Star, Squidward Tentacles, Mr. Krabs, Sandy Cheeks, Pearl Krabs</div>"
-        var string:String = #html(
+        var string:String = #html(representation: .literal, // TODO: fix (get HTMLResultRepresentation.literalOptimized to work here)
             div(
                 "Bikini Bottom: ",
                 InterpolationTests.spongebobCharacter(
@@ -350,4 +350,111 @@ extension InterpolationTests {
     }
 }
 
+
+#if canImport(FoundationEssentials)
+
+import FoundationEssentials
+
+extension InterpolationTests {
+    @Test func interpolationDynamic2() {
+        let context = HTMLContext()
+        var qualities:String = ""
+        for quality in context.user.qualities {
+            qualities += #html(li(quality))
+        }
+        let _:String = #html {
+            html {
+                head {
+                    meta(charset: context.charset)
+                    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)
+                }
+            }
+        }
+    }
+    
+    package struct HTMLContext {
+        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
+        package let user:User
+
+        package var keywords_string : String {
+            var s:String = ""
+            for keyword in keywords {
+                s += "," + keyword
+            }
+            s.removeFirst()
+            return s
+        }
+
+        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"
+            // 5 paragraphs of lorem ipsum
+            let 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.
+            """.replacingOccurrences(of: "\n", with: "")
+            var string:String = lorem_ipsum
+            /*for _ in 1..<10 {
+                string += lorem_ipsum
+            }*/
+            self.string = string
+
+            integer = 293785
+            double = 39848.9348019843
+            float = 616905.2098238
+            boolean = true
+
+            now = Date.now
+
+            user = User()
+        }
+    }
+    package struct User {
+        package let details_heading:String, qualities_heading:String, qualities_id:String
+
+        package let id:UInt64, email:String, username:String
+        package let qualities:[String]
+        package let comment_ids:Set<Int>
+
+        init() {
+            details_heading = "User Details"
+            qualities_heading = "Qualities"
+            qualities_id = "user-qualities"
+
+            id = 63821
+            email = "test@gmail.com"
+            username = "User \(id)"
+            qualities = ["funny", "smart", "beautiful", "open-minded", "friendly", "hard-working", "team-player"]
+            comment_ids = [895823, 293, 2384, 1294, 93, 872341, 2089792, 7823, 504985, 35590]
+        }
+    }
+}
+#endif
+
 #endif

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ extension HTMLKitUtilities {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`static func optimizedLiteral(encodedResult: String) -> String {`
`113`		`- let regex = try! Regex.init("( \\+ String\\(describing: [\\w\\s\\(\\)\\[\\]]+\\) \\+ )")`
	`113`	`+ let regex = try! Regex.init("( \\+ String\\(describing: [\\.\\w\\s\\(\\)\\[\\]]+\\) \\+ )")`
`114`	`114`	`var interpolation = encodedResult.matches(of: regex)`
`115`	`115`	`guard !interpolation.isEmpty else {`
`116`	`116`	`return encodedResult`