Update support for enum schemas

Author: yskn4492

src/client/interfaces/Enum.d.ts

@@ -1,6 +1,7 @@
 export interface Enum {
     name: string;
     value: string;
+    enumValue: string;
     type: string;
     title?: string | null;
     description: string | null;

src/openApi/v2/parser/extendEnum.ts

@@ -17,7 +17,8 @@ export const extendEnum = (enumerators: Enum[], definition: WithEnumExtension):
     return enumerators.map((enumerator, index) => ({
         name: names?.[index] || enumerator.name,
         description: descriptions?.[index] || enumerator.description,
-        value: values?.[index] || enumerator.value,
+        value: enumerator.value,
+        enumValue: values?.[index] || enumerator.value,
         title: titles?.[index] || enumerator.title,
         type: enumerator.type,
     }));

src/openApi/v2/parser/getEnum.ts

@@ -14,6 +14,7 @@ export const getEnum = (values?: (string | number)[]): Enum[] => {
                     return {
                         name: `'_${value}'`,
                         value: String(value),
+                        enumValue: '',
                         type: 'number',
                         description: null,
                     };
@@ -25,6 +26,7 @@ export const getEnum = (values?: (string | number)[]): Enum[] => {
                         .replace(/([a-z])([A-Z]+)/g, '$1_$2')
                         .toUpperCase(),
                     value: `'${value.replace(/'/g, "\\'")}'`,
+                    enumValue: '',
                     type: 'string',
                     description: null,
                 };

src/openApi/v3/parser/extendEnum.ts

@@ -17,7 +17,8 @@ export const extendEnum = (enumerators: Enum[], definition: WithEnumExtension):
     return enumerators.map((enumerator, index) => ({
         name: names?.[index] || enumerator.name,
         description: descriptions?.[index] || enumerator.description,
-        value: values?.[index] || enumerator.value,
+        value: enumerator.value,
+        enumValue: values?.[index] || enumerator.value,
         title: titles?.[index] || enumerator.title,
         type: enumerator.type,
     }));

src/openApi/v3/parser/getEnum.ts

@@ -14,6 +14,7 @@ export const getEnum = (values?: (string | number)[]): Enum[] => {
                     return {
                         name: `'_${value}'`,
                         value: String(value),
+                        enumValue: '',
                         type: 'number',
                         description: null,
                     };
@@ -25,6 +26,7 @@ export const getEnum = (values?: (string | number)[]): Enum[] => {
                         .replace(/([a-z])([A-Z]+)/g, '$1_$2')
                         .toUpperCase(),
                     value: `'${value.replace(/'/g, "\\'")}'`,
+                    enumValue: '',
                     type: 'string',
                     description: null,
                 };

src/templates/exportSchema.hbs

@@ -1,7 +1,9 @@
 {{>header}}
 
 {{#equals export 'enum'}}
+{{#unless @root.useUnionTypes}}
 import { {{name}} } from '../models/{{{name}}}'
+{{/unless}}
 {{/equals}}
 
 export const ${{{name}}} = {{>schema}} as const;

src/templates/partials/schemaEnum.hbs

@@ -18,10 +18,15 @@
 	items: [
 {{#each enum}}
 		{
+{{#if @root.useUnionTypes}}
+			value: {{{value}}},
+{{else}}
 			value: {{{../name}}}.{{{name}}},
-			varname: "{{{name}}}",
-			title: "{{{title}}}",
-			description: "{{{description}}}",
+{{/if}}
+			varname: '{{{name}}}',
+			enumValue: {{{enumValue}}},
+			title: '{{{title}}}',
+			description: '{{{description}}}',
 		},
 {{/each}}
 	],