Support configuring whether constructor parameter are sorted

src/NJsonSchema.CodeGeneration.CSharp.Tests/CodeCompiler.cs

@@ -5,9 +5,9 @@ namespace NJsonSchema.CodeGeneration.CSharp.Tests;
 
 public class CodeCompiler
 {
-    public static void AssertCompile(string source)
+    public static void AssertCompile(string source, CSharpParseOptions options = null)
     {
-        var syntaxTree = CSharpSyntaxTree.ParseText(source);
+        var syntaxTree = CSharpSyntaxTree.ParseText(source, options);
 
         var metadataReferences = AppDomain.CurrentDomain.GetAssemblies()
             .Where(x => !x.IsDynamic && !string.IsNullOrWhiteSpace(x.Location))

src/NJsonSchema.CodeGeneration.CSharp.Tests/GeneralGeneratorTests.cs

@@ -1695,6 +1695,50 @@ public async Task When_native_record_no_setter_in_class_and_constructor_provided
             CodeCompiler.AssertCompile(output);
         }
 
+#if NETCOREAPP3_1_OR_GREATER || NET5_0_OR_GREATER
+        [Fact]
+        public async Task When_csharp_record_no_setter_in_record_and_constructor_provided()
+        {
+            // Arrange
+            var schema = JsonSchema.FromType<Address>();
+            var data = schema.ToJson();
+            var generator = new CSharpGenerator(schema, new CSharpGeneratorSettings
+            {
+                ClassStyle = CSharpClassStyle.Record,
+                GenerateNativeRecords = true,
+                SortConstructorParameters = false
+            });
+
+            // Act
+            var output = generator.GenerateFile("Address");
+
+            // Assert
+            await VerifyHelper.Verify(output);
+            CodeCompiler.AssertCompile(output, new Microsoft.CodeAnalysis.CSharp.CSharpParseOptions(Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp9));
+        }
+
+        [Fact]
+        public async Task When_csharp_record_init_in_record_and_constructor_provided()
+        {
+            // Arrange
+            var schema = JsonSchema.FromType<Address>();
+            var data = schema.ToJson();
+            var generator = new CSharpGenerator(schema, new CSharpGeneratorSettings
+            {
+                ClassStyle = CSharpClassStyle.Record,
+                SortConstructorParameters = false,
+                GenerateNativeRecords = true,
+            });
+
+            // Act
+            var output = generator.GenerateFile("Address");
+
+            // Assert
+            await VerifyHelper.Verify(output);
+            CodeCompiler.AssertCompile(output, new Microsoft.CodeAnalysis.CSharp.CSharpParseOptions(Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp9));
+        }
+#endif
+
         public abstract class AbstractAddress
         {
             [JsonProperty("city")]

src/NJsonSchema.CodeGeneration.CSharp.Tests/InheritanceTests.cs

@@ -173,6 +173,28 @@ public async Task When_definitions_inherit_from_root_schema_and_STJ_polymorphism
             CodeCompiler.AssertCompile(code);
         }
 
+        [Fact]
+        public async Task When_definition_inherits_parameters_from_base_come_first()
+        {
+            // Arrange
+            var path = GetTestDirectory() + "/References/Car.json";
+
+            // Act
+            var schema = await JsonSchema.FromFileAsync(path);
+            var generator = new CSharpGenerator(schema, new CSharpGeneratorSettings
+            {
+                ClassStyle = CSharpClassStyle.Record,
+                SortConstructorParameters = false,
+            });
+
+            // Act
+            var code = generator.GenerateFile();
+
+            // Assert
+            await VerifyHelper.Verify(code);
+            CodeCompiler.AssertCompile(code);
+        }
+
         private string GetTestDirectory()
         {
 #pragma warning disable SYSLIB0012

src/NJsonSchema.CodeGeneration.CSharp.Tests/References/Car.json

@@ -0,0 +1,16 @@
+{
+    "title": "Car",
+    "type": "object",
+    "description": "This is a car",
+    "allOf": [
+        {
+            "$ref": "Vehicle.json"
+        }
+    ],
+    "properties": {
+        "wheels": {
+            "type": "integer",
+            "description": "The number of wheels on the car"
+        }
+    }
+}

src/NJsonSchema.CodeGeneration.CSharp.Tests/References/Vehicle.json

@@ -0,0 +1,12 @@
+{
+    "title": "Vehicle",
+    "type": "object",
+    "x-abstract": true,
+    "description": "This is a vehicle",
+    "properties": {
+        "id": {
+            "type": "string",
+            "description": "This is the ID of Vehicle"
+        }
+    }
+}

src/NJsonSchema.CodeGeneration.CSharp.Tests/Snapshots/AbstractSchemaTests.When_class_is_abstract_then_is_abstract_CSharp_keyword_is_generated.verified.txt

@@ -10,9 +10,9 @@ namespace MyNamespace
 
     public abstract partial class AbstractClass
     {
+
         [Newtonsoft.Json.JsonProperty("Foo", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public string Foo { get; set; }
 
-
     }
 }

src/NJsonSchema.CodeGeneration.CSharp.Tests/Snapshots/AdditionalPropertiesTests.When_AlwaysAllowAdditionalObjectProperties_is_set_then_any_page_has_additional_properties.verified.txt

@@ -11,7 +11,6 @@ namespace ns
     public partial class Page
     {
 
-
         private System.Collections.Generic.IDictionary<string, object> _additionalProperties;
 
         [Newtonsoft.Json.JsonExtensionData]
@@ -25,14 +24,13 @@ namespace ns
 
     public partial class Library
     {
+
         [Newtonsoft.Json.JsonProperty("Index", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public System.Collections.Generic.IDictionary<string, string> Index { get; set; }
 
         [Newtonsoft.Json.JsonProperty("Page", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public Page Page { get; set; }
 
-
-
         private System.Collections.Generic.IDictionary<string, object> _additionalProperties;
 
         [Newtonsoft.Json.JsonExtensionData]

src/NJsonSchema.CodeGeneration.CSharp.Tests/Snapshots/AdditionalPropertiesTests.When_AlwaysAllowAdditionalObjectProperties_is_set_then_dictionary_and_no_object_are_not_same.verified.txt

@@ -10,14 +10,13 @@ namespace ns
 
     public partial class Library
     {
+
         [Newtonsoft.Json.JsonProperty("Index", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public System.Collections.Generic.IDictionary<string, string> Index { get; set; }
 
         [Newtonsoft.Json.JsonProperty("Page", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public object Page { get; set; }
 
-
-
         private System.Collections.Generic.IDictionary<string, object> _additionalProperties;
 
         [Newtonsoft.Json.JsonExtensionData]

src/NJsonSchema.CodeGeneration.CSharp.Tests/Snapshots/AdditionalPropertiesTests.When_additionalProperties_schema_is_set_for_object_then_special_property_is_rendered.verified.txt

@@ -10,11 +10,10 @@ namespace MyNamespace
 
     public partial class Person
     {
+
         [Newtonsoft.Json.JsonProperty("Pet", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public Pet Pet { get; set; }
 
-
-
         private System.Collections.Generic.IDictionary<string, object> _additionalProperties;
 
         [Newtonsoft.Json.JsonExtensionData]
@@ -28,14 +27,13 @@ namespace MyNamespace
 
     public partial class Pet
     {
+
         [Newtonsoft.Json.JsonProperty("id", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public long Id { get; set; }
 
         [Newtonsoft.Json.JsonProperty("category", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public string Category { get; set; }
 
-
-
         private System.Collections.Generic.IDictionary<string, object> _additionalProperties;
 
         [Newtonsoft.Json.JsonExtensionData]

src/NJsonSchema.CodeGeneration.CSharp.Tests/Snapshots/AdditionalPropertiesTests.When_using_SystemTextJson_additionalProperties_schema_is_set_for_object_then_special_property_is_rendered.verified.txt

@@ -14,8 +14,6 @@ namespace MyNamespace
         [System.Text.Json.Serialization.JsonPropertyName("Pet")]
         public Pet Pet { get; set; }
 
-
-
         private System.Collections.Generic.IDictionary<string, object> _additionalProperties;
 
         [System.Text.Json.Serialization.JsonExtensionData]
@@ -33,12 +31,9 @@ namespace MyNamespace
         [System.Text.Json.Serialization.JsonPropertyName("id")]
         public long Id { get; set; }
 
-
         [System.Text.Json.Serialization.JsonPropertyName("category")]
         public string Category { get; set; }
 
-
-
         private System.Collections.Generic.IDictionary<string, object> _additionalProperties;
 
         [System.Text.Json.Serialization.JsonExtensionData]

src/NJsonSchema.CodeGeneration.CSharp.Tests/Snapshots/AdditionalPropertiesTests.When_using_SystemTextJson_additionalProperties_schema_is_set_for_object_then_special_property_is_rendered_only_for_base_class.verified.txt

@@ -14,12 +14,9 @@ namespace MyNamespace
         [System.Text.Json.Serialization.JsonPropertyName("dog")]
         public Dog Dog { get; set; }
 
-
         [System.Text.Json.Serialization.JsonPropertyName("cat")]
         public Cat Cat { get; set; }
 
-
-
         private System.Collections.Generic.IDictionary<string, object> _additionalProperties;
 
         [System.Text.Json.Serialization.JsonExtensionData]
@@ -50,12 +47,9 @@ namespace MyNamespace
         [System.Text.Json.Serialization.JsonPropertyName("id")]
         public long Id { get; set; }
 
-
         [System.Text.Json.Serialization.JsonPropertyName("category")]
         public string Category { get; set; }
 
-
-
         private System.Collections.Generic.IDictionary<string, object> _additionalProperties;
 
         [System.Text.Json.Serialization.JsonExtensionData]

src/NJsonSchema.CodeGeneration.CSharp.Tests/Snapshots/AdditionalPropertiesTests.When_using_SystemTextJson_additionalProperties_schema_is_set_for_object_then_special_property_is_rendered_only_for_lowest_base_class.verified.txt

@@ -14,7 +14,6 @@ namespace MyNamespace
         [System.Text.Json.Serialization.JsonPropertyName("whiskers")]
         public string Whiskers { get; set; }
 
-
     }
 
     public partial class Pet : Animal
@@ -23,7 +22,6 @@ namespace MyNamespace
         [System.Text.Json.Serialization.JsonPropertyName("id")]
         public long Id { get; set; }
 
-
     }
 
     public partial class Animal
@@ -32,8 +30,6 @@ namespace MyNamespace
         [System.Text.Json.Serialization.JsonPropertyName("category")]
         public string Category { get; set; }
 
-
-
         private System.Collections.Generic.IDictionary<string, object> _additionalProperties;
 
         [System.Text.Json.Serialization.JsonExtensionData]
@@ -51,8 +47,6 @@ namespace MyNamespace
         [System.Text.Json.Serialization.JsonPropertyName("Name")]
         public string Name { get; set; }
 
-
-
         private System.Collections.Generic.IDictionary<string, object> _additionalProperties;
 
         [System.Text.Json.Serialization.JsonExtensionData]

src/NJsonSchema.CodeGeneration.CSharp.Tests/Snapshots/AllOfTests.When_allOf_has_one_schema_then_it_is_inherited.verified.txt

@@ -10,11 +10,10 @@ namespace MyNamespace
 
     public partial class B
     {
+
         [Newtonsoft.Json.JsonProperty("foo", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public string Foo { get; set; }
 
-
-
         private System.Collections.Generic.IDictionary<string, object> _additionalProperties;
 
         [Newtonsoft.Json.JsonExtensionData]
@@ -29,6 +28,7 @@ namespace MyNamespace
     [Newtonsoft.Json.JsonConverter(typeof(JsonInheritanceConverter), "type")]
     public partial class A : B
     {
+
         [Newtonsoft.Json.JsonProperty("prop", Required = Newtonsoft.Json.Required.Always)]
         [System.ComponentModel.DataAnnotations.Required]
         [System.ComponentModel.DataAnnotations.StringLength(30, MinimumLength = 1)]
@@ -37,7 +37,6 @@ namespace MyNamespace
         [Newtonsoft.Json.JsonProperty("prop2", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public string Prop2 { get; set; }
 
-
     }
 
     [System.AttributeUsage(System.AttributeTargets.Class | System.AttributeTargets.Interface, AllowMultiple = true)]

src/NJsonSchema.CodeGeneration.CSharp.Tests/Snapshots/AllOfTests.When_allOf_has_two_schemas_then_referenced_schema_is_inherited.verified.txt

@@ -10,11 +10,10 @@ namespace MyNamespace
 
     public partial class B
     {
+
         [Newtonsoft.Json.JsonProperty("foo", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public string Foo { get; set; }
 
-
-
         private System.Collections.Generic.IDictionary<string, object> _additionalProperties;
 
         [Newtonsoft.Json.JsonExtensionData]
@@ -28,6 +27,7 @@ namespace MyNamespace
 
     public partial class A : B
     {
+
         [Newtonsoft.Json.JsonProperty("prop", Required = Newtonsoft.Json.Required.Always)]
         [System.ComponentModel.DataAnnotations.Required]
         [System.ComponentModel.DataAnnotations.StringLength(30, MinimumLength = 1)]
@@ -36,6 +36,5 @@ namespace MyNamespace
         [Newtonsoft.Json.JsonProperty("prop2", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public string Prop2 { get; set; }
 
-
     }
 }

src/NJsonSchema.CodeGeneration.CSharp.Tests/Snapshots/AllOfTests.When_allOf_schema_contains_two_anonymous_nodes_without_type_specifier_an_anonymous_class_is_generated.verified.txt

@@ -10,19 +10,18 @@ namespace MyNamespace
 
     public partial class Foo : Anonymous
     {
+
         [Newtonsoft.Json.JsonProperty("prop2", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public double Prop2 { get; set; }
 
-
     }
 
     public partial class Anonymous
     {
+
         [Newtonsoft.Json.JsonProperty("prop1", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public string Prop1 { get; set; }
 
-
-
         private System.Collections.Generic.IDictionary<string, object> _additionalProperties;
 
         [Newtonsoft.Json.JsonExtensionData]

src/NJsonSchema.CodeGeneration.CSharp.Tests/Snapshots/AllOfTests.When_allOf_schema_is_object_type_then_it_is_an_inherited_class_in_generated_code.verified.txt

@@ -10,11 +10,10 @@ namespace MyNamespace
 
     public partial class Bar
     {
+
         [Newtonsoft.Json.JsonProperty("prop2", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public string Prop2 { get; set; }
 
-
-
         private System.Collections.Generic.IDictionary<string, object> _additionalProperties;
 
         [Newtonsoft.Json.JsonExtensionData]
@@ -28,9 +27,9 @@ namespace MyNamespace
 
     public partial class Foo : Bar
     {
+
         [Newtonsoft.Json.JsonProperty("prop1", Required = Newtonsoft.Json.Required.DisallowNull, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public string Prop1 { get; set; }
 
-
     }
 }