Skip to content

Commit 271e8d1

Browse files
committed
fix(dotnet): models formatting
1 parent 612b2e0 commit 271e8d1

File tree

1 file changed

+20
-23
lines changed

1 file changed

+20
-23
lines changed

templates/dotnet/Package/Models/Model.cs.twig

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -40,31 +40,28 @@ namespace {{ spec.title | caseUcfirst }}.Models
4040

4141
public static {{ definition.name | caseUcfirst | overrideIdentifier }} From(Dictionary<string, object> map) => new {{ definition.name | caseUcfirst | overrideIdentifier }}(
4242
{%~ for property in definition.properties %}
43-
{{ property.name | caseCamel | escapeKeyword | removeDollarSign }}:
44-
{%- if property.sub_schema %}
45-
{%~ if property.type == 'array' %}
46-
((JArray)map["{{ property.name }}"])
47-
.ToObject<List<Dictionary<string, object>>>()
48-
.Select(it => {{ property.sub_schema | caseUcfirst | overrideIdentifier }}.From(map: it))
49-
.ToList()
50-
{%- else %}
51-
{{ property.sub_schema | caseUcfirst | overrideIdentifier }}.From(
52-
map: ((JObject)map["{{ property.name }}"])
53-
.ToObject<Dictionary<string, object>>()!
54-
)
43+
{{ property.name | caseCamel | escapeKeyword | removeDollarSign }}:{{' '}}
44+
{%- if property.sub_schema %}
45+
{%- if property.type == 'array' -%}
46+
((JArray)map["{{ property.name }}"]).ToObject<List<Dictionary<string, object>>>().Select(it => {{ property.sub_schema | caseUcfirst | overrideIdentifier }}.From(map: it)).ToList()
47+
{%- else -%}
48+
{{ property.sub_schema | caseUcfirst | overrideIdentifier }}.From(map: ((JObject)map["{{ property.name }}"]).ToObject<Dictionary<string, object>>()!)
5549
{%- endif %}
56-
{%~ else %}
57-
{%~ if property.type == 'array' %}
50+
{%- else %}
51+
{%- if property.type == 'array' -%}
5852
((JArray)map["{{ property.name }}"]).ToObject<{{ property | typeName }}>()
59-
{%~ else %}
60-
{%~ if property.type == "integer" or property.type == "number" %}
61-
{%~ if not property.required %}map["{{ property.name }}"] == null ? null : {% endif %} Convert.To{% if property.type == "integer" %}Int64{% else %}Double{% endif %}(map["{{ property.name }}"])
62-
{%~ else %}
63-
{%~ if property.type == "boolean" %}
53+
{%- else %}
54+
{%- if property.type == "integer" or property.type == "number" %}
55+
{%- if not property.required -%}map["{{ property.name }}"] == null ? null :{% endif %}Convert.To{% if property.type == "integer" %}Int64{% else %}Double{% endif %}(map["{{ property.name }}"])
56+
{%- else %}
57+
{%- if property.type == "boolean" -%}
6458
({{ property | typeName }}{% if not property.required %}?{% endif %})map["{{ property.name }}"]
65-
{%~ else %}
66-
{%~ if not property.required %}map.TryGetValue("{{ property.name }}", out var {{ property.name | caseCamel | escapeKeyword | removeDollarSign }}) ? {{ property.name | caseCamel | escapeKeyword | removeDollarSign }}?.ToString() : null
67-
{%~ else %} map["{{ property.name }}"].ToString(){% endif %}
59+
{%- else %}
60+
{%- if not property.required -%}
61+
map.TryGetValue("{{ property.name }}", out var {{ property.name | caseCamel | escapeKeyword | removeDollarSign }}) ? {{ property.name | caseCamel | escapeKeyword | removeDollarSign }}?.ToString() : null
62+
{%- else -%}
63+
map["{{ property.name }}"].ToString()
64+
{%- endif %}
6865
{%- endif %}
6966
{%~ endif %}
7067
{%~ endif %}
@@ -105,4 +102,4 @@ namespace {{ spec.title | caseUcfirst }}.Models
105102
{%~ endif %}
106103
{%~ endfor %}
107104
}
108-
}
105+
}

0 commit comments

Comments
 (0)