Merge pull request #774 from appwrite/fix-exports-enums-js

fix: exports enums js

Author: abnegate

src/SDK/SDK.php

@@ -545,7 +545,7 @@ public function generate(string $target): void
                 'contactURL' => $this->spec->getContactURL(),
                 'contactEmail' => $this->spec->getContactEmail(),
                 'services' => $this->spec->getServices(),
-                'enums' => $this->spec->getEnumNames(),
+                'enums' => $this->spec->getEnums(),
                 'definitions' => $this->spec->getDefinitions(),
                 'global' => [
                     'headers' => $this->spec->getGlobalHeaders(),
@@ -636,24 +636,10 @@ public function generate(string $target): void
                     }
                     break;
                 case 'enum':
-                    foreach ($this->spec->getServices() as $key => $service) {
-                        $methods = $this->spec->getMethods($key);
+                    foreach ($this->spec->getEnums() as $key => $enum) {
+                        $params['enum'] = $enum;
 
-                        foreach ($methods as $method) {
-                            $parameters = $method['parameters']['all'];
-
-                            foreach ($parameters as $parameter) {
-                                    // Check if the enum field is defined
-                                if (isset($parameter['enumValues'])) {
-                                    $params['enum'] = [
-                                        'name' =>  $parameter['enumName'] ?? $parameter['name'],
-                                        'enum' => $parameter['enumValues'],
-                                        'keys' => $parameter['enumKeys'],
-                                    ];
-                                    $this->render($template, $destination, $block, $params, $minify);
-                                }
-                            }
-                        }
+                        $this->render($template, $destination, $block, $params, $minify);
                     }
                     break;
             }

src/Spec/Spec.php

@@ -166,9 +166,9 @@ public function setAttribute($key, $value, $type = self::SET_TYPE_ASSIGN)
     }
 
     /**
-     * Get EnumNames
+     * Get Enums
      *
      * @return array
      */
-    abstract public function getEnumNames();
+    abstract public function getEnums();
 }

src/Spec/Swagger2.php

@@ -357,21 +357,28 @@ public function getDefinitions()
     /**
      * @return array
      */
-    public function getEnumNames(): array
+    public function getEnums(): array
     {
         $list = [];
 
         foreach ($this->getServices() as $key => $service) {
             foreach ($this->getMethods($key) as $method) {
                 if (isset($method['parameters']) && is_array($method['parameters'])) {
                     foreach ($method['parameters']['all'] as $parameter) {
-                        if (isset($parameter['enumValues'])) {
-                            $list[] = $parameter['enumName'] ?? $parameter['name'];
+                        $enumName = $parameter['enumName'] ?? $parameter['name'];
+
+                        if (isset($parameter['enumValues']) && !\in_array($enumName, $list)) {
+                            $list[$enumName] = [
+                                'name' => $enumName,
+                                'enum' => $parameter['enumValues'],
+                                'keys' => $parameter['enumKeys'],
+                            ];
                         }
                     }
                 }
             }
         }
-        return  \array_values(\array_unique($list));
+
+        return \array_values($list);
     }
 }

templates/dart/lib/enums.dart.twig

@@ -2,5 +2,5 @@
 library {{ language.params.packageName }}.enums;
 
 {% for enum in spec.enums %}
-part 'src/enums/{{enum | caseSnake}}.dart';
+part 'src/enums/{{enum.name | caseSnake}}.dart';
 {% endfor %}

templates/deno/mod.ts.twig

@@ -9,7 +9,7 @@ import { {{spec.title | caseUcfirst}}Exception } from "./src/exception.ts";
 import { {{service.name | caseUcfirst}} } from "./src/services/{{service.name | caseDash}}.ts";
 {% endfor %}
 {% for enum in spec.enums %}
-import { {{enum | caseUcfirst}} } from "./src/enums/{{enum | caseDash}}.ts";
+import { {{enum.name | caseUcfirst}} } from "./src/enums/{{enum.name | caseDash}}.ts";
 {% endfor %}
 
 export {
@@ -24,7 +24,7 @@ export {
     {{service.name | caseUcfirst}},
 {% endfor %}
 {% for enum in spec.enums %}
-    {{enum | caseUcfirst}},
+    {{enum.name | caseUcfirst}},
 {% endfor %}
 };
 

templates/node/index.d.ts.twig

@@ -254,4 +254,12 @@ declare module "{{ language.params.npmPackage|caseDash }}" {
 {% endfor %}
   }
 {% endfor %}
-}
+{% for enum in spec.enums %}
+  export const {{ enum.name | caseUcfirst }}: Readonly<{
+{% for value in enum.enum %}
+{% set key = enum.keys is empty ? value : enum.keys[loop.index0] %}
+    {{ key | caseEnumKey }}: '{{ value }}',
+{% endfor %}
+  }>
+{% endfor %}
+}

templates/node/index.js.twig

@@ -9,7 +9,7 @@ const {{spec.title | caseUcfirst}}Exception = require('./lib/exception.js');
 const {{service.name | caseUcfirst}} = require('./lib/services/{{service.name | caseDash}}.js');
 {% endfor %}
 {% for enum in spec.enums %}
-const {{enum | caseUcfirst}} = require("./lib/enums/{{enum | caseDash}}.js");
+const {{enum.name | caseUcfirst}} = require("./lib/enums/{{enum.name | caseDash}}.js");
 {% endfor %}
 
 module.exports = {
@@ -23,6 +23,6 @@ module.exports = {
 {% for service in spec.services %}
     {{service.name | caseUcfirst}},
 {% endfor %}{% for enum in spec.enums %}
-    {{ enum | caseUcfirst }},
+    {{ enum.name | caseUcfirst }},
 {% endfor %}
 };

templates/node/lib/enums/enum.js.twig

@@ -1,9 +1,9 @@
-const {{ enum.name | caseUcfirst | overrideIdentifier }} = {
+const {{ enum.name | caseUcfirst | overrideIdentifier }} = Object.freeze({
 {% for value in enum.enum %}
 {% set key = enum.keys is empty ? value : enum.keys[loop.index0] %}
-    {{ key | replace({'-': '',' ': ''}) | caseEnumKey }}: '{{value}}' {% if not loop.last %},{% endif %}
+    {{ key | caseEnumKey }}: '{{value}}' {% if not loop.last %},{% endif %}
 
 {% endfor %}
-}
+});
 
 module.exports = {{ enum.name | caseUcfirst | overrideIdentifier }};

templates/python/package/encoders/value_class_encoder.py.twig

@@ -1,12 +1,12 @@
 import json
 {%~ for enum in spec.enums %}
-from ..enums.{{ enum | caseSnake }} import {{ enum | caseUcfirst | overrideIdentifier }}
+from ..enums.{{ enum.name | caseSnake }} import {{ enum.name | caseUcfirst | overrideIdentifier }}
 {%~ endfor %}
 
 class ValueClassEncoder(json.JSONEncoder):
     def default(self, o):
         {%~ for enum in spec.enums %}
-        if isinstance(o, {{ enum | caseUcfirst | overrideIdentifier }}):
+        if isinstance(o, {{ enum.name | caseUcfirst | overrideIdentifier }}):
             return o.value
 
         {%~ endfor %}

templates/ruby/lib/container.rb.twig

@@ -17,7 +17,7 @@ require_relative '{{ spec.title | caseSnake }}/models/{{ defintion.name | caseSn
 {% endfor %}
 
 {% for enum in spec.enums %}
-require_relative '{{ spec.title | caseSnake }}/enums/{{ enum | caseSnake }}'
+require_relative '{{ spec.title | caseSnake }}/enums/{{ enum.name | caseSnake }}'
 {% endfor %}
 
 {% for service in spec.services %}