Add support for date, time, and date-time validators, and support a greater range of schema ids.

.gitignore

@@ -1 +1,2 @@
 /.build/
+/.swiftpm/

Sources/Draft201909Validator.swift

@@ -58,6 +58,9 @@ public class Draft201909Validator: Validator {
     "ipv4": validateIPv4,
     "ipv6": validateIPv6,
     "uri": validateURI,
+    "date-time": validateDateTime,
+    "date": validateDate,
+    "time": validateTime,
     "uuid": validateUUID,
     "regex": validateRegex,
     "json-pointer": validateJSONPointer,

Sources/Draft202012Validator.swift

@@ -56,11 +56,14 @@ public class Draft202012Validator: Validator {
   ]
 
   let formats: [String: (Context, String) -> (AnySequence<ValidationError>)] = [
+    "date-time": validateDateTime,
+    "date": validateDate,
     "ipv4": validateIPv4,
     "ipv6": validateIPv6,
     "uri": validateURI,
     "uuid": validateUUID,
     "regex": validateRegex,
+    "time": validateTime,
     "json-pointer": validateJSONPointer,
   ]
 

Sources/Draft7Validator.swift

@@ -48,6 +48,9 @@ public class Draft7Validator: Validator {
     "ipv4": validateIPv4,
     "ipv6": validateIPv6,
     "uri": validateURI,
+    "date-time": validateDateTime,
+    "date": validateDate,
+    "time": validateTime,
     "json-pointer": validateJSONPointer,
     "regex": validateRegex,
   ]

Sources/JSONSchema.swift

@@ -64,9 +64,10 @@ public struct Schema {
 
 
 func validator(for schema: [String: Any]) -> Validator {
-  guard let schemaURI = schema["$schema"] as? String else {
+  guard var schemaURI = schema["$schema"] as? String else {
     return Draft4Validator(schema: schema)
   }
+  schemaURI = schemaURI.replacingOccurrences(of: "http://", with: "https://").trimmingCharacters(in: ["#", "/"])
 
   if let id = DRAFT_2020_12_META_SCHEMA["$id"] as? String, schemaURI == id {
     return Draft202012Validator(schema: schema)

Sources/Validation/datetime.swift

@@ -0,0 +1,46 @@
+import Foundation
+
+func validateDateTime(_ context: Context, _ value: Any) -> AnySequence<ValidationError> {
+  if let date = value as? String {
+    if let regularExpression = try? NSRegularExpression(pattern: "^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}", options: .caseInsensitive) {
+      let range = NSRange(location: 0, length: date.utf16.count)
+      let result = regularExpression.matches(in: date, options: [], range: range)
+      if result.isEmpty  {
+        return AnySequence([
+          ValidationError(
+              "'\(date)' is not a valid RFC 3339 formatted date.",
+            instanceLocation: context.instanceLocation,
+            keywordLocation: context.keywordLocation
+          )
+        ])
+      }
+    }
+
+    let rfc3339DateTimeFormatter = DateFormatter()
+
+    rfc3339DateTimeFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssZZZZZ"
+    if rfc3339DateTimeFormatter.date(from: date) != nil {
+      return AnySequence(EmptyCollection())
+    }
+
+    rfc3339DateTimeFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
+    if rfc3339DateTimeFormatter.date(from: date) != nil {
+      return AnySequence(EmptyCollection())
+    }
+
+    rfc3339DateTimeFormatter.dateFormat = "yyyy-MM-dd't'HH:mm:ss.SSS'z'"
+    if rfc3339DateTimeFormatter.date(from: date) != nil {
+      return AnySequence(EmptyCollection())
+    }
+
+    return AnySequence([
+      ValidationError(
+        "'\(date)' is not a valid RFC 3339 formatted date-time.",
+        instanceLocation: context.instanceLocation,
+        keywordLocation: context.keywordLocation
+      )
+    ])
+  }
+
+  return AnySequence(EmptyCollection())
+}

Sources/Validation/time.swift

@@ -0,0 +1,27 @@
+import Foundation
+
+func validateTime(_ context: Context, _ value: Any) -> AnySequence<ValidationError> {
+  if let date = value as? String {
+    let rfc3339DateTimeFormatter = DateFormatter()
+
+    rfc3339DateTimeFormatter.dateFormat = "HH:mm:ss.SSSZZZZZ"
+    if rfc3339DateTimeFormatter.date(from: date) != nil {
+      return AnySequence(EmptyCollection())
+    }
+
+    rfc3339DateTimeFormatter.dateFormat = "HH:mm:ssZZZZZ"
+    if rfc3339DateTimeFormatter.date(from: date) != nil {
+      return AnySequence(EmptyCollection())
+    }
+
+    return AnySequence([
+      ValidationError(
+        "'\(date)' is not a valid RFC 3339 formatted time.",
+        instanceLocation: context.instanceLocation,
+        keywordLocation: context.keywordLocation
+      )
+    ])
+  }
+
+  return AnySequence(EmptyCollection())
+}

Sources/Validators.swift

@@ -145,7 +145,6 @@ func isEqual(_ lhs: NSObject, _ rhs: NSObject) -> Bool {
   return lhs == rhs
 }
 
-
 extension Sequence where Iterator.Element == ValidationError {
   func validationResult() -> ValidationResult {
     let errors = Array(self)

Sources/format.swift

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

Tests/JSONSchemaTests/JSONSchemaCases.swift

@@ -117,7 +117,6 @@ class JSONSchemaCases: XCTestCase {
       "infinite-loop-detection.json",
 
       // optional formats
-      "date-time.json",
       "email.json",
       "hostname.json",
       "uri-reference.json",
@@ -137,16 +136,13 @@ class JSONSchemaCases: XCTestCase {
       "infinite-loop-detection.json",
 
       // optional, format
-      "date-time.json",
-      "date.json",
       "email.json",
       "hostname.json",
       "idn-email.json",
       "idn-hostname.json",
       "iri-reference.json",
       "iri.json",
       "relative-json-pointer.json",
-      "time.json",
       "uri-reference.json",
       "uri-template.json",
     ] + additionalExclusions)
@@ -173,8 +169,6 @@ class JSONSchemaCases: XCTestCase {
 
       // optional, format
       "format.json",
-      "date-time.json",
-      "date.json",
       "duration.json",
       "email.json",
       "hostname.json",
@@ -183,7 +177,6 @@ class JSONSchemaCases: XCTestCase {
       "iri-reference.json",
       "iri.json",
       "relative-json-pointer.json",
-      "time.json",
       "uri-reference.json",
       "uri-template.json",
     ] + additionalExclusions)
@@ -212,8 +205,6 @@ class JSONSchemaCases: XCTestCase {
 
       // optional, format
       "format.json",
-      "date-time.json",
-      "date.json",
       "duration.json",
       "email.json",
       "hostname.json",
@@ -222,7 +213,6 @@ class JSONSchemaCases: XCTestCase {
       "iri-reference.json",
       "iri.json",
       "relative-json-pointer.json",
-      "time.json",
       "uri-reference.json",
       "uri-template.json",
     ] + additionalExclusions)
@@ -245,7 +235,7 @@ class JSONSchemaCases: XCTestCase {
         return cases.filter {
           if let schema = $0.schema as? [String: Any] {
             let format = schema["format"] as! String
-            return !["date-time", "email", "hostname"].contains(format)
+            return !["email", "hostname"].contains(format)
           }
 
           return true

Tests/JSONSchemaTests/Validation/TestTime.swift

@@ -0,0 +1,16 @@
+import XCTest
+@testable import JSONSchema
+
+
+class TimeFormatTests: XCTestCase {
+  func testTimeWithoutSecondFraction() throws {
+    let schema: [String: Any] = [
+      "$schema": "https://json-schema.org/draft/2020-12/schema",
+      "format": "time",
+    ]
+
+    let result = try validate("23:59:50Z", schema: schema)
+
+    XCTAssertTrue(result.valid)
+  }
+}