feat: add contains/minContains/maxContains members

Author: Poltuu

src/Microsoft.OpenApi/Models/Interfaces/IOpenApiSchema.cs

@@ -193,6 +193,25 @@ public interface IOpenApiSchema : IOpenApiDescribedElement, IOpenApiReadOnlyExte
     /// </summary>
     public bool? UniqueItems { get; }
 
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-core#name-contains
+    /// An array instance is valid if at least one of its elements is valid against this schema.
+    /// Inline or referenced schema MUST be of a Schema Object and not a standard JSON Schema.
+    /// </summary>
+    public IOpenApiSchema? Contains { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// The number of elements matching the "contains" schema MUST be less than or equal to this value.
+    /// </summary>
+    public int? MaxContains { get; }
+
+    /// <summary>
+    /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
+    /// The number of elements matching the "contains" schema MUST be greater than or equal to this value.
+    /// </summary>
+    public int? MinContains { get; }
+
     /// <summary>
     /// Follow JSON Schema definition: https://json-schema.org/draft/2020-12/json-schema-validation
     /// Property definitions MUST be a Schema Object and not a standard JSON Schema (inline or referenced).

src/Microsoft.OpenApi/Models/OpenApiConstants.cs

@@ -485,6 +485,21 @@ public static class OpenApiConstants
         /// </summary>
         public const string UniqueItems = "uniqueItems";
 
+        /// <summary>
+        /// Field: Contains
+        /// </summary>
+        public const string Contains = "contains";
+
+        /// <summary>
+        /// Field: MaxContains
+        /// </summary>
+        public const string MaxContains = "maxContains";
+
+        /// <summary>
+        /// Field: MinContains
+        /// </summary>
+        public const string MinContains = "minContains";
+
         /// <summary>
         /// Field: MaxProperties
         /// </summary>

src/Microsoft.OpenApi/Models/OpenApiSchema.cs

@@ -207,6 +207,15 @@ public string? Minimum
         /// <inheritdoc />
         public bool? UniqueItems { get; set; }
 
+        /// <inheritdoc />
+        public IOpenApiSchema? Contains { get; set; }
+
+        /// <inheritdoc />
+        public int? MaxContains { get; set; }
+
+        /// <inheritdoc />
+        public int? MinContains { get; set; }
+
         /// <inheritdoc />
         public IDictionary<string, IOpenApiSchema>? Properties { get; set; }
 
@@ -318,6 +327,9 @@ internal OpenApiSchema(IOpenApiSchema schema)
             MaxItems = schema.MaxItems ?? MaxItems;
             MinItems = schema.MinItems ?? MinItems;
             UniqueItems = schema.UniqueItems ?? UniqueItems;
+            Contains = schema.Contains?.CreateShallowCopy();
+            MaxContains = schema.MaxContains ?? MaxContains;
+            MinContains = schema.MinContains ?? MinContains;
             Properties = schema.Properties != null ? new Dictionary<string, IOpenApiSchema>(schema.Properties) : null;
             PatternProperties = schema.PatternProperties != null ? new Dictionary<string, IOpenApiSchema>(schema.PatternProperties) : null;
             MaxProperties = schema.MaxProperties ?? MaxProperties;
@@ -630,6 +642,15 @@ internal void WriteJsonSchemaKeywords(IOpenApiWriter writer)
             writer.WriteOptionalCollection(OpenApiConstants.Examples, Examples, (nodeWriter, s) => nodeWriter.WriteAny(s));
             writer.WriteOptionalMap(OpenApiConstants.PatternProperties, PatternProperties, (w, s) => s.SerializeAsV31(w));
             writer.WriteOptionalMap(OpenApiConstants.DependentRequired, DependentRequired, (w, s) => w.WriteValue(s));
+
+            // contains
+            writer.WriteOptionalObject(OpenApiConstants.Contains, Contains, (w, s) => s.SerializeAsV31(w));
+
+            // maxContains
+            writer.WriteProperty(OpenApiConstants.MaxContains, MaxContains);
+
+            // minContains
+            writer.WriteProperty(OpenApiConstants.MinContains, MinContains);
         }
 
         internal void WriteAsItemsProperties(IOpenApiWriter writer)

src/Microsoft.OpenApi/Models/References/OpenApiSchemaReference.cs

@@ -120,6 +120,12 @@ public bool WriteOnly
         /// <inheritdoc/>
         public bool? UniqueItems { get => Target?.UniqueItems; }
         /// <inheritdoc/>
+        public IOpenApiSchema? Contains { get => Target?.Contains; }
+        /// <inheritdoc/>
+        public int? MaxContains { get => Target?.MaxContains; }
+        /// <inheritdoc/>
+        public int? MinContains { get => Target?.MinContains; }
+        /// <inheritdoc/>
         public IDictionary<string, IOpenApiSchema>? Properties { get => Target?.Properties; }
         /// <inheritdoc/>
         public IDictionary<string, IOpenApiSchema>? PatternProperties { get => Target?.PatternProperties; }

src/Microsoft.OpenApi/PublicAPI.Unshipped.txt

@@ -1 +1,16 @@
 #nullable enable
+const Microsoft.OpenApi.OpenApiConstants.Contains = "contains" -> string!
+const Microsoft.OpenApi.OpenApiConstants.MaxContains = "maxContains" -> string!
+const Microsoft.OpenApi.OpenApiConstants.MinContains = "minContains" -> string!
+Microsoft.OpenApi.IOpenApiSchema.Contains.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.IOpenApiSchema.MaxContains.get -> int?
+Microsoft.OpenApi.IOpenApiSchema.MinContains.get -> int?
+Microsoft.OpenApi.OpenApiSchema.Contains.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSchema.Contains.set -> void
+Microsoft.OpenApi.OpenApiSchema.MaxContains.get -> int?
+Microsoft.OpenApi.OpenApiSchema.MaxContains.set -> void
+Microsoft.OpenApi.OpenApiSchema.MinContains.get -> int?
+Microsoft.OpenApi.OpenApiSchema.MinContains.set -> void
+Microsoft.OpenApi.OpenApiSchemaReference.Contains.get -> Microsoft.OpenApi.IOpenApiSchema?
+Microsoft.OpenApi.OpenApiSchemaReference.MaxContains.get -> int?
+Microsoft.OpenApi.OpenApiSchemaReference.MinContains.get -> int?

src/Microsoft.OpenApi/Reader/V31/OpenApiSchemaDeserializer.cs

@@ -144,6 +144,32 @@ internal static partial class OpenApiV31Deserializer
                 }
             }
         },
+        {
+            "contains",
+            (o, n, doc, c) => o.Contains = LoadSchema(n, doc, c)
+        },
+        {
+            "maxContains",
+            (o, n, _, _) =>
+            {
+                var maxContains = n.GetScalarValue();
+                if (maxContains != null)
+                {
+                    o.MaxContains = int.Parse(maxContains, CultureInfo.InvariantCulture);
+                }
+            }
+        },
+        {
+            "minContains",
+            (o, n, _, _) =>
+            {
+                var minContains = n.GetScalarValue();
+                if (minContains != null)
+                {
+                    o.MinContains = int.Parse(minContains, CultureInfo.InvariantCulture);
+                }
+            }
+        },
         {
             "unevaluatedProperties",
             (o, n, t, c) =>

src/Microsoft.OpenApi/Reader/V32/OpenApiSchemaDeserializer.cs

@@ -144,6 +144,32 @@ internal static partial class OpenApiV32Deserializer
                 }
             }
         },
+        {
+            "contains",
+            (o, n, doc, c) => o.Contains = LoadSchema(n, doc, c)
+        },
+        {
+            "maxContains",
+            (o, n, _, _) =>
+            {
+                var maxContains = n.GetScalarValue();
+                if (maxContains != null)
+                {
+                    o.MaxContains = int.Parse(maxContains, CultureInfo.InvariantCulture);
+                }
+            }
+        },
+        {
+            "minContains",
+            (o, n, _, _) =>
+            {
+                var minContains = n.GetScalarValue();
+                if (minContains != null)
+                {
+                    o.MinContains = int.Parse(minContains, CultureInfo.InvariantCulture);
+                }
+            }
+        },
         {
             "unevaluatedProperties",
             (o, n, t, c) =>

test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiSchemaTests.cs

@@ -45,7 +45,13 @@ public async Task ParseBasicV31SchemaShouldSucceed()
                         Items = new OpenApiSchema
                         {
                             Type = JsonSchemaType.String
-                        }
+                        },
+                        Contains = new OpenApiSchema
+                        {
+                            Type = JsonSchemaType.String
+                        },
+                        MinContains = 1,
+                        MaxContains = 5
                     },
                     ["vegetables"] = new OpenApiSchema
                     {

test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiSchema/jsonSchema.json

@@ -8,7 +8,12 @@
       "type": "array",
       "items": {
         "type": "string"
-      }
+      },
+      "contains": {
+        "type": "string"
+      },
+      "minContains": 1,
+      "maxContains": 5
     },
     "vegetables": {
       "type": "array"

test/Microsoft.OpenApi.Readers.Tests/V32Tests/OpenApiSchemaTests.cs

@@ -44,7 +44,13 @@ public async Task ParseBasicV32SchemaShouldSucceed()
                         Items = new OpenApiSchema
                         {
                             Type = JsonSchemaType.String
-                        }
+                        },
+                        Contains = new OpenApiSchema
+                        {
+                            Type = JsonSchemaType.String
+                        },
+                        MinContains = 1,
+                        MaxContains = 5
                     },
                     ["vegetables"] = new OpenApiSchema
                     {