Merge pull request #1087 from appwrite/pla-3008

fix: enhance model property handling for array types in Swift template

Author: lohanidamodar

src/SDK/Language/Swift.php

@@ -462,6 +462,9 @@ public function getFilters(): array
             new TwigFilter('propertyType', function (array $property, array $spec, string $generic = 'T') {
                 return $this->getPropertyType($property, $spec, $generic);
             }),
+            new TwigFilter('isAnyCodableArray', function (array $property, array $spec) {
+                return $this->isAnyCodableArray($property, $spec);
+            }),
             new TwigFilter('hasGenericType', function (string $model, array $spec) {
                 return $this->hasGenericType($model, $spec);
             }),
@@ -533,6 +536,18 @@ protected function getPropertyType(array $property, array $spec, string $generic
         return $type;
     }
 
+    /**
+     * Check if a property is an array that results in [AnyCodable] type
+     *
+     * @param array $property
+     * @param array $spec
+     * @return bool
+     */
+    protected function isAnyCodableArray(array $property, array $spec): bool
+    {
+        return $property['type'] === 'array' && $this->getPropertyType($property, $spec, 'T') === '[AnyCodable]';
+    }
+
     protected function hasGenericType(?string $model, array $spec): string
     {
         if (empty($model) || $model === 'any') {

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

@@ -81,7 +81,20 @@ open class {{ definition | modelType(spec) | raw }}: Codable {
     public static func from(map: [String: Any] ) -> {{ definition.name | caseUcfirst }} {
         return {{ definition.name | caseUcfirst }}(
             {%~ for property in definition.properties %}
-            {{ property.name | escapeSwiftKeyword | removeDollarSign }}: {% if property.sub_schema %}{% if property.type == 'array' %}(map["{{property.name }}"] as! [[String: Any]]).map { {{property.sub_schema | caseUcfirst}}.from(map: $0) }{% else %}{{property.sub_schema | caseUcfirst}}.from(map: map["{{property.name }}"] as! [String: Any]){% endif %}{% else %}map["{{property.name }}"] as{% if property.required %}!{% else %}?{% endif %} {{ property | propertyType(spec) | raw }}{% endif %}{% if not loop.last or (loop.last and definition.additionalProperties) %},{% endif %}
+            {%~ set isDocument = definition.name | lower == 'document' %}{# Temporary Fix until BE is fixed to return all attributes #}
+            {{ property.name | escapeSwiftKeyword | removeDollarSign }}: {% if property.sub_schema -%}
+                {%- if property.type == 'array' -%}
+                    (map["{{property.name }}"] as{% if isDocument %}?{% else %}{% if property.required %}!{% else %}?{% endif %}{% endif %} [[String: Any]]{% if isDocument %} ?? []{% elseif not property.required %} ?? []{% endif %}).map { {{property.sub_schema | caseUcfirst}}.from(map: $0) }
+                {%- else -%}
+                    {% if isDocument %}map["{{property.name }}"] as? [String: Any] != nil ? {{property.sub_schema | caseUcfirst}}.from(map: map["{{property.name }}"] as! [String: Any]) : nil{% else %}{{property.sub_schema | caseUcfirst}}.from(map: map["{{property.name }}"] as! [String: Any]){% endif %}
+                {%- endif -%}
+            {%- else -%}
+                {%- if property | isAnyCodableArray(spec) -%}
+                    (map["{{property.name }}"] as{% if isDocument %}?{% else %}{% if property.required %}!{% else %}?{% endif %}{% endif %} [Any]{% if isDocument or not property.required %} ?? []{% endif %}).map { AnyCodable($0) }
+                {%- else -%}
+                    map["{{property.name }}"] as{% if isDocument %}?{% else %}{% if property.required %}!{% else %}?{% endif %}{% endif %} {{ property | propertyType(spec) | raw }}{% if isDocument and property.required %}{% if property.type == 'string' %} ?? ""{% elseif property.type == 'integer' %} ?? 0{% elseif property.type == 'number' %} ?? 0.0{% elseif property.type == 'boolean' %} ?? false{% elseif property.type == 'array' %} ?? []{% endif %}{% endif %}
+                {%- endif -%}
+            {%- endif %}{% if not loop.last or (loop.last and definition.additionalProperties) %},{% endif %}
 
             {%~ endfor %}
             {%~ if definition.additionalProperties %}