feat: Add support for date-time format

Author: VictorAGA

Sources/Draft201909Validator.swift

@@ -64,6 +64,7 @@ public class Draft201909Validator: Validator {
     "duration": validateDuration,
     "time": validateTime,
     "date": validateDate,
+    "date-time": validateDateTime,
   ]
 
   public required init(schema: Bool) {

Sources/Draft202012Validator.swift

@@ -65,6 +65,7 @@ public class Draft202012Validator: Validator {
     "duration": validateDuration,
     "time": validateTime,
     "date": validateDate,
+    "date-time": validateDateTime,
   ]
 
   public required init(schema: Bool) {

Sources/Draft4Validator.swift

@@ -45,6 +45,7 @@ public class Draft4Validator: Validator {
     "ipv4": validateIPv4,
     "ipv6": validateIPv6,
     "uri": validateURI,
+    "date-time": validateDateTime,
   ]
 
   public required init(schema: Bool) {

Sources/Draft7Validator.swift

@@ -52,6 +52,7 @@ public class Draft7Validator: Validator {
     "regex": validateRegex,
     "time": validateTime,
     "date": validateDate,
+    "date-time": validateDateTime,
   ]
 
   public required init(schema: Bool) {

Sources/Format/date-time.swift

@@ -0,0 +1,37 @@
+import Foundation
+
+func isValidDateTime(_ value: String) -> Bool {
+    var valueArray = value.components(separatedBy: "T")
+    if valueArray.count < 2 {
+        valueArray = value.components(separatedBy: "t")
+        if valueArray.count < 2 {
+          valueArray = value.components(separatedBy: " ")
+          if valueArray.count < 2 {
+            return false
+          }
+        }
+    }
+
+    let date = valueArray[0]
+    let time = valueArray[1]
+
+    if isValidDate(date) && isValidTime(time) {
+      return true
+    } else {
+      return false
+    }
+}
+
+func validateDateTime(_ context: Context, _ value: String) -> AnySequence<ValidationError> {
+  if isValidDateTime(value) {
+    return AnySequence(EmptyCollection())
+  }
+
+  return AnySequence([
+    ValidationError(
+      "'\(value)' is not a valid RFC 3339 formatted time.",
+      instanceLocation: context.instanceLocation,
+      keywordLocation: context.keywordLocation
+    )
+  ])
+}

Sources/Format/date.swift

@@ -1,25 +1,27 @@
 import Foundation
 
-
-func validateDate(_ context: Context, _ value: String) -> AnySequence<ValidationError> {
+func isValidDate(_ value: String) -> Bool {
   if let regularExpression = try? NSRegularExpression(pattern: "^\\d{4}-\\d{2}-\\d{2}$", options: []) {
     let range = NSRange(location: 0, length: value.utf16.count)
     let result = regularExpression.matches(in: value, options: [], range: range)
     if result.isEmpty  {
-      return AnySequence([
-        ValidationError(
-          "'\(value)' is not a valid RFC 3339 formatted date.",
-          instanceLocation: context.instanceLocation,
-          keywordLocation: context.keywordLocation
-        )
-      ])
+      return false
     }
   }
 
   let rfc3339DateTimeFormatter = DateFormatter()
 
   rfc3339DateTimeFormatter.dateFormat = "yyyy-MM-dd"
   if rfc3339DateTimeFormatter.date(from: value) != nil {
+    return true
+  }
+
+  return false
+}
+
+func validateDate(_ context: Context, _ value: String) -> AnySequence<ValidationError> {
+
+  if isValidDate(value) {
     return AnySequence(EmptyCollection())
   }
 

Tests/JSONSchemaTests/JSONSchemaCases.swift

@@ -18,7 +18,6 @@ public let testSchemaCases: ((ContextType) -> Void) = {
       "infinite-loop-detection.json",
 
       // optional formats
-      "date-time.json",
       "email.json",
       "hostname.json",
     ] + additionalExclusions, in: context, with: draft4Validator)
@@ -125,7 +124,6 @@ public let testSchemaCases: ((ContextType) -> Void) = {
 
       // optional, format
       "format.json",
-      "date-time.json",
       "email.json",
       "hostname.json",
       "idn-email.json",