Skip to content

Let non-required, nullable properties of Record classes be C#-optiona… #1665

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
adamjones2 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Let non-required, nullable properties of Record classes be C#-optiona… #1665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ca8446
Let non-required, nullable properties of Record classes be C#-optiona…
adamjones2 Jan 11, 2024
f53a865
Merge branch 'master' into optional-parameters
adamjones2 Mar 30, 2025
8e75526
Update PropertyModel.cs
adamjones2 Mar 30, 2025
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
5 changes: 4 additions & 1 deletion src/NJsonSchema.CodeGeneration.CSharp/Models/PropertyModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ public PropertyModel(
/// <summary>Gets a value indicating whether the property is nullable.</summary>
public override bool IsNullable => (_settings.GenerateOptionalPropertiesAsNullable && !_property.IsRequired) || base.IsNullable;

/// <summary>Gets a value indicating whether the property's corresponding constructor parameter should be optional.</summary>
public bool RenderOptionalCtorArgument => IsNullable && !_property.IsRequired;

/// <summary>Gets or sets a value indicating whether empty strings are allowed.</summary>
public bool AllowEmptyStrings =>
_property.ActualTypeSchema.Type.IsString() &&
Expand Down Expand Up @@ -336,4 +339,4 @@ private static string GetRangeType(string? propertyFormat) =>
_ => "double",
};
}
}
}
4 changes: 2 additions & 2 deletions src/NJsonSchema.CodeGeneration.CSharp/Templates/Class.Constructor.Record.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
{%- assign parentProperties = "" | empty %}
{% endif %}

{%- assign sortedProperties = AllProperties | sort: "Name" %}
{%- assign sortedProperties = AllProperties | sort: "RenderOptionalCtorArgument", "Name" %}
{%- assign sortedParentProperties = parentProperties | sort: "Name" %}

{%- if UseSystemTextJson %}
[System.Text.Json.Serialization.JsonConstructor]
{%- else %}
[Newtonsoft.Json.JsonConstructor]
{%- endif %}
{% if IsAbstract %}protected{% else %}public{% endif %} {{ClassName}}({% for property in sortedProperties %}{%- if skipComma %}{%- assign skipComma = false %}{% else %}, {% endif %}{{ property.Type }} @{{ property.PropertyName | lowercamelcase }}{% endfor %})
{% if IsAbstract %}protected{% else %}public{% endif %} {{ClassName}}({% for property in sortedProperties %}{%- if skipComma %}{%- assign skipComma = false %}{% else %}, {% endif %}{{ property.Type }} @{{ property.PropertyName | lowercamelcase }}{% if property.RenderOptionalCtorArgument %} = null{% endif %}{% endfor %})
{%- assign skipComma = true %}
{%- if HasInheritance %}
: base({%- for property in sortedParentProperties %}{%- if skipComma %}{%- assign skipComma = false %}{% else %}, {% endif %}{{ property.PropertyName | lowercamelcase }}{%- endfor %})
Expand Down
Loading