merge enums

Author: ChiragAgg5k

src/SDK/SDK.php

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

src/Spec/Swagger2.php

@@ -544,6 +544,7 @@ public function getResponseEnums(): array
                 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,
@@ -556,6 +557,7 @@ public function getResponseEnums(): array
                     // 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,
@@ -570,4 +572,20 @@ public function getResponseEnums(): array
 
         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/dart/lib/enums.dart.twig

@@ -1,9 +1,6 @@
 /// {{spec.title | caseUcfirst}} Enums
 library {{ language.params.packageName }}.enums;
 
-{% for enum in spec.requestEnums %}
-part 'src/enums/{{enum.name | caseSnake}}.dart';
-{% endfor %}
-{% for enum in spec.responseEnums %}
+{% for enum in spec.allEnums %}
 part 'src/enums/{{enum.name | caseSnake}}.dart';
 {% endfor %}