feat: add enum support to response models in ts

.github/workflows/tests.yml

@@ -20,8 +20,6 @@ jobs:
           CLINode18,
           DartBeta,
           DartStable,
-          Deno1193,
-          Deno1303,
           DotNet60,
           DotNet80,
           DotNet90,

example.php

@@ -13,7 +13,6 @@
 use Appwrite\SDK\Language\Ruby;
 use Appwrite\SDK\Language\Dart;
 use Appwrite\SDK\Language\Go;
-use Appwrite\SDK\Language\Deno;
 use Appwrite\SDK\Language\REST;
 use Appwrite\SDK\Language\Swift;
 use Appwrite\SDK\Language\Apple;
@@ -101,30 +100,6 @@ function getSSLPage($url) {
 
     $sdk->generate(__DIR__ . '/examples/web');
 
-    // Deno
-    $sdk  = new SDK(new Deno(), new Swagger2($spec));
-
-    $sdk
-        ->setName('NAME')
-        ->setDescription('Repo description goes here')
-        ->setShortDescription('Repo short description goes here')
-        ->setVersion('0.0.0')
-        ->setURL('https://example.com')
-        ->setLogo('https://appwrite.io/v1/images/console.png')
-        ->setLicenseContent('test test test')
-        ->setWarning('**WORK IN PROGRESS - NOT READY FOR USAGE**')
-        ->setChangelog('**CHANGELOG**')
-        ->setGitUserName('repoowner')
-        ->setGitRepoName('reponame')
-        ->setTwitter('appwrite_io')
-        ->setDiscord('564160730845151244', 'https://appwrite.io/discord')
-        ->setDefaultHeaders([
-            'X-Appwrite-Response-Format' => '1.6.0',
-        ])
-    ;
-
-    $sdk->generate(__DIR__ . '/examples/deno');
-
     // Node
     $sdk  = new SDK(new Node(), new Swagger2($spec));
 

src/SDK/Language/DotNet.php

@@ -4,6 +4,7 @@
 
 use Appwrite\SDK\Language;
 use Twig\TwigFilter;
+use Twig\TwigFunction;
 
 class DotNet extends Language
 {
@@ -465,6 +466,47 @@ public function getFilters(): array
         ];
     }
 
+    /**
+     * get sub_scheme and property_name functions
+     * @return TwigFunction[]
+     */
+    public function getFunctions(): array
+    {
+        return [
+            new TwigFunction('sub_schema', function (array $property) {
+                $result = '';
+
+                if (isset($property['sub_schema']) && !empty($property['sub_schema'])) {
+                    if ($property['type'] === 'array') {
+                        $result = 'List<' . \ucfirst($property['sub_schema']) . '>';
+                    } else {
+                        $result = \ucfirst($property['sub_schema']);
+                    }
+                } elseif (isset($property['enum']) && !empty($property['enum'])) {
+                    $enumName = $property['enumName'] ?? $property['name'];
+                    $result = \ucfirst($enumName);
+                } else {
+                    $result = $this->getTypeName($property);
+                }
+
+                if (!($property['required'] ?? true)) {
+                    $result .= '?';
+                }
+
+                return $result;
+            }),
+            new TwigFunction('property_name', function (array $definition, array $property) {
+                $name = $property['name'];
+                $name = \ucfirst($name);
+                $name = \str_replace('$', '', $name);
+                if (\in_array(\strtolower($name), $this->getKeywords())) {
+                    $name = '@' . $name;
+                }
+                return $name;
+            }),
+        ];
+    }
+
     /**
      * Format a PHP array as a C# anonymous object
      */

src/SDK/Language/Kotlin.php

@@ -469,6 +469,9 @@ public function getFilters(): array
                 }
                 return $this->toUpperSnakeCase($value);
             }),
+            new TwigFilter('propertyAssignment', function (array $property, array $spec) {
+                return $this->getPropertyAssignment($property, $spec);
+            }),
         ];
     }
 
@@ -518,6 +521,9 @@ protected function getPropertyType(array $property, array $spec, string $generic
             if ($property['type'] === 'array') {
                 $type = 'List<' . $type . '>';
             }
+        } elseif (isset($property['enum'])) {
+            $enumName = $property['enumName'] ?? $property['name'];
+            $type = \ucfirst($enumName);
         } else {
             $type = $this->getTypeName($property);
         }
@@ -551,4 +557,71 @@ protected function hasGenericType(?string $model, array $spec): string
 
         return false;
     }
+
+    /**
+     * Generate property assignment logic for model deserialization
+     *
+     * @param array $property
+     * @param array $spec
+     * @return string
+     */
+    protected function getPropertyAssignment(array $property, array $spec): string
+    {
+        $propertyName = $property['name'];
+        $escapedPropertyName = str_replace('$', '\$', $propertyName);
+        $mapKey = "map[\"$escapedPropertyName\"]";
+
+        // Handle sub-schema (nested objects)
+        if (isset($property['sub_schema']) && !empty($property['sub_schema'])) {
+            $subSchemaClass = $this->toPascalCase($property['sub_schema']);
+            $hasGenericType = $this->hasGenericType($property['sub_schema'], $spec);
+            $nestedTypeParam = $hasGenericType ? ', nestedType' : '';
+
+            if ($property['type'] === 'array') {
+                return "($mapKey as List<Map<String, Any>>).map { " .
+                       "$subSchemaClass.from(map = it$nestedTypeParam) }";
+            } else {
+                return "$subSchemaClass.from(" .
+                       "map = $mapKey as Map<String, Any>$nestedTypeParam" .
+                       ")";
+            }
+        }
+
+        // Handle enum properties
+        if (isset($property['enum']) && !empty($property['enum'])) {
+            $enumName = $property['enumName'] ?? $property['name'];
+            $enumClass = $this->toPascalCase($enumName);
+            $nullCheck = $property['required'] ? '!!' : ' ?: null';
+
+            if ($property['required']) {
+                return "$enumClass.values().find { " .
+                    "it.value == $mapKey as String " .
+                    "}$nullCheck";
+            }
+
+            return "$enumClass.values().find { " .
+                   "it.value == ($mapKey as? String) " .
+                   "}$nullCheck";
+        }
+
+        // Handle primitive types
+        $nullableModifier = $property['required'] ? '' : '?';
+
+        if ($property['type'] === 'integer') {
+            return "($mapKey as$nullableModifier Number)" .
+                   ($nullableModifier ? '?' : '') . '.toLong()';
+        }
+
+        if ($property['type'] === 'number') {
+            return "($mapKey as$nullableModifier Number)" .
+                   ($nullableModifier ? '?' : '') . '.toDouble()';
+        }
+
+        // Handle other types (string, boolean, etc.)
+        $kotlinType = $this->getPropertyType($property, $spec);
+        // Remove nullable modifier from type since we handle it in the cast
+        $kotlinType = str_replace('?', '', $kotlinType);
+
+        return "$mapKey as$nullableModifier $kotlinType";
+    }
 }

src/SDK/Language/Swift.php

@@ -577,7 +577,7 @@ protected function getPropertyType(array $property, array $spec, string $generic
                 $type = '[' . $type . ']';
             }
         } else {
-            $type = $this->getTypeName($property, isProperty: true);
+            $type = $this->getTypeName($property, $spec, true);
         }
 
         return $type;

src/SDK/Language/Web.php

@@ -316,7 +316,7 @@ public function getReturn(array $method, array $spec): string
         return 'Promise<{}>';
     }
 
-    public function getSubSchema(array $property, array $spec): string
+    public function getSubSchema(array $property, array $spec, string $methodName = ''): string
     {
         if (array_key_exists('sub_schema', $property)) {
             $ret = '';
@@ -336,6 +336,14 @@ public function getSubSchema(array $property, array $spec): string
             return $ret;
         }
 
+        if (array_key_exists('enum', $property) && !empty($methodName)) {
+            if (isset($property['enumName'])) {
+                return $this->toPascalCase($property['enumName']);
+            }
+
+            return $this->toPascalCase($methodName) . $this->toPascalCase($property['name']);
+        }
+
         return $this->getTypeName($property);
     }
 
@@ -348,8 +356,8 @@ public function getFilters(): array
             new TwigFilter('getReadOnlyProperties', function ($value, $responseModel, $spec = []) {
                 return $this->getReadOnlyProperties($value, $responseModel, $spec);
             }),
-            new TwigFilter('getSubSchema', function (array $property, array $spec) {
-                return $this->getSubSchema($property, $spec);
+            new TwigFilter('getSubSchema', function (array $property, array $spec, string $methodName = '') {
+                return $this->getSubSchema($property, $spec, $methodName);
             }),
             new TwigFilter('getGenerics', function (string $model, array $spec, bool $skipAdditional = false) {
                 return $this->getGenerics($model, $spec, $skipAdditional);

src/SDK/SDK.php

@@ -633,7 +633,9 @@ public function generate(string $target): void
                 'contactURL' => $this->spec->getContactURL(),
                 'contactEmail' => $this->spec->getContactEmail(),
                 'services' => $this->getFilteredServices(),
-                'enums' => $this->spec->getEnums(),
+                'requestEnums' => $this->spec->getRequestEnums(),
+                'responseEnums' => $this->spec->getResponseEnums(),
+                'allEnums' => $this->spec->getAllEnums(),
                 'definitions' => $this->spec->getDefinitions(),
                 'global' => [
                     'headers' => $this->spec->getGlobalHeaders(),
@@ -724,7 +726,7 @@ public function generate(string $target): void
                     }
                     break;
                 case 'enum':
-                    foreach ($this->spec->getEnums() as $key => $enum) {
+                    foreach ($this->spec->getAllEnums() as $key => $enum) {
                         $params['enum'] = $enum;
 
                         $this->render($template, $destination, $block, $params, $minify);

src/Spec/Spec.php

@@ -178,9 +178,16 @@ public function setAttribute($key, $value, $type = self::SET_TYPE_ASSIGN)
     }
 
     /**
-     * Get Enums
+     * Get Request Enums
      *
      * @return array
      */
-    abstract public function getEnums();
+    abstract public function getRequestEnums();
+
+    /**
+     * Get Response Enums
+     *
+     * @return array
+     */
+    abstract public function getResponseEnums();
 }

src/Spec/Swagger2.php

@@ -489,6 +489,13 @@ public function getDefinitions()
                         //nested model
                         $sch['properties'][$name]['sub_schemas'] = \array_map(fn($schema) => str_replace('#/definitions/', '', $schema['$ref']), $def['items']['x-oneOf']);
                     }
+
+                    if (isset($def['enum'])) {
+                        // enum property
+                        $sch['properties'][$name]['enum'] = $def['enum'];
+                        $sch['properties'][$name]['enumName'] = $def['x-enum-name'] ?? ucfirst($key) . ucfirst($name);
+                        $sch['properties'][$name]['enumKeys'] = $def['x-enum-keys'] ?? [];
+                    }
                 }
             }
             $list[$key] = $sch;
@@ -499,7 +506,7 @@ public function getDefinitions()
     /**
      * @return array
      */
-    public function getEnums(): array
+    public function getRequestEnums(): array
     {
         $list = [];
 
@@ -523,4 +530,62 @@ public function getEnums(): array
 
         return \array_values($list);
     }
+
+    /**
+     * @return array
+     */
+    public function getResponseEnums(): array
+    {
+        $list = [];
+        $definitions = $this->getDefinitions();
+
+        foreach ($definitions as $modelName => $model) {
+            if (isset($model['properties']) && is_array($model['properties'])) {
+                foreach ($model['properties'] as $propertyName => $property) {
+                    if (isset($property['enum'])) {
+                        $enumName = $property['x-enum-name'] ?? ucfirst($modelName) . ucfirst($propertyName);
+
+                        if (!isset($list[$enumName])) {
+                            $list[$enumName] = [
+                                'name' => $enumName,
+                                'enum' => $property['enum'],
+                                'keys' => $property['x-enum-keys'] ?? [],
+                            ];
+                        }
+                    }
+
+                    // array of enums
+                    if ((($property['type'] ?? null) === 'array') && isset($property['items']['enum'])) {
+                        $enumName = $property['x-enum-name'] ?? ucfirst($modelName) . ucfirst($propertyName);
+
+                        if (!isset($list[$enumName])) {
+                            $list[$enumName] = [
+                                'name' => $enumName,
+                                'enum' => $property['items']['enum'],
+                                'keys' => $property['items']['x-enum-keys'] ?? [],
+                            ];
+                        }
+                    }
+                }
+            }
+        }
+
+        return \array_values($list);
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllEnums(): array
+    {
+        $list = [];
+        foreach ($this->getRequestEnums() as $enum) {
+            $list[$enum['name']] = $enum;
+        }
+        foreach ($this->getResponseEnums() as $enum) {
+            $list[$enum['name']] = $enum;
+        }
+
+        return \array_values($list);
+    }
 }

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

@@ -2,6 +2,11 @@ package {{ sdk.namespace | caseDot }}.models
 
 import com.google.gson.annotations.SerializedName
 import io.appwrite.extensions.jsonCast
+{%~ for property in definition.properties %}
+{%~ if property.enum %}
+import {{ sdk.namespace | caseDot }}.enums.{{ property.enumName | caseUcfirst }}
+{%~ endif %}
+{%~ endfor %}
 
 /**
  * {{ definition.description | replace({"\n": "\n * "}) | raw }}
@@ -27,7 +32,7 @@ import io.appwrite.extensions.jsonCast
 ) {
     fun toMap(): Map<String, Any> = mapOf(
         {%~ for property in definition.properties %}
-        "{{ property.name | escapeDollarSign }}" to {% if property.sub_schema %}{% if property.type == 'array' %}{{property.name | escapeKeyword | removeDollarSign}}.map { it.toMap() }{% else %}{{property.name | escapeKeyword | removeDollarSign}}.toMap(){% endif %}{% else %}{{property.name | escapeKeyword | removeDollarSign}}{% endif %} as Any,
+        "{{ property.name | escapeDollarSign }}" to {% if property.sub_schema %}{% if property.type == 'array' %}{{property.name | escapeKeyword | removeDollarSign}}.map { it.toMap() }{% else %}{{property.name | escapeKeyword | removeDollarSign}}.toMap(){% endif %}{% elseif property.enum %}{{property.name | escapeKeyword | removeDollarSign}}{% if not property.required %}?{% endif %}.value{% else %}{{property.name | escapeKeyword | removeDollarSign}}{% endif %} as Any,
         {%~ endfor %}
         {%~ if definition.additionalProperties %}
         "data" to data!!.jsonCast(to = Map::class.java)
@@ -61,7 +66,7 @@ import io.appwrite.extensions.jsonCast
             {%~ endif %}
         ) = {{ definition | modelType(spec) | raw }}(
             {%~ for property in definition.properties %}
-            {{ 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 %},
+            {{ property.name | escapeKeyword | removeDollarSign }} = {{ property | propertyAssignment(spec) | raw }},
             {%~ endfor %}
             {%~ if definition.additionalProperties %}
             data = map.jsonCast(to = nestedType)