🚧 [wip] attribute store

Author: tib

.mailmap

@@ -4,7 +4,7 @@ SHELL=/bin/bash
 
 baseUrl = https://raw.githubusercontent.com/BinaryBirds/github-workflows/refs/heads/main/scripts
 
-check: symlinks language deps lint headers
+check: symlinks language deps lint
 
 symlinks:
 	curl -s $(baseUrl)/check-broken-symlinks.sh | bash

CONTRIBUTORS.txt

@@ -2,78 +2,60 @@
 
 An awesome Swift HTML DSL library using result builders that closely follows the W3C standards.
 
-
 ```swift
-import SwiftHtml 
-
-let doc = Document(.html) {
-    Html {
-        Head {
-            Title("Hello Swift HTML DSL")
-            
-            Meta().charset("utf-8")
-            Meta().name(.viewport).content("width=device-width, initial-scale=1")
-
-            Link(rel: .stylesheet).href("./css/style.css")
+import SwiftHTML
+
+let html = Html {
+    Head {
+        Title("Hello, SwiftHTML!")
+        Meta().charset("utf-8")
+        Meta().name(.viewport).content("width=device-width, initial-scale=1")
+        Link(rel: .stylesheet).href("./css/style.css")
+    }
+    Body {
+        H1("Hello, SwiftHTML!")
+        Ul {
+            Li("Type-safe HTML DSL for Swift 6+")
+            Li("Concurrency-safety; sendable support")
+            Li("Contains all the HTML tag definitions")
+            Li("RSS, Sitemap, SVG support as well")
         }
-        Body {
-            Main {
-                Div {
-                    Section {
-                        Img(src: "./images/swift.png", alt: "Swift Logo")
-                            .title("Picture of the Swift Logo")
-                        H1("Lorem ipsum")
-                            .class("red")
-                        P("Lorem ipsum dolor sit amet, consectetur adipiscing elit.")
-                            .class(["green", "blue"])
-                            .spellcheck(false)
-                    }
-
-                    A("Download SwiftHtml now!")
-                        .href("https://github.com/binarybirds/swift-html/")
-                        .target(.blank)
-                        .download()
-                        
-                    Abbr("WTFPL")
-                        .title("Do What The Fuck You Want To Public License")
-                }
-            }
-            .class("container")
 
-            Script().src("./js/main.js").async()
-        }
+        Script(#"console.log("Hello, SwiftHTML!")"#)
+        Script().src("./js/main.js").async()
     }
 }
 
-let html = DocumentRenderer(minify: false, indent: 2).render(doc)
-print(html)
+let renderer = Renderer(indent: 4)
+let doc = Document(type: .html, root: html)
+let result = renderer.render(document: doc)
+print(result) // HTML output
 ```
 
+## Installation
 
-## Install
-
-You can simply use `SwiftHtml` as a dependency via the Swift Package Manager:
+You can use `SwiftHTML` as a dependency via Swift Package Manager:
 
 ```swift
-.package(url: "https://github.com/binarybirds/swift-html", from: "1.6.0"),
+.package(url: "https://github.com/binarybirds/swift-html", from: "2.0.0"),
 ```
 
-Add the `SwiftHtml` product from the `swift-html` package as a dependency to your target:
+Add the `SwiftHTML` product from the `swift-html` package as a dependency to your target:
 
 ```swift
-.product(name: "SwiftHtml", package: "swift-html"),
+.product(name: "SwiftHTML", package: "swift-html"),
 ```
 
 Import the framework:
 
 ```swift
-import SwiftHtml
+import SwiftHTML
 ```
 
 That's it.
 
 
-## Creating custom tags
+## Custom tags
 
 You can define your own custom tags by subclassing the `Tag` or `EmptyTag` class. 
 
@@ -243,8 +225,6 @@ let tag = WebIndexTemplate(ctx) {
 .render(req)
 ```
 
-If you want to create a lightweight template engine for the [Vapor](https://vapor.codes/) web framework using SwiftHtml, you can see a working example inside the [Feather CMS core](https://github.com/FeatherCMS/feather-core) repository. 
-
 
 ## Credits & references
 

Makefile

@@ -1,13 +1,13 @@
 public struct ShortNode: Node {
 
     public var name: String
-    public var attributes: [Attribute]
+    public var properties: [Property]
 
     public init(
         name: String,
-        attributes: [Attribute] = []
+        properties: [Property] = []
     ) {
         self.name = name
-        self.attributes = attributes
+        self.properties = properties
     }
 }

README.md

@@ -1,18 +1,18 @@
 public struct StandardNode: Node {
 
     public var name: String
-    public var attributes: [Attribute]
+    public var properties: [Property]
     public var children: [Node] { list.items }
 
     private var list: ListNode
 
     public init(
         name: String,
-        attributes: [Attribute] = [],
+        properties: [Property] = [],
         children: [Node] = []
     ) {
         self.name = name
-        self.attributes = attributes
+        self.properties = properties
         self.list = .init(items: children)
     }
 }

Sources/DOM/Nodes/ShortNode.swift

@@ -1,4 +1,4 @@
-public struct Attribute: Sendable {
+public struct Property: Sendable {
 
     public var name: String
     public var value: String?

Sources/DOM/Nodes/StandardNode.swift

@@ -26,7 +26,7 @@ public struct Renderer {
     }
 
     func renderAttributeList(
-        _ attributes: [Attribute]
+        _ attributes: [Property]
     ) -> String {
         let attributesList =
             attributes
@@ -39,7 +39,7 @@ public struct Renderer {
     }
 
     func renderAttribute(
-        _ attribute: Attribute
+        _ attribute: Property
     ) -> String {
         if let value = attribute.value {
             return #"\#(attribute.name)="\#(value)""#
@@ -50,7 +50,7 @@ public struct Renderer {
     func renderStandardOpening(
         _ node: StandardNode
     ) -> String {
-        let attributesList = renderAttributeList(node.attributes)
+        let attributesList = renderAttributeList(node.properties)
         return "<\(node.name)\(attributesList)>"
     }
 
@@ -63,7 +63,7 @@ public struct Renderer {
     func renderShort(
         _ node: ShortNode
     ) -> String {
-        let attributesList = renderAttributeList(node.attributes)
+        let attributesList = renderAttributeList(node.properties)
         return "<\(node.name)\(attributesList)>"
     }
 

Sources/DOM/Attribute.swift Sources/DOM/Property.swiftSources/DOM/Attribute.swift renamed to Sources/DOM/Property.swift

@@ -0,0 +1,19 @@
+import DOM
+
+public protocol Attribute: Sendable {
+    var name: String { get }
+    var value: String? { get }
+}
+
+public struct RawAttribute: Attribute {
+    public var name: String
+    public var value: String?
+
+    public init(
+        name: String,
+        value: String? = nil
+    ) {
+        self.name = name
+        self.value = value
+    }
+}

Sources/DOM/Renderer.swift

@@ -1,24 +1,6 @@
 import DOM
 
-public protocol Attribute: Sendable {
-    var name: String { get }
-    var value: String? { get }
-}
-
-public struct RawAttribute: Attribute {
-    public var name: String
-    public var value: String?
-
-    public init(
-        name: String,
-        value: String? = nil
-    ) {
-        self.name = name
-        self.value = value
-    }
-}
-
-public struct Attributes: Sendable {
+public struct AttributeStore: Sendable {
 
     var storage: [String: [String?]]
 
@@ -70,7 +52,7 @@ public struct Attributes: Sendable {
         //        }
     }
 
-    public var domAttributes: [DOM.Attribute] {
+    public var properties: [Property] {
         storage.map { name, value in
             let values = value.compactMap { $0 }.sorted()
             return .init(