From e410613aa47bfc98853f5617c7655d67cadfb2e3 Mon Sep 17 00:00:00 2001
From: John Sundell <john@sundell.co>
Date: Sat, 9 May 2020 20:23:18 +0200
Subject: [PATCH] HTML: Constrain <form>-specific elements to BodyContext
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This change moves the APIs for creating what can be seen as “form-specific”
HTML elements (such as `<input>` and `<fieldset>`) from an extension
constrained to `HTML.FormContext` to the main `HTML.BodyContext` instead.
This enables such elements to be mixed and matched with other body elements,
such as `<div>`.

While such elements might most often appear within forms, there’s nothing
within the HTML spec that enforces that, so neither should Plot.
---
 Sources/Plot/API/HTMLElements.swift | 40 +++++++++++++----------------
 Tests/PlotTests/HTMLTests.swift     | 23 +++++++++++++++++
 2 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/Sources/Plot/API/HTMLElements.swift b/Sources/Plot/API/HTMLElements.swift
index 37a248f..9dd54b8 100644
--- a/Sources/Plot/API/HTMLElements.swift
+++ b/Sources/Plot/API/HTMLElements.swift
@@ -188,6 +188,12 @@ public extension Node where Context: HTML.BodyContext {
         .selfClosedElement(named: "embed", attributes: attributes)
     }
 
+    /// Add a `<fieldset>` HTML element within the current context.
+    /// - parameter nodes: The element's attributes and child elements.
+    static func fieldset(_ nodes: Node<HTML.FormContext>...) -> Node {
+        .element(named: "fieldset", nodes: nodes)
+    }
+
     /// Add a `<form>` HTML element within the current context.
     /// - parameter nodes: The element's attributes and child elements.
     static func form(_ nodes: Node<HTML.FormContext>...) -> Node {
@@ -259,6 +265,12 @@ public extension Node where Context: HTML.BodyContext {
         .element(named: "iframe", attributes: attributes)
     }
 
+    /// Add an `<input/>` HTML element within the current context.
+    /// - parameter nodes: The element's attributes.
+    static func input(_ attributes: Attribute<HTML.InputContext>...) -> Node {
+        .selfClosedElement(named: "input", attributes: attributes)
+    }
+
     /// Add an `<ins>` HTML element within the current context.
     /// - parameter nodes: The element's attributes and child elements.
     static func ins(_ nodes: Node<HTML.BodyContext>...) -> Node {
@@ -349,6 +361,12 @@ public extension Node where Context: HTML.BodyContext {
         .element(named: "table", nodes: nodes)
     }
 
+    /// Add a `<textarea>` HTML element within the current context.
+    /// - parameter nodes: The element's attributes and nodes.
+    static func textarea(_ nodes: Node<HTML.TextAreaContext>...) -> Node {
+        .element(named: "textarea", nodes: nodes)
+    }
+
     /// Add a `<u>` HTML element within the current context.
     /// - parameter nodes: The element's attributes and child elements.
     static func u(_ nodes: Node<HTML.BodyContext>...) -> Node {
@@ -448,28 +466,6 @@ public extension Node where Context: HTMLSourceListContext {
     }
 }
 
-// MARK: - Forms
-
-public extension Node where Context == HTML.FormContext {
-    /// Add a `<fieldset>` HTML element within the current context.
-    /// - parameter nodes: The element's attributes and child elements.
-    static func fieldset(_ nodes: Node<HTML.FormContext>...) -> Node {
-        .element(named: "fieldset", nodes: nodes)
-    }
-
-    /// Add an `<input/>` HTML element within the current context.
-    /// - parameter nodes: The element's attributes.
-    static func input(_ attributes: Attribute<HTML.InputContext>...) -> Node {
-        .selfClosedElement(named: "input", attributes: attributes)
-    }
-    
-    /// Add a `<textarea>` HTML element within the current context.
-    /// - parameter nodes: The element's attributes and nodes.
-    static func textarea(_ nodes: Node<HTML.TextAreaContext>...) -> Node {
-        .element(named: "textarea", nodes: nodes)
-    }
-}
-
 // MARK: - Other
 
 public extension Node where Context == HTML.DetailsContext {
diff --git a/Tests/PlotTests/HTMLTests.swift b/Tests/PlotTests/HTMLTests.swift
index c909e72..b6c49b1 100644
--- a/Tests/PlotTests/HTMLTests.swift
+++ b/Tests/PlotTests/HTMLTests.swift
@@ -342,6 +342,28 @@ final class HTMLTests: XCTestCase {
         </body>
         """)
     }
+
+    func testFormWithBodyNodes() {
+        let html = HTML(.body(
+            .form(
+                .method(.post),
+                .div(
+                    .class("wrapper"),
+                    .p("Text"),
+                    .input(
+                        .type(.submit),
+                        .value("Action")
+                    )
+                )
+            )
+        ))
+
+        assertEqualHTMLContent(html, """
+        <body><form method="post"><div class="wrapper">\
+        <p>Text</p><input type="submit" value="Action"/>\
+        </div></form></body>
+        """)
+    }
     
     func testHeadings() {
         let html = HTML(.body(
@@ -722,6 +744,7 @@ extension HTMLTests {
             ("testFormContentType", testFormContentType),
             ("testFormMethod", testFormMethod),
             ("testFormNoValidate", testFormNoValidate),
+            ("testFormWithBodyNodes", testFormWithBodyNodes),
             ("testHeadings", testHeadings),
             ("testParagraph", testParagraph),
             ("testImage", testImage),