Enable format validation and fix bugs.

src/JsonSchemaMapper/JsonSchemaMapper.cs

@@ -840,6 +840,8 @@ public SimpleTypeJsonSchema(JsonSchemaType schemaType, string? format = null, st
  public bool IsIeeeFloatingPoint { get; }
  }
 
+ private const string Iso8601DateTimeRegex = @"^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2})?$";
+
  private static readonly Dictionary<Type, SimpleTypeJsonSchema> s_simpleTypeInfo = new()
  {
  [typeof(object)] = new(JsonSchemaType.Any),
@@ -867,7 +869,7 @@ public SimpleTypeJsonSchema(JsonSchemaType schemaType, string? format = null, st
  [typeof(byte[])] = new(JsonSchemaType.String),
  [typeof(Memory<byte>)] = new(JsonSchemaType.String),
  [typeof(ReadOnlyMemory<byte>)] = new(JsonSchemaType.String),
- [typeof(DateTime)] = new(JsonSchemaType.String, format: "date-time"),
+ [typeof(DateTime)] = new(JsonSchemaType.String, pattern: Iso8601DateTimeRegex),
  [typeof(DateTimeOffset)] = new(JsonSchemaType.String, format: "date-time"),
 
  // TimeSpan is represented as a string in the format "[-][d.]hh:mm:ss[.fffffff]".
@@ -878,7 +880,7 @@ public SimpleTypeJsonSchema(JsonSchemaType schemaType, string? format = null, st
 #endif
  [typeof(Guid)] = new(JsonSchemaType.String, format: "uuid"),
  [typeof(Uri)] = new(JsonSchemaType.String, format: "uri"),
- [typeof(Version)] = new(JsonSchemaType.String, format: @"^\d+(\.\d+){1,3}$"),
+ [typeof(Version)] = new(JsonSchemaType.String, pattern: @"^\d+(\.\d+){1,3}$"),
  [typeof(JsonDocument)] = new(JsonSchemaType.Any),
  [typeof(JsonElement)] = new(JsonSchemaType.Any),
  [typeof(JsonNode)] = new(JsonSchemaType.Any),

tests/JsonSchemaMapper.Tests/Helpers.cs

@@ -70,7 +70,7 @@ Instance JSON document matches the specified schema.
  private static EvaluationResults EvaluateSchemaCore(JsonNode schema, JsonNode? instance)
  {
  JsonSchema jsonSchema = JsonSerializer.Deserialize(schema, Context.Default.JsonSchema)!;
- EvaluationOptions options = new() { OutputFormat = OutputFormat.List };
+ EvaluationOptions options = new() { OutputFormat = OutputFormat.List, RequireFormatValidation = true };
  return jsonSchema.Evaluate(instance, options);
  }
 

tests/JsonSchemaMapper.Tests/TestTypes.cs

@@ -56,12 +56,13 @@ public static IEnumerable<ITestData> GetTestDataCore()
  yield return new TestData<ReadOnlyMemory<byte>>(new byte[] { 1, 2, 3 }, ExpectedJsonSchema: """{"type":"string"}""");
  yield return new TestData<DateTime>(
  Value: new(2021, 1, 1),
- AdditionalValues: [DateTime.MinValue, DateTime.MaxValue]);
+ AdditionalValues: [DateTime.MinValue, DateTime.MaxValue],
+ ExpectedJsonSchema: """{"type":"string","pattern":"^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(?:\\.\\d\u002B)?(?:Z|[\u002B-]\\d{2}:\\d{2})?$"}""");
 
  yield return new TestData<DateTimeOffset>(
  Value: new(new DateTime(2021, 1, 1), TimeSpan.Zero), 
  AdditionalValues: [DateTimeOffset.MinValue, DateTimeOffset.MaxValue],
- ExpectedJsonSchema: """{"type":"string","format": "date-time"}""");
+ ExpectedJsonSchema: """{"type":"string","format":"date-time"}""");
 
  yield return new TestData<TimeSpan>(
  Value: new(hours: 5, minutes: 13, seconds: 3),
@@ -74,7 +75,7 @@ public static IEnumerable<ITestData> GetTestDataCore()
 #endif
  yield return new TestData<Guid>(Guid.Empty);
  yield return new TestData<Uri>(new("http://example.com"));
- yield return new TestData<Version>(new(1, 2, 3, 4), ExpectedJsonSchema: """{"type":"string","format":"^\\d+(\\.\\d+){1,3}$"}""");
+ yield return new TestData<Version>(new(1, 2, 3, 4), ExpectedJsonSchema: """{"type":"string","pattern":"^\\d+(\\.\\d+){1,3}$"}""");
  yield return new TestData<JsonDocument>(JsonDocument.Parse("""[{ "x" : 42 }]"""), ExpectedJsonSchema: "{}");
  yield return new TestData<JsonElement>(JsonDocument.Parse("""[{ "x" : 42 }]""").RootElement, ExpectedJsonSchema: "{}");
  yield return new TestData<JsonNode>(JsonNode.Parse("""[{ "x" : 42 }]"""));