node group support

Author: tib

Sources/SwiftHtml/Components/DocumentRenderer.swift

@@ -41,20 +41,26 @@ public struct DocumentRenderer {
         let spaces = String(repeating: " ", count: level * indent)
         switch tag.node.type {
         case .standard:
-            var children = tag.children.map { render(tag: $0, level: level + 1) }.joined(separator: newline)
-            if !children.isEmpty {
-                children = newline + children + newline + spaces
-            }
-            return spaces + renderOpening(tag) + (tag.node.contents ?? "") + children + renderClosing(tag)
+            return spaces + renderOpening(tag) + (tag.node.contents ?? "") + renderChildren(tag, level: level, spaces: spaces) + renderClosing(tag)
         case .comment:
             return spaces + "<!--" + (tag.node.contents ?? "") + "-->"
         case .empty:
             return spaces + renderOpening(tag)
+        case .group:
+            return spaces + renderChildren(tag, level: level, spaces: spaces)
+        }
+    }
+    
+    private func renderChildren(_ tag: Tag, level: Int, spaces: String) -> String {
+        var children = tag.children.map { render(tag: $0, level: level + 1) }.joined(separator: newline)
+        if !children.isEmpty {
+            children = newline + children + newline + spaces
         }
+        return children
     }
 
     private func renderOpening(_ tag: Tag) -> String {
-        "<" + tag.node.name! + (tag.node.attributes.isEmpty ? "" : " ") + renderAttributes(tag.node.attributes) + ">"
+        return "<" + tag.node.name! + (tag.node.attributes.isEmpty ? "" : " ") + renderAttributes(tag.node.attributes) + ">"
     }
 
     private func renderClosing(_ tag: Tag) -> String {

Sources/SwiftHtml/Components/Node.swift

@@ -17,9 +17,7 @@ public struct Node {
         /// non-container tags
         case empty        // <br>
         /// invisible node for grouping other nodes
-        ///
-        /// NOTE: this feature is implemented on the tag level, nodes are basic components
-//        case group    // *invisible group*<h1>lorem</h1><p>ipsum</p>*invisible group*
+        case group    // *invisible group*<h1>lorem</h1><p>ipsum</p>*invisible group*
     }
 
     public let type: NodeType

Sources/SwiftHtml/Components/TagBuilder.swift

@@ -11,6 +11,10 @@ public enum TagBuilder {
     public static func buildBlock(_ components: [Tag]...) -> [Tag] {
         components.flatMap { $0 }
     }
+    
+    public static func buildBlock(_ components: [Tag]...) -> Tag {
+        Tag(.init(type: .empty), children: components.flatMap { $0 })
+    }
 
     public static func buildExpression(_ expression: Tag) -> [Tag] {
         [expression]

Tests/SwiftHtmlTests/TagBuilderTests.swift

@@ -90,5 +90,23 @@ final class TagBuilderTests: XCTestCase {
                             </div>
                             """)
     }
+    
+    func testGroupBuilder() {
+        let doc = Document(.unspecified) {
+            Main {
+                H1("Lorem ipsum")
+                P("Dolor sit amet")
+            }
+        }
+
+        XCTAssertEqual(DocumentRenderer().render(doc), """
+                            <main>
+                                <h1>Lorem ipsum</h1>
+                                <p>Dolor sit amet</p>
+                            </main>
+                            """)
+    }
+    
+    
 }