Sort attributes in HTML nodes when rendering

Package.swift

@@ -26,8 +26,8 @@ let package = Package(
       targets: ["TokamakStaticHTML"]
     ),
     .executable(
-      name: "TokamakStaticDemo",
-      targets: ["TokamakStaticDemo"]
+      name: "TokamakStaticHTMLDemo",
+      targets: ["TokamakStaticHTMLDemo"]
     ),
     .library(
       name: "TokamakGTK",
@@ -159,7 +159,7 @@ let package = Package(
       resources: [.copy("logo-header.png")]
     ),
     .target(
-      name: "TokamakStaticDemo",
+      name: "TokamakStaticHTMLDemo",
       dependencies: [
         "TokamakStaticHTML",
       ]

Sources/TokamakDOM/DOMNode.swift

@@ -49,7 +49,7 @@ extension AnyHTML {
       dom.reinstall(dynamicSelf.listeners)
     }
 
-    guard let innerHTML = innerHTML else { return }
+    guard let innerHTML = innerHTML(shouldSortAttributes: false) else { return }
     dom.ref.innerHTML = .string(innerHTML)
   }
 }

Sources/TokamakDOM/DOMRenderer.swift

@@ -114,10 +114,16 @@ final class DOMRenderer: Renderer {
 
     let maybeNode: JSObject?
     if let sibling = sibling {
-      _ = sibling.ref.insertAdjacentHTML!("beforebegin", anyHTML.outerHTML)
+      _ = sibling.ref.insertAdjacentHTML!(
+        "beforebegin",
+        anyHTML.outerHTML(shouldSortAttributes: false, children: [])
+      )
       maybeNode = sibling.ref.previousSibling.object
     } else {
-      _ = parent.ref.insertAdjacentHTML!("beforeend", anyHTML.outerHTML)
+      _ = parent.ref.insertAdjacentHTML!(
+        "beforeend",
+        anyHTML.outerHTML(shouldSortAttributes: false, children: [])
+      )
 
       guard
         let children = parent.ref.childNodes.object,

Sources/TokamakDOM/Views/Buttons/Button.swift

@@ -34,7 +34,7 @@ extension _Button: ViewDeferredToRenderer where Label == Text {
         ["class": "_tokamak-buttonstyle-default"],
         listeners: listeners
       ) {
-        HTML("span", content: label.innerHTML ?? "")
+        HTML("span", content: label.innerHTML(shouldSortAttributes: false) ?? "")
       })
     } else {
       return AnyView(DynamicHTML(

Sources/TokamakDOM/Views/DynamicHTML.swift

@@ -33,7 +33,11 @@ public struct DynamicHTML<Content>: View, AnyDynamicHTML {
   public let listeners: [String: Listener]
   let content: Content
 
-  public var innerHTML: String?
+  fileprivate let cachedInnerHTML: String?
+
+    public func innerHTML(shouldSortAttributes: Bool) -> String? {
+        cachedInnerHTML
+    }
 
   @_spi(TokamakCore)
   public var body: Never {
@@ -52,7 +56,7 @@ public extension DynamicHTML where Content: StringProtocol {
     self.attributes = attributes
     self.listeners = listeners
     self.content = content
-    innerHTML = String(content)
+    cachedInnerHTML = String(content)
   }
 }
 
@@ -67,7 +71,7 @@ extension DynamicHTML: ParentView where Content: View {
     self.attributes = attributes
     self.listeners = listeners
     self.content = content()
-    innerHTML = nil
+    cachedInnerHTML = nil
   }
 
   @_spi(TokamakCore)

Sources/TokamakStaticHTML/StaticRenderer.swift

@@ -45,20 +45,14 @@ public final class HTMLTarget: Target {
 }
 
 extension HTMLTarget {
-  var outerHTML: String {
-    """
-    <\(html.tag)\(html.attributes.isEmpty ? "" : " ")\
-    \(html.attributes.map { #"\#($0)="\#($1)""# }.joined(separator: " "))>\
-    \(html.innerHTML ?? "")\
-    \(children.map(\.outerHTML).joined(separator: "\n"))\
-    </\(html.tag)>
-    """
+  func outerHTML(shouldSortAttributes: Bool) -> String {
+    html.outerHTML(shouldSortAttributes: shouldSortAttributes, children: children)
   }
 }
 
 struct HTMLBody: AnyHTML {
   let tag: String = "body"
-  let innerHTML: String? = nil
+  public func innerHTML(shouldSortAttributes: Bool) -> String? { nil }
   let attributes: [HTMLAttribute: String] = [
     "style": "margin: 0;" + rootNodeStyles,
   ]
@@ -70,7 +64,8 @@ public final class StaticHTMLRenderer: Renderer {
   var rootTarget: HTMLTarget
 
   static var title: String = ""
-  public var html: String {
+
+  public func render(shouldSortAttributes: Bool = false) -> String {
     """
     <html>
     <head>
@@ -79,7 +74,7 @@ public final class StaticHTMLRenderer: Renderer {
         \(tokamakStyles)
       </style>
     </head>
-    \(rootTarget.outerHTML)
+    \(rootTarget.outerHTML(shouldSortAttributes: shouldSortAttributes))
     </html>
     """
   }

Sources/TokamakStaticHTML/Views/HTML.swift

@@ -47,17 +47,30 @@ extension HTMLAttribute: ExpressibleByStringLiteral {
 }
 
 public protocol AnyHTML {
-  var innerHTML: String? { get }
+    func innerHTML(shouldSortAttributes: Bool) -> String?
   var tag: String { get }
   var attributes: [HTMLAttribute: String] { get }
 }
 
 public extension AnyHTML {
-  var outerHTML: String {
-    """
+    func outerHTML(shouldSortAttributes: Bool, children: [HTMLTarget]) -> String {
+        let renderedAttributes: String
+        if attributes.isEmpty {
+            renderedAttributes = ""
+        } else {
+            let mappedAttributes = attributes.map { #"\#($0)="\#($1)""# }
+            if shouldSortAttributes {
+                renderedAttributes = mappedAttributes.sorted().joined(separator: " ")
+            } else {
+                renderedAttributes = mappedAttributes.joined(separator: " ")
+            }
+        }
+
+    return """
     <\(tag)\(attributes.isEmpty ? "" : " ")\
-    \(attributes.map { #"\#($0)="\#($1)""# }.joined(separator: " "))>\
-    \(innerHTML ?? "")\
+    \(renderedAttributes)>\
+    \(innerHTML(shouldSortAttributes: shouldSortAttributes) ?? "")\
+    \(children.map { $0.outerHTML(shouldSortAttributes: shouldSortAttributes) }.joined(separator: "\n"))\
     </\(tag)>
     """
   }
@@ -68,7 +81,12 @@ public struct HTML<Content>: View, AnyHTML {
   public let attributes: [HTMLAttribute: String]
   let content: Content
 
-  public let innerHTML: String?
+    fileprivate let cachedInnerHTML: String?
+
+      public func innerHTML(shouldSortAttributes: Bool) -> String? {
+          cachedInnerHTML
+      }
+
 
   @_spi(TokamakCore)
   public var body: Never {
@@ -85,7 +103,7 @@ public extension HTML where Content: StringProtocol {
     self.tag = tag
     self.attributes = attributes
     self.content = content
-    innerHTML = String(content)
+    cachedInnerHTML = String(content)
   }
 }
 
@@ -98,7 +116,7 @@ extension HTML: ParentView where Content: View {
     self.tag = tag
     self.attributes = attributes
     self.content = content()
-    innerHTML = nil
+    cachedInnerHTML = nil
   }
 
   @_spi(TokamakCore)

Sources/TokamakStaticHTML/Views/Spacers/Divider.swift

@@ -15,7 +15,7 @@
 @_spi(TokamakCore) import TokamakCore
 
 extension Divider: AnyHTML {
-  public var innerHTML: String? { nil }
+    public func innerHTML(shouldSortAttributes: Bool) -> String? { nil }
   public var tag: String { "hr" }
   public var attributes: [HTMLAttribute: String] {
     [

Sources/TokamakStaticHTML/Views/Text/Text.swift

@@ -105,12 +105,12 @@ private struct TextSpan: AnyHTML {
   let content: String
   let attributes: [HTMLAttribute: String]
 
-  var innerHTML: String? { content }
+    public func innerHTML(shouldSortAttributes: Bool) -> String? { content }
   var tag: String { "span" }
 }
 
 extension Text: AnyHTML {
-  public var innerHTML: String? {
+    public func innerHTML(shouldSortAttributes: Bool) -> String? {
     let proxy = _TextProxy(self)
     let innerHTML: String
     switch proxy.storage {
@@ -126,7 +126,7 @@ extension Text: AnyHTML {
               environment: proxy.environment
             )
           )
-          .outerHTML
+          .outerHTML(shouldSortAttributes: shouldSortAttributes, children: [])
         }
         .reduce("", +)
     }

Sources/TokamakStaticHTMLBenchmark/main.swift

@@ -27,12 +27,20 @@ struct BenchmarkApp: App {
   }
 }
 
-benchmark("render App") {
-  _ = StaticHTMLRenderer(BenchmarkApp())
+benchmark("render App unsorted attributes") {
+    _ = StaticHTMLRenderer(BenchmarkApp()).render(shouldSortAttributes: false)
 }
 
-benchmark("render List") {
-  _ = StaticHTMLRenderer(List(1..<100) { Text("\($0)") })
+benchmark("render App sorted attributes") {
+    _ = StaticHTMLRenderer(BenchmarkApp()).render(shouldSortAttributes: true)
+}
+
+benchmark("render List unsorted attributes") {
+    _ = StaticHTMLRenderer(List(1..<100) { Text("\($0)") }).render(shouldSortAttributes: false)
+}
+
+benchmark("render List sorted attributes") {
+    _ = StaticHTMLRenderer(List(1..<100) { Text("\($0)") }).render(shouldSortAttributes: true)
 }
 
 Benchmark.main()

Sources/TokamakStaticDemo/main.swift → Sources/TokamakStaticHTMLDemo/main.swift

@@ -25,4 +25,4 @@ struct TestApp: App {
   }
 }
 
-print(StaticHTMLRenderer(TestApp()).html)
+print(StaticHTMLRenderer(TestApp()).render(shouldSortAttributes: true))