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

…l in the constructor
RicoSuter · Jan 11, 2024 · 8ca8446 · 8ca8446
1 parent 3585d60
commit 8ca8446
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/NJsonSchema.CodeGeneration.CSharp/Models/PropertyModel.cs b/src/NJsonSchema.CodeGeneration.CSharp/Models/PropertyModel.cs
@@ -54,6 +54,9 @@ public class PropertyModel : PropertyModelBase
         /// <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() &&

diff --git a/src/NJsonSchema.CodeGeneration.CSharp/Templates/Class.Constructor.Record.liquid b/src/NJsonSchema.CodeGeneration.CSharp/Templates/Class.Constructor.Record.liquid
@@ -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.Name | lowercamelcase }}{% endfor %})
+{% if IsAbstract %}protected{% else %}public{% endif %} {{ClassName}}({% for property in sortedProperties %}{%- if skipComma %}{%- assign skipComma = false %}{% else %}, {% endif %}{{ property.Type }} @{{ property.Name | 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.Name | lowercamelcase }}{%- endfor %})