fix: csharp generate not null properties

docs/presets.md

@@ -418,6 +418,7 @@ This preset is a generator for the meta model `ConstrainedObjectModel` and [can
 | `accessor` | A method to extend rendered given property accessor. | `property` object as a [`ConstrainedObjectPropertyModel`](./internal-model.md#the-constrained-meta-model) instance. |
 | `setter` | A method to extend setter for a given property. | `property` object as a [`ConstrainedObjectPropertyModel`](./internal-model.md#the-constrained-meta-model) instance. |
 | `getter` | A method to extend getter for a given property. | `property` object as a [`ConstrainedObjectPropertyModel`](./internal-model.md#the-constrained-meta-model) instance. |
+| `propertyType` | A method to extend type definition of a given property. | `property` object as a [`ConstrainedObjectPropertyModel`](./internal-model.md#the-constrained-meta-model) instance. |
 
 #### **Enum**
 

examples/csharp-auto-implemented-properties/__snapshots__/index.spec.ts.snap

@@ -4,9 +4,12 @@ exports[`Should be able to render auto-implemented properties in CSharp and shou
 Array [
   "public class Root
 {
-  public dynamic[]? Emails { get; set; }
-  public string? StringProp { get; set; }
-  public double? NumberProp { get; set; }
+  public dynamic[]? NullArray { get; set; }
+  public string? NullString { get; set; }
+  public double? NullNumber { get; set; }
+  public dynamic[] NonNullArray { get; set; }
+  public string NonNullString { get; set; }
+  public double NonNullNumber { get; set; }
 }",
 ]
 `;

examples/csharp-auto-implemented-properties/index.ts

@@ -14,20 +14,34 @@ const jsonSchemaDraft7 = {
   $schema: 'http://json-schema.org/draft-07/schema#',
   type: 'object',
   additionalProperties: false,
+  required: ['nonNullNumber', 'nonNullString', 'nonNullArray'],
   properties: {
-    emails: {
+    nullArray: {
       type: 'array',
       items: {
         type: 'string',
         format: 'email'
       }
     },
-    stringProp: {
+    nullString: {
       type: 'string'
     },
-    numberProp: {
+    nullNumber: {
       type: 'number'
     },
+    nonNullArray: {
+      type: 'array',
+      items: {
+        type: 'string',
+        format: 'email'
+      }
+    },
+    nonNullString: {
+      type: 'string'
+    },
+    nonNullNumber: {
+      type: 'number'
+    }
   }
 };
 

examples/csharp-generate-required-properties/__snapshots__/index.spec.ts.snap

@@ -5,17 +5,17 @@ Array [
   "public class Root
 {
   private bool requiredBoolean;
-  private bool notRequiredBoolean;
+  private bool? notRequiredBoolean;
   private string requiredString;
-  private string notRequiredString;
+  private string? notRequiredString;
 
   public bool RequiredBoolean 
   {
     get { return requiredBoolean; }
     set { requiredBoolean = value; }
   }
 
-  public bool NotRequiredBoolean 
+  public bool? NotRequiredBoolean 
   {
     get { return notRequiredBoolean; }
     set { notRequiredBoolean = value; }
@@ -27,7 +27,7 @@ Array [
     set { requiredString = value; }
   }
 
-  public string NotRequiredString 
+  public string? NotRequiredString 
   {
     get { return notRequiredString; }
     set { notRequiredString = value; }

src/generators/csharp/CSharpPreset.ts

@@ -6,6 +6,7 @@ import { CSHARP_DEFAULT_ENUM_PRESET, EnumRenderer } from './renderers/EnumRender
 // Our class preset uses custom `accessor` hook to craft getter and setters.
 export interface CsharpClassPreset<O> extends ClassPreset<ClassRenderer, O> {
   accessor?: (args: PresetArgs<ClassRenderer, O, ConstrainedObjectModel> & PropertyArgs) => Promise<string> | string;
+  propertyType?: (args: PresetArgs<ClassRenderer, O, ConstrainedObjectModel> & PropertyArgs) => Promise<string> | string;
 }
 
 export type ClassPresetType<O> = CsharpClassPreset<O>;

src/generators/csharp/renderers/ClassRenderer.ts

@@ -1,5 +1,5 @@
 import { CSharpRenderer } from '../CSharpRenderer';
-import { ConstrainedDictionaryModel, ConstrainedObjectModel, ConstrainedObjectPropertyModel} from '../../../models';
+import { ConstrainedDictionaryModel, ConstrainedObjectModel, ConstrainedObjectPropertyModel } from '../../../models';
 import { pascalCase } from 'change-case';
 import { CsharpClassPreset } from '../CSharpPreset';
 import { CSharpOptions } from '../CSharpGenerator';
@@ -71,27 +71,36 @@ ${this.indent(this.renderBlock(content, 2))}
   runSetterPreset(property: ConstrainedObjectPropertyModel): Promise<string> {
     return this.runPreset('setter', { property, options: this.options, renderer: this });
   }
+
+  runPropertyTypePreset(property: ConstrainedObjectPropertyModel): Promise<string> {
+    return this.runPreset('propertyType', { property, options: this.options, renderer: this });
+  }
 }
 
 export const CSHARP_DEFAULT_CLASS_PRESET: CsharpClassPreset<CSharpOptions> = {
   self({ renderer }) {
     return renderer.defaultSelf();
   },
   async property({ renderer, property, options }) {
+    const type = await renderer.runPropertyTypePreset(property);
+
     if (options?.autoImplementedProperties) {
       const getter = await renderer.runGetterPreset(property);
       const setter = await renderer.runSetterPreset(property);
-      return `public ${property.property.type}${property.required === false && '?'} ${pascalCase(property.propertyName)} { ${getter} ${setter} }`;
+      return `public ${type} ${pascalCase(property.propertyName)} { ${getter} ${setter} }`;
     }
-    return `private ${property.property.type} ${property.propertyName};`;
+    return `private ${type} ${property.propertyName};`;
   },
   async accessor({ renderer, options, property }) {
-    const formattedAccessorName = pascalCase(property.propertyName);
+    const type = await renderer.runPropertyTypePreset(property);
+
     if (options?.autoImplementedProperties) {
       return '';
     }
 
-    return `public ${property.property.type} ${formattedAccessorName} 
+    const formattedAccessorName = pascalCase(property.propertyName);
+
+    return `public ${type} ${formattedAccessorName} 
 {
   ${await renderer.runGetterPreset(property)}
   ${await renderer.runSetterPreset(property)}
@@ -108,5 +117,10 @@ export const CSHARP_DEFAULT_CLASS_PRESET: CsharpClassPreset<CSharpOptions> = {
       return 'set;';
     }
     return `set { ${property.propertyName} = value; }`;
+  },
+  propertyType({ property }) {
+    const isNullable = property.required === false;
+
+    return `${property.property.type}${isNullable ? '?' : ''}`;
   }
 };

test/generators/csharp/__snapshots__/CSharpGenerator.spec.ts.snap

@@ -3,8 +3,8 @@
 exports[`CSharpGenerator class renderer should be able to overwrite accessor preset hook 1`] = `
 "public class CustomClass
 {
-  private string property;
-  private Dictionary<string, string> additionalProperties;
+  private string? property;
+  private Dictionary<string, string>? additionalProperties;
 
   my own custom factory
 
@@ -18,13 +18,13 @@ exports[`CSharpGenerator class renderer should be able to overwrite property pre
   my own property
   my own property
 
-  public string Property 
+  public string? Property 
   {
     get { return property; }
     set { property = value; }
   }
 
-  public Dictionary<string, string> AdditionalProperties 
+  public Dictionary<string, string>? AdditionalProperties 
   {
     get { return additionalProperties; }
     set { additionalProperties = value; }
@@ -39,11 +39,11 @@ exports[`CSharpGenerator should render \`class\` type 1`] = `
   private string city;
   private string state;
   private double houseNumber;
-  private bool marriage;
-  private dynamic members;
-  private dynamic[] tupleType;
+  private bool? marriage;
+  private dynamic? members;
+  private dynamic[]? tupleType;
   private dynamic[] arrayType;
-  private Dictionary<string, string> additionalProperties;
+  private Dictionary<string, string>? additionalProperties;
 
   public string StreetName 
   {
@@ -69,19 +69,19 @@ exports[`CSharpGenerator should render \`class\` type 1`] = `
     set { houseNumber = value; }
   }
 
-  public bool Marriage 
+  public bool? Marriage 
   {
     get { return marriage; }
     set { marriage = value; }
   }
 
-  public dynamic Members 
+  public dynamic? Members 
   {
     get { return members; }
     set { members = value; }
   }
 
-  public dynamic[] TupleType 
+  public dynamic[]? TupleType 
   {
     get { return tupleType; }
     set { tupleType = value; }
@@ -93,7 +93,7 @@ exports[`CSharpGenerator should render \`class\` type 1`] = `
     set { arrayType = value; }
   }
 
-  public Dictionary<string, string> AdditionalProperties 
+  public Dictionary<string, string>? AdditionalProperties 
   {
     get { return additionalProperties; }
     set { additionalProperties = value; }
@@ -194,11 +194,11 @@ exports[`CSharpGenerator should render models and their dependencies 1`] = `
     private string city;
     private string state;
     private double houseNumber;
-    private bool marriage;
-    private dynamic members;
+    private bool? marriage;
+    private dynamic? members;
     private dynamic[] arrayType;
-    private OtherModel otherModel;
-    private Dictionary<string, dynamic> additionalProperties;
+    private OtherModel? otherModel;
+    private Dictionary<string, dynamic>? additionalProperties;
 
     public string StreetName 
     {
@@ -224,13 +224,13 @@ exports[`CSharpGenerator should render models and their dependencies 1`] = `
       set { houseNumber = value; }
     }
 
-    public bool Marriage 
+    public bool? Marriage 
     {
       get { return marriage; }
       set { marriage = value; }
     }
 
-    public dynamic Members 
+    public dynamic? Members 
     {
       get { return members; }
       set { members = value; }
@@ -242,13 +242,13 @@ exports[`CSharpGenerator should render models and their dependencies 1`] = `
       set { arrayType = value; }
     }
 
-    public OtherModel OtherModel 
+    public OtherModel? OtherModel 
     {
       get { return otherModel; }
       set { otherModel = value; }
     }
 
-    public Dictionary<string, dynamic> AdditionalProperties 
+    public Dictionary<string, dynamic>? AdditionalProperties 
     {
       get { return additionalProperties; }
       set { additionalProperties = value; }
@@ -264,16 +264,16 @@ exports[`CSharpGenerator should render models and their dependencies 2`] = `
 
   public class OtherModel
   {
-    private string streetName;
-    private Dictionary<string, dynamic> additionalProperties;
+    private string? streetName;
+    private Dictionary<string, dynamic>? additionalProperties;
 
-    public string StreetName 
+    public string? StreetName 
     {
       get { return streetName; }
       set { streetName = value; }
     }
 
-    public Dictionary<string, dynamic> AdditionalProperties 
+    public Dictionary<string, dynamic>? AdditionalProperties 
     {
       get { return additionalProperties; }
       set { additionalProperties = value; }