Merge branch 'master' into fix_auto_implemnt_example

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asyncapi/modelina",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "description": "Library for generating data models based on inputs such as AsyncAPI, OpenAPI, or JSON Schema documents",
   "license": "Apache-2.0",
   "homepage": "https://www.modelina.org",

src/generators/csharp/presets/JsonSerializerPreset.ts

@@ -20,7 +20,7 @@ function renderSerializeProperty(
     model.property instanceof ConstrainedReferenceModel &&
     model.property.ref instanceof ConstrainedEnumModel
   ) {
-    value = `${modelInstanceVariable}?.GetValue()`;
+    value = `${modelInstanceVariable}${model.required ? '' : '?'}.GetValue()`;
   }
   return `JsonSerializer.Serialize(writer, ${value}, options);`;
 }

src/generators/csharp/presets/NewtonsoftSerializerPreset.ts

@@ -92,7 +92,9 @@ function renderDeserialize({
       prop.property instanceof ConstrainedReferenceModel &&
       prop.property.ref instanceof ConstrainedEnumModel
     ) {
-      toValue = `${prop.property.name}Extensions.To${prop.property.name}(jo["${prop.unconstrainedPropertyName}"].ToString())`;
+      toValue = `${prop.property.name}Extensions.To${prop.property.name}(jo["${
+        prop.unconstrainedPropertyName
+      }"].ToString())${prop.required ? '.Value' : ''}`;
     }
     return `if(jo["${prop.unconstrainedPropertyName}"] != null) {
   value.${propertyAccessor} = ${toValue};

src/generators/python/PythonGenerator.ts

@@ -35,7 +35,8 @@ import {
 import { DeepPartial, mergePartialAndDefault } from '../../utils/Partials';
 import { PythonDependencyManager } from './PythonDependencyManager';
 
-export interface PythonOptions extends CommonGeneratorOptions<PythonPreset> {
+export interface PythonOptions
+  extends CommonGeneratorOptions<PythonPreset, PythonDependencyManager> {
   typeMapping: TypeMapping<PythonOptions, PythonDependencyManager>;
   constraints: Constraints<PythonOptions>;
   importsStyle: 'explicit' | 'implicit';

test/runtime/generic-input-csharp.json

@@ -0,0 +1,75 @@
+{
+  "$id": "Address",
+  "description": "This object contains all types of MetaModel generations",
+  "type": "object",
+  "properties": {
+    "street_name": {
+      "type": "string"
+    },
+    "house_number": {
+      "type": "number"
+    },
+    "marriage": {
+      "type": "boolean",
+      "description": "Status if marriage live in given house"
+    },
+    "members": {
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "number"
+        },
+        {
+          "type": "boolean"
+        }
+      ]
+    },
+    "array_type": {
+      "type": "array",
+      "items": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "number"
+        }
+      ]
+    },
+    "nestedObject": {
+      "type": "object",
+      "properties": {
+        "test": {
+          "type": "string"
+        }
+      }
+    },
+    "enumTest": {
+      "enum": ["test", "test2"]
+    },
+    "houseType": {
+      "$ref": "#/$defs/housing-types"
+    },
+    "roofType": {
+      "$id": "TypeOfRoof",
+      "enum": ["tile", "straw", "wood", "metal"]
+    }
+  },
+  "patternProperties": {
+    "^S(.?*)test&": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "house_number",
+    "array_type",
+    "houseType"
+  ],
+  "$defs": {
+    "housing-types": {
+      "$id": "HousingType",
+      "enum": ["detached", "terraced", "bungalow", "flat"]
+    }
+  }
+}

test/runtime/runtime-csharp.ts

@@ -1,6 +1,6 @@
 import { CSHARP_JSON_SERIALIZER_PRESET, CSHARP_NEWTONSOFT_SERIALIZER_PRESET, CSharpFileGenerator } from '../../';
 import path from 'path';
-import input from './generic-input.json';
+import input from './generic-input-csharp.json';
 
 async function generateJsonSerializer() {
   const generator = new CSharpFileGenerator({