From 83da44528363acf6f3b526841ab0bb37eeac7b47 Mon Sep 17 00:00:00 2001
From: Harry Day <contact@harryday.xyz>
Date: Thu, 25 Aug 2022 00:46:03 +0100
Subject: [PATCH 1/8] Add Time Element

---
 Sources/Plot/API/HTML.swift                   |  5 ++++
 Sources/Plot/API/HTMLAttributes.swift         |  8 ++++++
 Sources/Plot/API/HTMLElements.swift           |  8 ++++++
 .../Plot/Internal/DateFormatter+string.swift  | 26 +++++++++++++++++++
 Tests/PlotTests/HTMLTests.swift               | 10 +++++++
 5 files changed, 57 insertions(+)
 create mode 100644 Sources/Plot/Internal/DateFormatter+string.swift

diff --git a/Sources/Plot/API/HTML.swift b/Sources/Plot/API/HTML.swift
index b4df976..5e6e84c 100644
--- a/Sources/Plot/API/HTML.swift
+++ b/Sources/Plot/API/HTML.swift
@@ -138,6 +138,8 @@ public extension HTML {
     enum TableContext: HTMLStylableContext {}
     /// The context within an HTML `<tr>` element.
     enum TableRowContext: HTMLStylableContext {}
+    /// The context within an HTML `<time>` element.
+    enum TimeContext: HTMLDateTimeContext {}
     /// The context within an HTML `<video>` element.
     enum VideoContext: HTMLMediaContext {
         public typealias SourceContext = VideoSourceContext
@@ -148,6 +150,9 @@ public extension HTML {
 
 /// Context shared among all HTML elements.
 public protocol HTMLContext {}
+/// Context shared among all HTML elements that support the `datetime`
+/// attribute, such as `<time>`.
+public protocol HTMLDateTimeContext: 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 {}
diff --git a/Sources/Plot/API/HTMLAttributes.swift b/Sources/Plot/API/HTMLAttributes.swift
index 9c9b8f6..dc79fed 100644
--- a/Sources/Plot/API/HTMLAttributes.swift
+++ b/Sources/Plot/API/HTMLAttributes.swift
@@ -1,3 +1,4 @@
+import Foundation
 /**
 *  Plot
 *  Copyright (c) John Sundell 2019
@@ -191,6 +192,13 @@ public extension Node where Context == HTML.AnchorContext {
     }
 }
 
+// MARK: - DateTime
+public extension Node where Context == HTML.TimeContext {
+    static func datetime(_ datetime: Date) -> Node {
+        .attribute(named: "datetime", value: DateFormatter.ISOstring(from: datetime))
+    }
+}
+
 // MARK: - Interactive elements
 
 public extension Node where Context == HTML.DetailsContext {
diff --git a/Sources/Plot/API/HTMLElements.swift b/Sources/Plot/API/HTMLElements.swift
index 9b5a6b2..7d7a02e 100644
--- a/Sources/Plot/API/HTMLElements.swift
+++ b/Sources/Plot/API/HTMLElements.swift
@@ -1,3 +1,4 @@
+import Foundation
 /**
 *  Plot
 *  Copyright (c) John Sundell 2019
@@ -382,6 +383,13 @@ public extension Node where Context: HTML.BodyContext {
     static func textarea(_ nodes: Node<HTML.TextAreaContext>...) -> Node {
         .element(named: "textarea", nodes: nodes)
     }
+    
+    /// Add a `<time>` HTML element within the current context.
+    /// - parameter datetime: The datetime that the element represents
+    /// - parameter nodes: The element's attributes and nodes.
+    static func time(_ nodes: Node<HTML.TimeContext>...) -> Node {
+        .element(named: "time", nodes: nodes)
+    }
 
     /// Add a `<u>` HTML element within the current context.
     /// - parameter nodes: The element's attributes and child elements.
diff --git a/Sources/Plot/Internal/DateFormatter+string.swift b/Sources/Plot/Internal/DateFormatter+string.swift
new file mode 100644
index 0000000..2b1f430
--- /dev/null
+++ b/Sources/Plot/Internal/DateFormatter+string.swift
@@ -0,0 +1,26 @@
+//
+//  DateFormatter+string.swift
+//  
+//
+//  Created by Harry Day on 24/08/2022
+//  
+//
+//  Twitter: https://twitter.com/harrydayexe
+//  Github: https://github.com/harrydayexe
+//
+    
+
+import Foundation
+
+internal extension DateFormatter {
+    /// Convert a date object into a RF361 compliant datetime string.
+    /// - parameter date: The date object to convert to a string.
+    static func ISOstring(from date: Date) -> String {
+        let df = DateFormatter()
+        df.locale = Locale(identifier: "en_US_POSIX")
+        df.dateFormat = "yyyy-MM-dd'T'HH:mm:ssZZZZZ"
+        df.timeZone = TimeZone(secondsFromGMT: 0)
+        
+        return df.string(from: date)
+    }
+}
diff --git a/Tests/PlotTests/HTMLTests.swift b/Tests/PlotTests/HTMLTests.swift
index 2dd54bb..56c3bdb 100644
--- a/Tests/PlotTests/HTMLTests.swift
+++ b/Tests/PlotTests/HTMLTests.swift
@@ -820,6 +820,16 @@ final class HTMLTests: XCTestCase {
         </picture></body>
         """)
     }
+    
+    func testTime() {
+        let html = HTML(.body(.time(
+            .datetime(Date(timeIntervalSince1970: 1321628079))
+        )))
+        
+        assertEqualHTMLContent(html, """
+        <body><time datetime="2011-11-18T14:54:39Z"></time></body>
+        """)
+    }
 
     func testOnClick() {
         let html = HTML(

From da8a4d0255ca0905b23f60bc283cb88e7fcd5d05 Mon Sep 17 00:00:00 2001
From: Harry Day <contact@harryday.xyz>
Date: Thu, 25 Aug 2022 00:49:25 +0100
Subject: [PATCH 2/8] Write Tests for Time element

---
 Tests/PlotTests/HTMLTests.swift | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Tests/PlotTests/HTMLTests.swift b/Tests/PlotTests/HTMLTests.swift
index 56c3bdb..101e587 100644
--- a/Tests/PlotTests/HTMLTests.swift
+++ b/Tests/PlotTests/HTMLTests.swift
@@ -823,11 +823,14 @@ final class HTMLTests: XCTestCase {
     
     func testTime() {
         let html = HTML(.body(.time(
+            .text("Hello World!"),
             .datetime(Date(timeIntervalSince1970: 1321628079))
         )))
         
         assertEqualHTMLContent(html, """
-        <body><time datetime="2011-11-18T14:54:39Z"></time></body>
+        <body><time datetime="2011-11-18T14:54:39Z">\
+        Hello World!\
+        </time></body>
         """)
     }
 

From a7d5462910e5bad6bde8f54653a36b60506bfc36 Mon Sep 17 00:00:00 2001
From: Harry Day <contact@harryday.xyz>
Date: Thu, 25 Aug 2022 01:32:41 +0100
Subject: [PATCH 3/8] Add Time Component

---
 Sources/Plot/API/HTML.swift              |  2 +-
 Sources/Plot/API/HTMLComponents.swift    | 23 +++++++++++++++++++++++
 Tests/PlotTests/HTMLComponentTests.swift |  8 ++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/Sources/Plot/API/HTML.swift b/Sources/Plot/API/HTML.swift
index 5e6e84c..5d95b40 100644
--- a/Sources/Plot/API/HTML.swift
+++ b/Sources/Plot/API/HTML.swift
@@ -139,7 +139,7 @@ public extension HTML {
     /// The context within an HTML `<tr>` element.
     enum TableRowContext: HTMLStylableContext {}
     /// The context within an HTML `<time>` element.
-    enum TimeContext: HTMLDateTimeContext {}
+    final class TimeContext: BodyContext, HTMLDateTimeContext {}
     /// The context within an HTML `<video>` element.
     enum VideoContext: HTMLMediaContext {
         public typealias SourceContext = VideoSourceContext
diff --git a/Sources/Plot/API/HTMLComponents.swift b/Sources/Plot/API/HTMLComponents.swift
index 87ef29e..ebe280a 100644
--- a/Sources/Plot/API/HTMLComponents.swift
+++ b/Sources/Plot/API/HTMLComponents.swift
@@ -4,6 +4,8 @@
 *  MIT license, see LICENSE file for details
 */
 
+import Foundation
+
 // MARK: - Nodes
 
 public extension Node where Context == HTML.HeadContext {
@@ -850,3 +852,24 @@ public struct TextArea: InputComponent {
         )
     }
 }
+
+/// Component that represents a datetime instance
+public struct Time: Component {
+    /// A closure that provides the components that the row should contain.
+    @ComponentBuilder public var content: ContentProvider
+    /// The datetime that the element represents
+    public var datetime: Date?
+    
+    public init(datetime: Date? = nil,
+                @ComponentBuilder content: @escaping ContentProvider) {
+        self.datetime = datetime
+        self.content = content
+    }
+    
+    public var body: Component {
+        Node.time(
+            .unwrap(datetime, Node.datetime),
+            .component(content())
+        )
+    }
+}
diff --git a/Tests/PlotTests/HTMLComponentTests.swift b/Tests/PlotTests/HTMLComponentTests.swift
index 42dd660..d96a01c 100644
--- a/Tests/PlotTests/HTMLComponentTests.swift
+++ b/Tests/PlotTests/HTMLComponentTests.swift
@@ -426,6 +426,14 @@ final class HTMLComponentTests: XCTestCase {
 
         XCTAssertEqual(html, "<ol><li>One</li><li>Two</li></ol>")
     }
+    
+    func testTime() {
+        let html = Time(datetime: Date(timeIntervalSince1970: 1321628079)) {
+            Paragraph("Hello World")
+        }.render()
+        
+        XCTAssertEqual(html, #"<time datetime="2011-11-18T14:54:39Z"><p>Hello World</p></time>"#)
+    }
 
     func testOrderedListWithExplicitItems() {
         struct SeventhComponent: Component {

From af0927f1409e5ceae4071d3d0172c3ab86c4c3f0 Mon Sep 17 00:00:00 2001
From: Harry Day <contact@harryday.xyz>
Date: Sat, 18 Feb 2023 19:35:55 +0000
Subject: [PATCH 4/8] Fix mistake in comment

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

diff --git a/Sources/Plot/API/HTMLComponents.swift b/Sources/Plot/API/HTMLComponents.swift
index ebe280a..79e49af 100644
--- a/Sources/Plot/API/HTMLComponents.swift
+++ b/Sources/Plot/API/HTMLComponents.swift
@@ -855,7 +855,7 @@ public struct TextArea: InputComponent {
 
 /// Component that represents a datetime instance
 public struct Time: Component {
-    /// A closure that provides the components that the row should contain.
+    /// A closure that provides the contained content.
     @ComponentBuilder public var content: ContentProvider
     /// The datetime that the element represents
     public var datetime: Date?

From 375083bdcccf95082c83179ee86092de22c56ba1 Mon Sep 17 00:00:00 2001
From: Harry Day <contact@harryday.xyz>
Date: Thu, 20 Apr 2023 13:33:29 +0100
Subject: [PATCH 5/8] Change datetime attribute to accept a string

This is to remvove a dependecy on Foundation for a DateFormatter and to
enable the user to select what kind of format they wish to select due to
the multitude of formats available
---
 Sources/Plot/API/HTMLAttributes.swift         |  4 +--
 Sources/Plot/API/HTMLComponents.swift         |  4 +--
 .../Plot/Internal/DateFormatter+string.swift  | 26 -------------------
 Tests/PlotTests/HTMLComponentTests.swift      |  2 +-
 Tests/PlotTests/HTMLTests.swift               |  2 +-
 5 files changed, 6 insertions(+), 32 deletions(-)
 delete mode 100644 Sources/Plot/Internal/DateFormatter+string.swift

diff --git a/Sources/Plot/API/HTMLAttributes.swift b/Sources/Plot/API/HTMLAttributes.swift
index dc79fed..6ab3908 100644
--- a/Sources/Plot/API/HTMLAttributes.swift
+++ b/Sources/Plot/API/HTMLAttributes.swift
@@ -194,8 +194,8 @@ public extension Node where Context == HTML.AnchorContext {
 
 // MARK: - DateTime
 public extension Node where Context == HTML.TimeContext {
-    static func datetime(_ datetime: Date) -> Node {
-        .attribute(named: "datetime", value: DateFormatter.ISOstring(from: datetime))
+    static func datetime(_ datetime: String) -> Node {
+        .attribute(named: "datetime", value: datetime)
     }
 }
 
diff --git a/Sources/Plot/API/HTMLComponents.swift b/Sources/Plot/API/HTMLComponents.swift
index 79e49af..1a12b1e 100644
--- a/Sources/Plot/API/HTMLComponents.swift
+++ b/Sources/Plot/API/HTMLComponents.swift
@@ -858,9 +858,9 @@ public struct Time: Component {
     /// A closure that provides the contained content.
     @ComponentBuilder public var content: ContentProvider
     /// The datetime that the element represents
-    public var datetime: Date?
+    public var datetime: String?
     
-    public init(datetime: Date? = nil,
+    public init(datetime: String? = nil,
                 @ComponentBuilder content: @escaping ContentProvider) {
         self.datetime = datetime
         self.content = content
diff --git a/Sources/Plot/Internal/DateFormatter+string.swift b/Sources/Plot/Internal/DateFormatter+string.swift
deleted file mode 100644
index 2b1f430..0000000
--- a/Sources/Plot/Internal/DateFormatter+string.swift
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-//  DateFormatter+string.swift
-//  
-//
-//  Created by Harry Day on 24/08/2022
-//  
-//
-//  Twitter: https://twitter.com/harrydayexe
-//  Github: https://github.com/harrydayexe
-//
-    
-
-import Foundation
-
-internal extension DateFormatter {
-    /// Convert a date object into a RF361 compliant datetime string.
-    /// - parameter date: The date object to convert to a string.
-    static func ISOstring(from date: Date) -> String {
-        let df = DateFormatter()
-        df.locale = Locale(identifier: "en_US_POSIX")
-        df.dateFormat = "yyyy-MM-dd'T'HH:mm:ssZZZZZ"
-        df.timeZone = TimeZone(secondsFromGMT: 0)
-        
-        return df.string(from: date)
-    }
-}
diff --git a/Tests/PlotTests/HTMLComponentTests.swift b/Tests/PlotTests/HTMLComponentTests.swift
index d96a01c..52bbb0f 100644
--- a/Tests/PlotTests/HTMLComponentTests.swift
+++ b/Tests/PlotTests/HTMLComponentTests.swift
@@ -428,7 +428,7 @@ final class HTMLComponentTests: XCTestCase {
     }
     
     func testTime() {
-        let html = Time(datetime: Date(timeIntervalSince1970: 1321628079)) {
+        let html = Time(datetime: "2011-11-18T14:54:39Z") {
             Paragraph("Hello World")
         }.render()
         
diff --git a/Tests/PlotTests/HTMLTests.swift b/Tests/PlotTests/HTMLTests.swift
index 101e587..3af1e0b 100644
--- a/Tests/PlotTests/HTMLTests.swift
+++ b/Tests/PlotTests/HTMLTests.swift
@@ -824,7 +824,7 @@ final class HTMLTests: XCTestCase {
     func testTime() {
         let html = HTML(.body(.time(
             .text("Hello World!"),
-            .datetime(Date(timeIntervalSince1970: 1321628079))
+            .datetime("2011-11-18T14:54:39Z")
         )))
         
         assertEqualHTMLContent(html, """

From c454ebfb5f83336647c256d18d58b9e7c0a8a55e Mon Sep 17 00:00:00 2001
From: Harry Day <contact@harryday.xyz>
Date: Thu, 20 Apr 2023 13:43:45 +0100
Subject: [PATCH 6/8] Add documentation for datetime attribute

---
 Sources/Plot/API/HTMLAttributes.swift | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Sources/Plot/API/HTMLAttributes.swift b/Sources/Plot/API/HTMLAttributes.swift
index 6ab3908..887686d 100644
--- a/Sources/Plot/API/HTMLAttributes.swift
+++ b/Sources/Plot/API/HTMLAttributes.swift
@@ -194,6 +194,11 @@ public extension Node where Context == HTML.AnchorContext {
 
 // MARK: - DateTime
 public extension Node where Context == HTML.TimeContext {
+    /// Attach a datetime to the time element, to translate the element into
+    /// a machine readable format for browsers.
+    /// - parameter datetime: The datetime string to attach. See
+    /// [datetime reference](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/time#valid_datetime_values)
+    /// for more info
     static func datetime(_ datetime: String) -> Node {
         .attribute(named: "datetime", value: datetime)
     }

From 4140c75ca299848e712d3f864ee73390e66537f6 Mon Sep 17 00:00:00 2001
From: Harry Day <contact@harryday.xyz>
Date: Fri, 21 Apr 2023 16:21:30 +0100
Subject: [PATCH 7/8] Add changes based on review by John

Removed Foundation imports and unneeded HTMLDateTimeContext as well as fixed some
code style issues
---
 Sources/Plot/API/HTML.swift              | 5 +----
 Sources/Plot/API/HTMLAttributes.swift    | 2 +-
 Sources/Plot/API/HTMLComponents.swift    | 6 ++++--
 Sources/Plot/API/HTMLElements.swift      | 2 --
 Tests/PlotTests/HTMLComponentTests.swift | 3 ++-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Sources/Plot/API/HTML.swift b/Sources/Plot/API/HTML.swift
index 5d95b40..1a441db 100644
--- a/Sources/Plot/API/HTML.swift
+++ b/Sources/Plot/API/HTML.swift
@@ -139,7 +139,7 @@ public extension HTML {
     /// The context within an HTML `<tr>` element.
     enum TableRowContext: HTMLStylableContext {}
     /// The context within an HTML `<time>` element.
-    final class TimeContext: BodyContext, HTMLDateTimeContext {}
+    final class TimeContext: BodyContext {}
     /// The context within an HTML `<video>` element.
     enum VideoContext: HTMLMediaContext {
         public typealias SourceContext = VideoSourceContext
@@ -150,9 +150,6 @@ public extension HTML {
 
 /// Context shared among all HTML elements.
 public protocol HTMLContext {}
-/// Context shared among all HTML elements that support the `datetime`
-/// attribute, such as `<time>`.
-public protocol HTMLDateTimeContext: 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 {}
diff --git a/Sources/Plot/API/HTMLAttributes.swift b/Sources/Plot/API/HTMLAttributes.swift
index 887686d..86f8e66 100644
--- a/Sources/Plot/API/HTMLAttributes.swift
+++ b/Sources/Plot/API/HTMLAttributes.swift
@@ -1,4 +1,3 @@
-import Foundation
 /**
 *  Plot
 *  Copyright (c) John Sundell 2019
@@ -193,6 +192,7 @@ public extension Node where Context == HTML.AnchorContext {
 }
 
 // MARK: - DateTime
+
 public extension Node where Context == HTML.TimeContext {
     /// Attach a datetime to the time element, to translate the element into
     /// a machine readable format for browsers.
diff --git a/Sources/Plot/API/HTMLComponents.swift b/Sources/Plot/API/HTMLComponents.swift
index 1a12b1e..88b1ea2 100644
--- a/Sources/Plot/API/HTMLComponents.swift
+++ b/Sources/Plot/API/HTMLComponents.swift
@@ -4,8 +4,6 @@
 *  MIT license, see LICENSE file for details
 */
 
-import Foundation
-
 // MARK: - Nodes
 
 public extension Node where Context == HTML.HeadContext {
@@ -860,6 +858,10 @@ public struct Time: Component {
     /// The datetime that the element represents
     public var datetime: String?
     
+    /// Initialize a time component.
+    /// - parameters:
+    ///   - datetime: An optional, machine-readable, datetime string to describe the time represented.
+    ///   - content: A closure that provides the form's child components.
     public init(datetime: String? = nil,
                 @ComponentBuilder content: @escaping ContentProvider) {
         self.datetime = datetime
diff --git a/Sources/Plot/API/HTMLElements.swift b/Sources/Plot/API/HTMLElements.swift
index 7d7a02e..99e72ea 100644
--- a/Sources/Plot/API/HTMLElements.swift
+++ b/Sources/Plot/API/HTMLElements.swift
@@ -1,4 +1,3 @@
-import Foundation
 /**
 *  Plot
 *  Copyright (c) John Sundell 2019
@@ -385,7 +384,6 @@ public extension Node where Context: HTML.BodyContext {
     }
     
     /// Add a `<time>` HTML element within the current context.
-    /// - parameter datetime: The datetime that the element represents
     /// - parameter nodes: The element's attributes and nodes.
     static func time(_ nodes: Node<HTML.TimeContext>...) -> Node {
         .element(named: "time", nodes: nodes)
diff --git a/Tests/PlotTests/HTMLComponentTests.swift b/Tests/PlotTests/HTMLComponentTests.swift
index 52bbb0f..b831007 100644
--- a/Tests/PlotTests/HTMLComponentTests.swift
+++ b/Tests/PlotTests/HTMLComponentTests.swift
@@ -430,7 +430,8 @@ final class HTMLComponentTests: XCTestCase {
     func testTime() {
         let html = Time(datetime: "2011-11-18T14:54:39Z") {
             Paragraph("Hello World")
-        }.render()
+        }
+        .render()
         
         XCTAssertEqual(html, #"<time datetime="2011-11-18T14:54:39Z"><p>Hello World</p></time>"#)
     }

From 2137a05841af4cb6a7623b3c55fc8b5abb526122 Mon Sep 17 00:00:00 2001
From: John Sundell <john@sundell.co>
Date: Tue, 9 May 2023 11:31:48 +0200
Subject: [PATCH 8/8] Time: Documentation + property order tweaks

---
 Sources/Plot/API/HTMLComponents.swift | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Sources/Plot/API/HTMLComponents.swift b/Sources/Plot/API/HTMLComponents.swift
index 88b1ea2..45d395d 100644
--- a/Sources/Plot/API/HTMLComponents.swift
+++ b/Sources/Plot/API/HTMLComponents.swift
@@ -853,15 +853,15 @@ public struct TextArea: InputComponent {
 
 /// Component that represents a datetime instance
 public struct Time: Component {
-    /// A closure that provides the contained content.
-    @ComponentBuilder public var content: ContentProvider
     /// The datetime that the element represents
     public var datetime: String?
+    /// A closure that provides the contained content.
+    @ComponentBuilder public var content: ContentProvider
     
     /// Initialize a time component.
     /// - parameters:
     ///   - datetime: An optional, machine-readable, datetime string to describe the time represented.
-    ///   - content: A closure that provides the form's child components.
+    ///   - content: A closure that provides the contained content.
     public init(datetime: String? = nil,
                 @ComponentBuilder content: @escaping ContentProvider) {
         self.datetime = datetime