From 01be293188f4ca4aadcc6f6488e920d74c2ef0af Mon Sep 17 00:00:00 2001
From: nkalvi <nkalvi@users.noreply.github.com>
Date: Fri, 24 Feb 2023 05:34:52 -0800
Subject: [PATCH 1/6] Add support for wrapping description list elements inside
 div. The proposed solution is a workaround the current requirement for
 ElementDefinition.

---
 Sources/Plot/API/HTMLElements.swift | 11 ++++++
 Tests/PlotTests/HTMLTests.swift     | 53 +++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)
diff --git a/Sources/Plot/API/HTMLElements.swift b/Sources/Plot/API/HTMLElements.swift
index 9b5a6b2..2857485 100644
--- a/Sources/Plot/API/HTMLElements.swift
+++ b/Sources/Plot/API/HTMLElements.swift
@@ -426,6 +426,17 @@ public extension Node where Context == HTML.DescriptionListContext {
     }
 }
 
+public extension Node where Context == HTML.DescriptionListContext {
+    /// The `<div>` element wraps a group, that is part of a term-description group in a description list (`<dl>` element).
+    ///
+    /// This is allowed according to the HTML spec: // https://html.spec.whatwg.org/multipage/grouping-content.html#the-dl-element
+    ///
+    /// - parameter nodes: The element's attributes and child elements (`<dl>` or `<dd>` elements).
+    static func dlDiv(_ nodes: Node<HTML.DescriptionListContext>...) -> Node {
+        .element(named: "div", nodes: nodes)
+    }
+}
+
 public extension Node where Context: HTMLOptionListContext {
     /// Add an `<option>` HTML element within the current context.
     /// - parameter nodes: The element's attributes.
diff --git a/Tests/PlotTests/HTMLTests.swift b/Tests/PlotTests/HTMLTests.swift
index 2dd54bb..c8c1128 100644
--- a/Tests/PlotTests/HTMLTests.swift
+++ b/Tests/PlotTests/HTMLTests.swift
@@ -248,6 +248,59 @@ final class HTMLTests: XCTestCase {
         <body><dl><dt>Term</dt><dd>Description</dd></dl></body>
         """)
     }
+    
+    func testDescriptionListWithDiv() {
+        let html = HTML(.body(.dl(
+            .dlDiv(
+                .dt("Last modified time"),
+                .dd("2004-12-23T23:33Z")
+            ),
+            .dlDiv(
+                .dt("Recommended update interval"),
+                .dd("60s")
+            ),
+            .dlDiv(
+                .dt("Authors"),
+                .dt("Editors"),
+                .dd("Robert Rothman"),
+                .dd("Daniel Jackson")
+            )
+        )))
+
+        assertEqualHTMLContent(html, """
+        <!DOCTYPE html>
+        <html>
+            <head>
+                <title>My website</title>
+                <meta name="twitter:title" content="My website"/>
+                <meta name="og:title" content="My website"/>
+                <link rel="stylesheet" href="styles.css" type="text/css"/>
+            </head>
+            <body>
+                <div>
+                    <h1>My website</h1>
+                    <p>Writing HTML in Swift is pretty great!</p>
+                </div>
+                <dl>
+                    <div>
+                        <dt>Last modified time</dt>
+                        <dd>2004-12-23T23:33Z</dd>
+                    </div>
+                    <div>
+                        <dt>Recommended update interval</dt>
+                        <dd>60s</dd>
+                    </div>
+                    <div>
+                        <dt>Authors</dt>
+                        <dt>Editors</dt>
+                        <dd>Robert Rothman</dd>
+                        <dd>Daniel Jackson</dd>
+                    </div>
+                </dl>
+            </body>
+        </html>
+        """)
+    }
 
     func testAnchors() throws {
         let html = try HTML(.body(

From 3669c4aaf8f03ea942b5be3987b6ba24f03cc9f2 Mon Sep 17 00:00:00 2001
From: nkalvi <nkalvi@users.noreply.github.com>
Date: Fri, 24 Feb 2023 05:46:41 -0800
Subject: [PATCH 2/6] Correct the test

---
 Tests/PlotTests/HTMLTests.swift | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/Tests/PlotTests/HTMLTests.swift b/Tests/PlotTests/HTMLTests.swift
index c8c1128..1757847 100644
--- a/Tests/PlotTests/HTMLTests.swift
+++ b/Tests/PlotTests/HTMLTests.swift
@@ -268,37 +268,7 @@ final class HTMLTests: XCTestCase {
         )))
 
         assertEqualHTMLContent(html, """
-        <!DOCTYPE html>
-        <html>
-            <head>
-                <title>My website</title>
-                <meta name="twitter:title" content="My website"/>
-                <meta name="og:title" content="My website"/>
-                <link rel="stylesheet" href="styles.css" type="text/css"/>
-            </head>
-            <body>
-                <div>
-                    <h1>My website</h1>
-                    <p>Writing HTML in Swift is pretty great!</p>
-                </div>
-                <dl>
-                    <div>
-                        <dt>Last modified time</dt>
-                        <dd>2004-12-23T23:33Z</dd>
-                    </div>
-                    <div>
-                        <dt>Recommended update interval</dt>
-                        <dd>60s</dd>
-                    </div>
-                    <div>
-                        <dt>Authors</dt>
-                        <dt>Editors</dt>
-                        <dd>Robert Rothman</dd>
-                        <dd>Daniel Jackson</dd>
-                    </div>
-                </dl>
-            </body>
-        </html>
+        <body><dl><div><dt>Last modified time</dt><dd>2004-12-23T23:33Z</dd></div><div><dt>Recommended update interval</dt><dd>60s</dd></div><div><dt>Authors</dt><dt>Editors</dt><dd>Robert Rothman</dd><dd>Daniel Jackson</dd></div></dl></body>
         """)
     }
 

From 6c96633d7f33e10b656b1081e376c5f637df4d00 Mon Sep 17 00:00:00 2001
From: nkalvi <nkalvi@users.noreply.github.com>
Date: Fri, 31 Mar 2023 11:19:31 -0700
Subject: [PATCH 3/6] Update HTMLElements.swift

The `<div>` element wraps a group, that is part of a term-description group in a description list (`<dl>` element).

This is allowed according to the HTML spec: https://html.spec.whatwg.org/multipage/grouping-content.html#the-dl-element
---
 Sources/Plot/API/HTMLElements.swift | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Sources/Plot/API/HTMLElements.swift b/Sources/Plot/API/HTMLElements.swift
index 3d95810..e5fcb29 100644
--- a/Sources/Plot/API/HTMLElements.swift
+++ b/Sources/Plot/API/HTMLElements.swift
@@ -433,12 +433,12 @@ public extension Node where Context == HTML.DescriptionListContext {
 }
 
 public extension Node where Context == HTML.DescriptionListContext {
-    /// The `<div>` element wraps a group, that is part of a term-description group in a description list (`<dl>` element).
-    ///
-    /// This is allowed according to the HTML spec: // https://html.spec.whatwg.org/multipage/grouping-content.html#the-dl-element
-    ///
+    // The `<div>` element wraps a group, that is part of a term-description group in a description list (`<dl>` element).
+    //
+    // This is allowed according to the HTML spec: // https://html.spec.whatwg.org/multipage/grouping-content.html#the-dl-element
+    //
     /// - parameter nodes: The element's attributes and child elements (`<dl>` or `<dd>` elements).
-    static func dlDiv(_ nodes: Node<HTML.DescriptionListContext>...) -> Node {
+    static func Div(_ nodes: Node<HTML.DescriptionListContext>...) -> Node {
         .element(named: "div", nodes: nodes)
     }
 }

From dc2d8b401c8e8dd5cb57ace019eba32026d69e65 Mon Sep 17 00:00:00 2001
From: nkalvi <nkalvi@users.noreply.github.com>
Date: Fri, 31 Mar 2023 11:24:50 -0700
Subject: [PATCH 4/6] Update HTMLTests.swift

Add tests for `div` inside description lists.
---
 Tests/PlotTests/HTMLTests.swift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Tests/PlotTests/HTMLTests.swift b/Tests/PlotTests/HTMLTests.swift
index aab5dd0..ff1d5d3 100644
--- a/Tests/PlotTests/HTMLTests.swift
+++ b/Tests/PlotTests/HTMLTests.swift
@@ -273,15 +273,15 @@ final class HTMLTests: XCTestCase {
     
     func testDescriptionListWithDiv() {
         let html = HTML(.body(.dl(
-            .dlDiv(
+            .div(
                 .dt("Last modified time"),
                 .dd("2004-12-23T23:33Z")
             ),
-            .dlDiv(
+            .div(
                 .dt("Recommended update interval"),
                 .dd("60s")
             ),
-            .dlDiv(
+            .div(
                 .dt("Authors"),
                 .dt("Editors"),
                 .dd("Robert Rothman"),

From e1e92703b719a4959eeed4109b127d11349b2c11 Mon Sep 17 00:00:00 2001
From: nkalvi <nkalvi@users.noreply.github.com>
Date: Fri, 31 Mar 2023 11:36:44 -0700
Subject: [PATCH 5/6] Update HTMLElements.swift

Fix typo
---
 Sources/Plot/API/HTMLElements.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Sources/Plot/API/HTMLElements.swift b/Sources/Plot/API/HTMLElements.swift
index e5fcb29..d4eed97 100644
--- a/Sources/Plot/API/HTMLElements.swift
+++ b/Sources/Plot/API/HTMLElements.swift
@@ -438,7 +438,7 @@ public extension Node where Context == HTML.DescriptionListContext {
     // This is allowed according to the HTML spec: // https://html.spec.whatwg.org/multipage/grouping-content.html#the-dl-element
     //
     /// - parameter nodes: The element's attributes and child elements (`<dl>` or `<dd>` elements).
-    static func Div(_ nodes: Node<HTML.DescriptionListContext>...) -> Node {
+    static func div(_ nodes: Node<HTML.DescriptionListContext>...) -> Node {
         .element(named: "div", nodes: nodes)
     }
 }

From 47f5df2c4c431714135039985e92704cc4dc4c80 Mon Sep 17 00:00:00 2001
From: John Sundell <john@sundell.co>
Date: Fri, 7 Apr 2023 11:13:43 +0200
Subject: [PATCH 6/6] Make Node.div API based on a protocol

Base the `Node.div` API on a new `HTMLDividableContext` protocol,
which enables that API to be shared between `HTML.BodyContext`
and `HTML.DescriptionListContext`. While this does come with a minor
downside of now requiring an explicit context whenever a `div` node
is created as a stand-alone value (when using `Node.div` directly, without
defining any child nodes within it), in practice that should be very rare, as
`div` nodes are most likely placed within a known context (such as within
a `body` node, or another node that inherits `HTML.BodyContext` from its
parent).
---
 Sources/Plot/API/HTML.swift              |  6 ++++--
 Sources/Plot/API/HTMLComponents.swift    |  2 +-
 Sources/Plot/API/HTMLElements.swift      | 25 ++++++++----------------
 Tests/PlotTests/HTMLComponentTests.swift |  4 ++--
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/Sources/Plot/API/HTML.swift b/Sources/Plot/API/HTML.swift
index 7f54f10..14f86fb 100644
--- a/Sources/Plot/API/HTML.swift
+++ b/Sources/Plot/API/HTML.swift
@@ -83,7 +83,7 @@ public extension HTML {
     /// The context within an HTML document's `<head>` element.
     enum HeadContext: HTMLContext, HTMLScriptableContext {}
     /// The context within an HTML document's `<body>` element.
-    class BodyContext: HTMLStylableContext, HTMLScriptableContext, HTMLImageContainerContext {}
+    class BodyContext: HTMLStylableContext, HTMLScriptableContext, HTMLImageContainerContext, HTMLDividableContext {}
     /// The context within an HTML `<a>` element.
     final class AnchorContext: BodyContext, HTMLLinkableContext {}
     /// The context within an HTML `<audio>` element.
@@ -99,7 +99,7 @@ public extension HTML {
     /// The context within an HTML `<datalist>` element.
     enum DataListContext: HTMLOptionListContext {}
     /// The context within an HTML `<dl>` element.
-    enum DescriptionListContext: HTMLStylableContext {}
+    enum DescriptionListContext: HTMLStylableContext, HTMLDividableContext {}
     /// The context within an HTML `<details>` element.
     final class DetailsContext: BodyContext {}
     /// The context within an HTML `<embed>` element.
@@ -153,6 +153,8 @@ public protocol HTMLContext {}
 /// Context shared among all HTML elements that can have their dimensions
 /// (width and height) specified through attributes, such as `<video>`.
 public protocol HTMLDimensionContext: HTMLContext {}
+/// Context shared among all HTML elements can be divided using `<div>` elements.
+public protocol HTMLDividableContext: HTMLContext {}
 /// Context shared among all HTML elements that can contain an `<img>` element.
 public protocol HTMLImageContainerContext: HTMLContext {}
 /// Context shared among all HTML elements that act as some form
diff --git a/Sources/Plot/API/HTMLComponents.swift b/Sources/Plot/API/HTMLComponents.swift
index f44f345..7e77c68 100644
--- a/Sources/Plot/API/HTMLComponents.swift
+++ b/Sources/Plot/API/HTMLComponents.swift
@@ -131,7 +131,7 @@ public enum ElementDefinitions {
     /// Definition for the `<button>` element.
     public enum Button: ElementDefinition { public static var wrapper = Node.button }
     /// Definition for the `<div>` element.
-    public enum Div: ElementDefinition { public static var wrapper = Node.div }
+    public enum Div: ElementDefinition { public static var wrapper = Node<HTML.BodyContext>.div }
     /// Definition for the `<fieldset>` element.
     public enum FieldSet: ElementDefinition { public static var wrapper = Node.fieldset }
     /// Definition for the `<footer>` element.
diff --git a/Sources/Plot/API/HTMLElements.swift b/Sources/Plot/API/HTMLElements.swift
index d4eed97..ab5beb7 100644
--- a/Sources/Plot/API/HTMLElements.swift
+++ b/Sources/Plot/API/HTMLElements.swift
@@ -173,12 +173,6 @@ public extension Node where Context: HTML.BodyContext {
         .element(named: "details", nodes: nodes)
     }
 
-    /// Add a `<div>` HTML element within the current context.
-    /// - parameter nodes: The element's attributes and child elements.
-    static func div(_ nodes: Node<HTML.BodyContext>...) -> Node {
-        .element(named: "div", nodes: nodes)
-    }
-
     /// Add a `<dl>` HTML element within the current context.
     /// - parameter nodes: The element's attributes and child elements.
     static func dl(_ nodes: Node<HTML.DescriptionListContext>...) -> Node {
@@ -432,17 +426,6 @@ public extension Node where Context == HTML.DescriptionListContext {
     }
 }
 
-public extension Node where Context == HTML.DescriptionListContext {
-    // The `<div>` element wraps a group, that is part of a term-description group in a description list (`<dl>` element).
-    //
-    // This is allowed according to the HTML spec: // https://html.spec.whatwg.org/multipage/grouping-content.html#the-dl-element
-    //
-    /// - parameter nodes: The element's attributes and child elements (`<dl>` or `<dd>` elements).
-    static func div(_ nodes: Node<HTML.DescriptionListContext>...) -> Node {
-        .element(named: "div", nodes: nodes)
-    }
-}
-
 public extension Node where Context: HTMLOptionListContext {
     /// Add an `<option>` HTML element within the current context.
     /// - parameter nodes: The element's attributes.
@@ -534,3 +517,11 @@ public extension Node where Context: HTMLScriptableContext {
         .element(named: "script", nodes: nodes)
     }
 }
+
+public extension Node where Context: HTMLDividableContext {
+    /// Add a `<div>` HTML element within the current context.
+    /// - parameter nodes: The element's attributes and child elements.
+    static func div(_ nodes: Node<Context>...) -> Node {
+        .element(named: "div", nodes: nodes)
+    }
+}
diff --git a/Tests/PlotTests/HTMLComponentTests.swift b/Tests/PlotTests/HTMLComponentTests.swift
index 911d11c..f2157ab 100644
--- a/Tests/PlotTests/HTMLComponentTests.swift
+++ b/Tests/PlotTests/HTMLComponentTests.swift
@@ -161,8 +161,8 @@ final class HTMLComponentTests: XCTestCase {
     }
 
     func testAddingClassToNode() {
-        let html = Node.div().class("hello").render()
-        XCTAssertEqual(html, #"<div class="hello"></div>"#)
+        let html = Node.div(.p()).class("hello").render()
+        XCTAssertEqual(html, #"<div class="hello"><p></p></div>"#)
     }
 
     func testEnvironmentValuesDoNotApplyToSiblings() {
