Skip to content

fix(schema): apply additive JSON Schema semantics to $ref sibling getters #2921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aqeelat wants to merge 2 commits into
base: main
Choose a base branch
from
+523 −17
Open

fix(schema): apply additive JSON Schema semantics to $ref sibling getters #2921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
593cd0a
fix(schema): apply additive JSON Schema semantics to sibling getters
aqeelat Jul 2, 2026
4428272
fix(schema): revert additionalProperties/unevaluatedProperties to ref…
aqeelat Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 54 additions & 10 deletions src/Microsoft.OpenApi/Models/References/OpenApiSchemaReference.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,21 @@ public string? Title
/// <inheritdoc/>
public string? Minimum { get => string.IsNullOrEmpty(Reference.Minimum) ? Target?.Minimum : Reference.Minimum; set => Reference.Minimum = value; }
/// <inheritdoc/>
public int? MaxLength { get => Reference.MaxLength ?? Target?.MaxLength; set => Reference.MaxLength = value; }
public int? MaxLength
{
get => Target?.MaxLength is { } tMax && Reference.MaxLength is { } rMax
? Math.Min(tMax, rMax)
: Target?.MaxLength ?? Reference.MaxLength;
set => Reference.MaxLength = value;
}
/// <inheritdoc/>
public int? MinLength { get => Reference.MinLength ?? Target?.MinLength; set => Reference.MinLength = value; }
public int? MinLength
{
get => Target?.MinLength is { } tMin && Reference.MinLength is { } rMin
? Math.Max(tMin, rMin)
: Target?.MinLength ?? Reference.MinLength;
set => Reference.MinLength = value;
}
/// <inheritdoc/>
public string? Pattern { get => string.IsNullOrEmpty(Reference.Pattern) ? Target?.Pattern : Reference.Pattern; set => Reference.Pattern = value; }
/// <inheritdoc/>
Expand All @@ -95,13 +107,13 @@ public JsonNode? Default
/// <inheritdoc/>
public bool ReadOnly
{
get => Reference.ReadOnly ?? Target?.ReadOnly ?? false;
get => Reference.ReadOnly == true || Target?.ReadOnly == true;
set => Reference.ReadOnly = value;
}
/// <inheritdoc/>
public bool WriteOnly
{
get => Reference.WriteOnly ?? Target?.WriteOnly ?? false;
get => Reference.WriteOnly == true || Target?.WriteOnly == true;
set => Reference.WriteOnly = value;
}
/// <inheritdoc/>
Expand All @@ -117,9 +129,21 @@ public bool WriteOnly
/// <inheritdoc/>
public IOpenApiSchema? Items { get => Reference.Items ?? Target?.Items; set => Reference.Items = value; }
/// <inheritdoc/>
public int? MaxItems { get => Reference.MaxItems ?? Target?.MaxItems; set => Reference.MaxItems = value; }
public int? MaxItems
{
get => Target?.MaxItems is { } tMax && Reference.MaxItems is { } rMax
? Math.Min(tMax, rMax)
: Target?.MaxItems ?? Reference.MaxItems;
set => Reference.MaxItems = value;
}
/// <inheritdoc/>
public int? MinItems { get => Reference.MinItems ?? Target?.MinItems; set => Reference.MinItems = value; }
public int? MinItems
{
get => Target?.MinItems is { } tMin && Reference.MinItems is { } rMin
? Math.Max(tMin, rMin)
: Target?.MinItems ?? Reference.MinItems;
set => Reference.MinItems = value;
}
/// <inheritdoc/>
public bool? UniqueItems { get => Reference.UniqueItems ?? Target?.UniqueItems; set => Reference.UniqueItems = value; }
/// <inheritdoc/>
Expand All @@ -133,11 +157,27 @@ public bool WriteOnly
/// <inheritdoc/>
public IDictionary<string, IOpenApiSchema>? PatternProperties { get => Reference.PatternProperties ?? Target?.PatternProperties; set => Reference.PatternProperties = value; }
/// <inheritdoc/>
public int? MaxProperties { get => Reference.MaxProperties ?? Target?.MaxProperties; set => Reference.MaxProperties = value; }
public int? MaxProperties
{
get => Target?.MaxProperties is { } tMax && Reference.MaxProperties is { } rMax
? Math.Min(tMax, rMax)
: Target?.MaxProperties ?? Reference.MaxProperties;
set => Reference.MaxProperties = value;
}
/// <inheritdoc/>
public int? MinProperties { get => Reference.MinProperties ?? Target?.MinProperties; set => Reference.MinProperties = value; }
public int? MinProperties
{
get => Target?.MinProperties is { } tMin && Reference.MinProperties is { } rMin
? Math.Max(tMin, rMin)
: Target?.MinProperties ?? Reference.MinProperties;
set => Reference.MinProperties = value;
}
/// <inheritdoc/>
public bool AdditionalPropertiesAllowed { get => Reference.AdditionalPropertiesAllowed ?? Target?.AdditionalPropertiesAllowed ?? true; set => Reference.AdditionalPropertiesAllowed = value; }
public bool AdditionalPropertiesAllowed
{
get => Reference.AdditionalPropertiesAllowed ?? Target?.AdditionalPropertiesAllowed ?? true;
set => Reference.AdditionalPropertiesAllowed = value;
}
/// <inheritdoc/>
public IOpenApiSchema? AdditionalProperties { get => Reference.AdditionalProperties ?? Target?.AdditionalProperties; set => Reference.AdditionalProperties = value; }
/// <inheritdoc/>
Expand All @@ -153,7 +193,11 @@ public IList<JsonNode>? Examples
/// <inheritdoc/>
public IList<JsonNode>? Enum { get => Reference.Enum ?? Target?.Enum; set => Reference.Enum = value; }
/// <inheritdoc/>
public bool UnevaluatedProperties { get => Reference.UnevaluatedProperties ?? Target?.UnevaluatedProperties ?? true; set => Reference.UnevaluatedProperties = value; }
public bool UnevaluatedProperties
{
get => Reference.UnevaluatedProperties ?? Target?.UnevaluatedProperties ?? true;
set => Reference.UnevaluatedProperties = value;
}
/// <inheritdoc/>
public IOpenApiSchema? UnevaluatedPropertiesSchema { get => Reference.UnevaluatedPropertiesSchema ?? (Target as IOpenApiSchemaMissingProperties)?.UnevaluatedPropertiesSchema; set => Reference.UnevaluatedPropertiesSchema = value; }
/// <inheritdoc/>
Expand Down
Loading