fix: imports

Author: ChiragAgg5k

src/Spec/Swagger2.php

@@ -544,11 +544,23 @@ public function getResponseEnums(): array
                 foreach ($model['properties'] as $propertyName => $property) {
                     if (isset($property['enum'])) {
                         $enumName = $property['x-enum-name'] ?? ucfirst($modelName) . ucfirst($propertyName);
-
-                        if (!\in_array($enumName, array_column($list, 'name'))) {
+                        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'] ?? [],
                             ];
                         }
                     }

templates/dart/test/src/models/model_test.dart.twig

@@ -3,7 +3,9 @@
   {{ property.name | escapeKeyword }}: {% if property.type == 'array' %}[]{% elseif property.type == 'object' and (property.sub_schema == 'prefs' or property.sub_schema == 'preferences') %}Preferences(data: {}){% elseif property.type == 'object' and property.sub_schema %}{{_self.sub_schema(definitions, property)}}{% elseif property.type == 'string' %}'{{property['x-example'] | escapeDollarSign}}'{% elseif property.type == 'boolean' %}true{% else %}{{property['x-example']}}{% endif %},
   {% endfor %}{% endif %}){% endif %}{% else %}{% if property.type == 'object' and property.additionalProperties %}Map<String, dynamic>{% else %}{{property | typeName}}{% endif %}{% endif %}{% endmacro %}
 import 'package:{{ language.params.packageName }}/models.dart';
+{% if definition.properties | filter(p => p.enum) | length > 0 %}
 import 'package:{{ language.params.packageName }}/enums.dart';
+{% endif %}
 {% if 'dart' in language.params.packageName %}
 import 'package:test/test.dart';
 {% else %}
@@ -15,7 +17,7 @@ void main() {
     test('model', () {
       final model = {{ definition.name | caseUcfirst | overrideIdentifier }}(
 {% for property in definition.properties | filter(p => p.required) %}
-        {{ property.name | escapeKeyword }}: {% if property.type == 'array' %}[]{% elseif property.type == 'object' and (property.sub_schema == 'prefs' or property.sub_schema == 'preferences') %}Preferences(data: {}){% elseif property.type == 'object' and property.sub_schema %}{{_self.sub_schema(spec.definitions, property)}}{% elseif property.type == 'object' %}{}{% elseif property.enum %}{%- set enumName = property['enumName'] ?? property.name -%}{{ enumName | caseUcfirst }}.{{ (property.enumKeys[0] ?? property.enum[0]) | caseEnumKey }}{% elseif property.type == 'string' %}'{{property['x-example'] | escapeDollarSign}}'{% elseif property.type == 'boolean' %}true{% else %}{{property['x-example']}}{% endif %},
+        {{ property.name | escapeKeyword }}: {% if property.type == 'array' %}[]{% elseif property.type == 'object' and (property.sub_schema == 'prefs' or property.sub_schema == 'preferences') %}Preferences(data: {}){% elseif property.type == 'object' and property.sub_schema %}{{_self.sub_schema(spec.definitions, property)}}{% elseif property.type == 'object' %}{}{% elseif property.enum %}{{ property.enumName | caseUcfirst }}.{{ (property.enumKeys[0] ?? property.enum[0]) | caseEnumKey }}{% elseif property.type == 'string' %}'{{property['x-example'] | escapeDollarSign}}'{% elseif property.type == 'boolean' %}true{% else %}{{property['x-example']}}{% endif %},
 {% endfor %}
 {% if definition.additionalProperties %}
         data: {},
@@ -27,7 +29,7 @@ void main() {
 
 {% for property in definition.properties | filter(p => p.required) %}
       {% if property.type != 'object' or not property.sub_schema or (property.sub_schema == 'prefs' and property.sub_schema == 'preferences') %}
-      expect(result.{{ property.name | escapeKeyword }}{% if property.type == 'object' and (property.sub_schema == 'prefs' or property.sub_schema == 'preferences') %}.data{% endif %}, {% if property.type == 'array' %}[]{% elseif property.type == 'object' and (property.sub_schema == 'prefs' or property.sub_schema == 'preferences') %}{"data": {}}{% elseif property.type == 'object' %}{}{% elseif property.enum %}{%- set enumName = property['enumName'] ?? property.name -%}{{ enumName | caseUcfirst }}.{{ (property.enumKeys[0] ?? property.enum[0]) | caseEnumKey }}{% elseif property.type == 'string' %}'{{property['x-example'] | escapeDollarSign}}'{% elseif property.type == 'boolean' %}true{% else %}{{property['x-example']}}{% endif %});
+      expect(result.{{ property.name | escapeKeyword }}{% if property.type == 'object' and (property.sub_schema == 'prefs' or property.sub_schema == 'preferences') %}.data{% endif %}, {% if property.type == 'array' %}[]{% elseif property.type == 'object' and (property.sub_schema == 'prefs' or property.sub_schema == 'preferences') %}{"data": {}}{% elseif property.type == 'object' %}{}{% elseif property.enum %}{{ property.enumName | caseUcfirst }}.{{ (property.enumKeys[0] ?? property.enum[0]) | caseEnumKey }}{% elseif property.type == 'string' %}'{{property['x-example'] | escapeDollarSign}}'{% elseif property.type == 'boolean' %}true{% else %}{{property['x-example']}}{% endif %});
       {% endif %}
 {% endfor %}
     });

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

@@ -1,14 +1,8 @@
 import Foundation
 import JSONCodable
-{%~ set hasEnums = false %}
-{%~ for property in definition.properties %}
-{%~ if property.enum %}
-{%~ set hasEnums = true %}
-{%~ endif %}
-{%~ endfor %}
-{%~ if hasEnums %}
+{% if definition.properties | filter(p => p.enum) | length > 0 %}
 import {{spec.title | caseUcfirst}}Enums
-{%~ endif %}
+{% endif %}
 
 /// {{ definition.description }}
 {% if definition.properties | length == 0 and not definition.additionalProperties %}