Merge pull request #1202 from appwrite/fix-dart-any-model

Author: ChiragAgg5k

templates/android/library/src/main/java/io/package/models/Model.kt.twig

@@ -64,7 +64,7 @@ import io.appwrite.extensions.jsonCast
             {{ property.name | escapeKeyword | removeDollarSign }} = {% if property.sub_schema %}{% if property.type == 'array' %}(map["{{ property.name | escapeDollarSign }}"] as List<Map<String, Any>>).map { {{ property.sub_schema | caseUcfirst }}.from(map = it{% if property.sub_schema | hasGenericType(spec) %}, nestedType{% endif %}) }{% else %}{{ property.sub_schema | caseUcfirst }}.from(map = map["{{property.name | escapeDollarSign }}"] as Map<String, Any>{% if property.sub_schema | hasGenericType(spec) %}, nestedType{% endif %}){% endif %}{% else %}{% if property.type == "integer" or property.type == "number" %}({% endif %}map["{{ property.name | escapeDollarSign }}"]{% if property.type == "integer" or property.type == "number" %} as{% if not property.required %}?{% endif %} Number){% endif %}{% if property.type == "integer" %}{% if not property.required %}?{% endif %}.toLong(){% elseif property.type == "number" %}{% if not property.required %}?{% endif %}.toDouble(){% else %} as{% if not property.required %}?{% endif %} {{ property | propertyType(spec) | raw }}{% endif %}{% endif %},
             {%~ endfor %}
             {%~ if definition.additionalProperties %}
-            data = map.jsonCast(to = nestedType)
+            data = map["data"]?.jsonCast(to = nestedType) ?: map.jsonCast(to = nestedType)
             {%~ endif %}
         )
     }

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

@@ -47,7 +47,7 @@ class {{ definition.name | caseUcfirst | overrideIdentifier }} implements Model
             {%- endif -%},
 {% endfor %}
 {% if definition.additionalProperties %}
-            data: map,
+            data: map["data"] ?? map,
 {% endif %}
         );
     }

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

@@ -69,7 +69,7 @@ namespace {{ spec.title | caseUcfirst }}.Models
                 {%~ endif %}
             {%~ endfor %}
             {%- if definition.additionalProperties %}
-            data: map
+            data: map.TryGetValue("data", out var dataValue) ? (Dictionary<string, object>)dataValue : map
             {%- endif ~%}
         );
 

templates/kotlin/src/main/kotlin/io/appwrite/models/Model.kt.twig

@@ -64,7 +64,7 @@ import io.appwrite.extensions.jsonCast
             {{ property.name | escapeKeyword | removeDollarSign }} = {% if property.sub_schema %}{% if property.type == 'array' %}(map["{{ property.name | escapeDollarSign }}"] as List<Map<String, Any>>).map { {{ property.sub_schema | caseUcfirst }}.from(map = it{% if property.sub_schema | hasGenericType(spec) %}, nestedType{% endif %}) }{% else %}{{ property.sub_schema | caseUcfirst }}.from(map = map["{{property.name | escapeDollarSign }}"] as Map<String, Any>{% if property.sub_schema | hasGenericType(spec) %}, nestedType{% endif %}){% endif %}{% else %}{% if property.type == "integer" or property.type == "number" %}({% endif %}map["{{ property.name | escapeDollarSign }}"]{% if property.type == "integer" or property.type == "number" %} as{% if not property.required %}?{% endif %} Number){% endif %}{% if property.type == "integer" %}{% if not property.required %}?{% endif %}.toLong(){% elseif property.type == "number" %}{% if not property.required %}?{% endif %}.toDouble(){% else %} as{% if not property.required %}?{% endif %} {{ property | propertyType(spec) | raw }}{% endif %}{% endif %},
             {%~ endfor %}
             {%~ if definition.additionalProperties %}
-            data = map.jsonCast(to = nestedType)
+            data = map["data"]?.jsonCast(to = nestedType) ?: map.jsonCast(to = nestedType)
             {%~ endif %}
         )
     }

templates/ruby/lib/container/models/model.rb.twig

@@ -35,7 +35,7 @@ module {{ spec.title | caseUcfirst }}
 
 {% endfor %}
 {% if definition.additionalProperties %}
-                    data: map
+                    data: map["data"] || map
 {% endif %}
                 )
             end

templates/swift/Sources/Models/Model.swift.twig

@@ -98,7 +98,7 @@ open class {{ definition | modelType(spec) | raw }}: Codable {
 
             {%~ endfor %}
             {%~ if definition.additionalProperties %}
-            data: try! JSONDecoder().decode(T.self, from: JSONSerialization.data(withJSONObject: map, options: []))
+            data: try! JSONDecoder().decode(T.self, from: JSONSerialization.data(withJSONObject: map["data"] as? [String: Any] ?? map, options: []))
             {%~ endif %}
         )
     }