Merge pull request #1033 from appwrite/fix-dotnet-and-dart-formatting

fix: dotnet & dart models

Author: abnegate

templates/dart/lib/src/models/model.dart.twig

@@ -6,11 +6,12 @@ class {{ definition.name | caseUcfirst | overrideIdentifier }} implements Model
 {% for property in definition.properties %}
     /// {{ property.description }}
     final {% if not property.required %}{{_self.sub_schema(property)}}? {{ property.name | escapeKeyword }}{% else %}{{_self.sub_schema(property)}} {{ property.name | escapeKeyword }}{% endif %};
+
 {% endfor %}
-{% if definition.additionalProperties %}
+{%~ if definition.additionalProperties %}
     final Map<String, dynamic> data;
-{% endif %}
 
+{% endif %}
     {{ definition.name | caseUcfirst | overrideIdentifier}}({% if definition.properties | length or definition.additionalProperties %}{{ '{' }}{% endif %}
 
 {% for property in definition.properties %}
@@ -33,7 +34,7 @@ class {{ definition.name | caseUcfirst | overrideIdentifier }} implements Model
                 {%- endif -%}
             {%- else -%}
                 {%- if property.type == 'array' -%}
-                    List<{{ property.items.type | caseUcfirst }}>.from(map['{{property.name | escapeDollarSign }}']?.map((x) => x{% if property.items.type == "string" %}.toString(){% endif %}) ?? [])
+                    List.from(map['{{property.name | escapeDollarSign }}'] ?? [])
                 {%- else -%}
                     map['{{property.name | escapeDollarSign }}']
                     {%- if property.type == "number" -%}
@@ -76,4 +77,4 @@ class {{ definition.name | caseUcfirst | overrideIdentifier }} implements Model
 {% endfor %}
 {% endif %}
 {% endfor %}
-}
+}

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

@@ -40,31 +40,28 @@ namespace {{ spec.title | caseUcfirst }}.Models
 
         public static {{ definition.name | caseUcfirst | overrideIdentifier }} From(Dictionary<string, object> map) => new {{ definition.name | caseUcfirst | overrideIdentifier }}(
             {%~ for property in definition.properties %}
-            {{ property.name | caseCamel | escapeKeyword | removeDollarSign }}: 
-                {%- if property.sub_schema %} 
-                    {%~ if property.type == 'array' %}
-                        ((JArray)map["{{ property.name }}"])
-                            .ToObject<List<Dictionary<string, object>>>()
-                            .Select(it => {{ property.sub_schema | caseUcfirst | overrideIdentifier }}.From(map: it))
-                            .ToList()
-                    {%- else %}
-                        {{ property.sub_schema | caseUcfirst | overrideIdentifier }}.From(
-                            map: ((JObject)map["{{ property.name }}"])
-                                .ToObject<Dictionary<string, object>>()!
-                        )
+            {{ property.name | caseCamel | escapeKeyword | removeDollarSign }}:{{' '}}
+                {%- if property.sub_schema %}
+                    {%- if property.type == 'array' -%}
+                        ((JArray)map["{{ property.name }}"]).ToObject<List<Dictionary<string, object>>>().Select(it => {{ property.sub_schema | caseUcfirst | overrideIdentifier }}.From(map: it)).ToList()
+                    {%- else -%}
+                        {{ property.sub_schema | caseUcfirst | overrideIdentifier }}.From(map: ((JObject)map["{{ property.name }}"]).ToObject<Dictionary<string, object>>()!)
                     {%- endif %}
-                {%~ else %}
-                    {%~ if property.type == 'array' %}
+                {%- else %}
+                    {%- if property.type == 'array' -%}
                         ((JArray)map["{{ property.name }}"]).ToObject<{{ property | typeName }}>()
-                    {%~ else %}
-                        {%~ if property.type == "integer" or property.type == "number" %}
-                            {%~ if not property.required %}map["{{ property.name }}"] == null ? null : {% endif %} Convert.To{% if property.type == "integer" %}Int64{% else %}Double{% endif %}(map["{{ property.name }}"])
-                        {%~ else %}
-                            {%~ if property.type == "boolean" %}
+                    {%- else %}
+                        {%- if property.type == "integer" or property.type == "number" %}
+                            {%- if not property.required -%}map["{{ property.name }}"] == null ? null :{% endif %}Convert.To{% if property.type == "integer" %}Int64{% else %}Double{% endif %}(map["{{ property.name }}"])
+                        {%- else %}
+                            {%- if property.type == "boolean" -%}
                                 ({{ property | typeName }}{% if not property.required %}?{% endif %})map["{{ property.name }}"]
-                            {%~ else %}
-                                {%~ if not property.required %}map.TryGetValue("{{ property.name }}", out var {{ property.name | caseCamel | escapeKeyword | removeDollarSign }}) ? {{ property.name | caseCamel | escapeKeyword | removeDollarSign }}?.ToString() : null
-                                {%~ else %} map["{{ property.name }}"].ToString(){% endif %}
+                            {%- else %}
+                                {%- if not property.required -%}
+                                    map.TryGetValue("{{ property.name }}", out var {{ property.name | caseCamel | escapeKeyword | removeDollarSign }}) ? {{ property.name | caseCamel | escapeKeyword | removeDollarSign }}?.ToString() : null
+                                {%- else -%}
+                                    map["{{ property.name }}"].ToString()
+                                {%- endif %}
                             {%- endif %}
                         {%~ endif %}
                     {%~ endif %}
@@ -105,4 +102,4 @@ namespace {{ spec.title | caseUcfirst }}.Models
         {%~ endif %}
         {%~ endfor %}
     }
-}
+}