Updated JSDate

swiftwasm · colemancda · Jun 3, 2020 · Jun 3, 2020 · Jun 3, 2020 · Jun 3, 2020
commit 9fbb5e75c2a94950f2779b44e221a95092825407
diff --git a/Example/JavaScriptKitExample/Sources/JavaScriptKitExample/main.swift b/Example/JavaScriptKitExample/Sources/JavaScriptKitExample/main.swift
@@ -9,7 +9,9 @@ divElement.innerText = "Swift Bluetooth Web App"
 let body = document.body.object!
 _ = body.appendChild!(divElement)
 
-JSConsole.log("Date:", Date())
+let date = Date()
+JSConsole.info("Date:", date)
+JSConsole.log(date.description)
 
 if let bluetooth = JSBluetooth.shared {
     bluetooth.isAvailable.then {

diff --git a/Sources/JavaScriptKit/Foundation/Date.swift b/Sources/JavaScriptKit/Foundation/Date.swift
@@ -72,7 +72,7 @@ public extension SwiftFoundation.Date {
 extension SwiftFoundation.Date: CustomStringConvertible {
 
     public var description: String {
-        return JSDate(self).description
+        return JSDate(self).toUTCString()
     }
 }
 
@@ -96,10 +96,31 @@ public extension JSDate {
     }
 }
 
+public extension SwiftFoundation.Date {
+
+    init(_ date: JSDate) {
+        self.init(timeIntervalSince1970: date.rawValue)
+    }
+}
+
+// MARK: - JSValueConvertible
+
 extension SwiftFoundation.Date: JSValueConvertible {
 
     public func jsValue() -> JSValue {
         let date = JSDate()
         return date.jsValue()
     }
 }
+
+// MARK: - JSValueConstructible
+
+extension SwiftFoundation.Date: JSValueConstructible {
+
+    public static func construct(from value: JSValue) -> Date? {
+        return value.object
+            .flatMap { JSDate($0) }
+            .flatMap { Date($0) }
+            ?? value.number.flatMap { Date(timeIntervalSince1970: $0) }
+    }
+}
diff --git a/Sources/JavaScriptKit/JS Types/JSDate.swift b/Sources/JavaScriptKit/JS Types/JSDate.swift
@@ -53,18 +53,52 @@ public final class JSDate: JSType {
     ///
     /// - Returns: A Number representing the milliseconds elapsed since the UNIX epoch.
     public static var now: Double {
-        guard let function = classObject.now.function,
-            let timeInterval = function().number
-            else { fatalError() }
-        return timeInterval
+        let function = classObject.now.function.assert()
+        return function().number.assert()
+    }
+
+    // MARK: - Accessors
+
+    /// Converts a date to a string following the ISO 8601 Extended Format.
+    public func toISOString() -> String {
+        let function = jsObject.toISOString.function.assert()
+        return function.apply(this: jsObject).string.assert()
+    }
+
+    /// Returns a string representing the Date using `toISOString()`. Intended for use by JSON.stringify().
+    public func toJSON() -> String {
+        let function = jsObject.toJSON.function.assert()
+        return function.apply(this: jsObject).string.assert()
+    }
+
+    /// Converts a date to a string using the UTC timezone.
+    public func toUTCString() -> String {
+        let function = jsObject.toUTCString.function.assert()
+        return function.apply(this: jsObject).string.assert()
     }
 }
 
+// MARK: - Constants
+
 internal extension JSDate {
 
     static let classObject = JSObjectRef.global.Date.function!
 }
 
+// MARK: - RawRepresentable
+
+extension JSDate: RawRepresentable {
+
+    public convenience init(rawValue: Double) {
+        self.init(timeInterval: rawValue)
+    }
+
+    public var rawValue: Double {
+        let function = jsObject.valueOf.function.assert("Invalid function \(#function)")
+        return function.apply(this: jsObject).number.assert()
+    }
+}
+
 // MARK: - CustomStringConvertible
 
 extension JSDate: CustomStringConvertible { }