Merge branch 'master' into update_next

asyncapi · Jan 27, 2025 · a4fac8c · a4fac8c
2 parents ce045db + c579393
commit a4fac8c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/examples/csharp-generate-newtonsoft-serializer/__snapshots__/index.spec.ts.snap b/examples/csharp-generate-newtonsoft-serializer/__snapshots__/index.spec.ts.snap
@@ -19,7 +19,6 @@ public partial class Root
     get { return name; }
     set { this.name = value; }
   }
-
     public string Serialize()
     {
       return JsonConvert.SerializeObject(this);

diff --git a/src/generators/csharp/presets/NewtonsoftSerializerPreset.ts b/src/generators/csharp/presets/NewtonsoftSerializerPreset.ts
@@ -87,33 +87,32 @@ function renderDeserialize({
       !(prop.property instanceof ConstrainedDictionaryModel) ||
       prop.property.serializationType === 'normal'
   );
-  const corePropsRead = coreProps
-    .map((prop) => {
-      const propertyAccessor = pascalCase(prop.propertyName);
-      let toValue = `jo["${prop.unconstrainedPropertyName}"].ToObject<${prop.property.type}>(serializer)`;
-      if (
-        prop.property instanceof ConstrainedReferenceModel &&
-        prop.property.ref instanceof ConstrainedEnumModel
-      ) {
-        toValue = `${prop.property.name}Extensions.To${prop.property.name}(jo["${
-          prop.unconstrainedPropertyName
-        }"].ToString())${prop.required ? '.Value' : ''}`;
-      }
 
-      if (
-        options?.enforceRequired !== undefined &&
-        options?.enforceRequired &&
-        prop.required
-      ) {
-        return `if(jo["${prop.unconstrainedPropertyName}"] is null){
+  const corePropsRead = coreProps.map((prop) => {
+    const propertyAccessor = pascalCase(prop.propertyName);
+    let toValue = `jo["${prop.unconstrainedPropertyName}"].ToObject<${prop.property.type}>(serializer)`;
+    if (
+      prop.property instanceof ConstrainedReferenceModel &&
+      prop.property.ref instanceof ConstrainedEnumModel
+    ) {
+      toValue = `${prop.property.name}Extensions.To${prop.property.name}(jo["${
+        prop.unconstrainedPropertyName
+      }"].ToString())${prop.required ? '.Value' : ''}`;
+    }
+
+    if (
+      options?.enforceRequired !== undefined &&
+      options?.enforceRequired &&
+      prop.required
+    ) {
+      return `if(jo["${prop.unconstrainedPropertyName}"] is null){
   throw new JsonSerializationException("Required property '${prop.unconstrainedPropertyName}' is missing");
 }
-
 value.${propertyAccessor} = ${toValue};
 `;
-      }
+    }
 
-      return `if(jo["${prop.unconstrainedPropertyName}"] != null) {
+    return `if(jo["${prop.unconstrainedPropertyName}"] != null) {
   value.${propertyAccessor} = ${toValue};
 }`;
     })

diff --git a/test/generators/csharp/presets/__snapshots__/NewtonsoftSerializerPreset.spec.ts.snap b/test/generators/csharp/presets/__snapshots__/NewtonsoftSerializerPreset.spec.ts.snap
@@ -93,6 +93,7 @@ if(jo[\\"objectProp\\"] != null) {
 }
 
   var additionalProperties = jo.Properties().Where((prop) => prop.Name != \\"string prop\\" || prop.Name != \\"const string prop\\" || prop.Name != \\"notRequiredStringProp\\" || prop.Name != \\"numberProp\\" || prop.Name != \\"enumProp\\" || prop.Name != \\"objectProp\\");
+
   value.AdditionalProperties = new Dictionary<string, dynamic>();
 
   foreach (var additionalProperty in additionalProperties)
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,6 +93,7 @@ if(jo[\\"objectProp\\"] != null) { @@
     }
       var additionalProperties = jo.Properties().Where((prop) => prop.Name != \\"string prop\\" || prop.Name != \\"const string prop\\" || prop.Name != \\"notRequiredStringProp\\" || prop.Name != \\"numberProp\\" || prop.Name != \\"enumProp\\" || prop.Name != \\"objectProp\\");
       value.AdditionalProperties = new Dictionary<string, dynamic>();
       foreach (var additionalProperty in additionalProperties)
@@ Expand Down @@