[typescript] Fix generation of enum models (#7529)

This fixes #665 for the consolidated typescript generator.
Original fix for typescript-node was in PR #2266, merged as
8417c5b in version 4.1.0.

Author: bodograumann

modules/openapi-generator/src/main/resources/typescript/model/ObjectSerializer.mustache

@@ -31,10 +31,13 @@ const supportedMediaTypes: { [mediaType: string]: number } = {
 let enumsMap: Set<string> = new Set<string>([
     {{#models}}
         {{#model}}
+            {{#isEnum}}
+    "{{classname}}{{enumName}}",
+            {{/isEnum}}
             {{#hasEnums}}
                 {{#vars}}
                     {{#isEnum}}
-					"{{classname}}{{enumName}}",
+    "{{classname}}{{enumName}}",
                     {{/isEnum}}
                 {{/vars}}
             {{/hasEnums}}
@@ -45,7 +48,9 @@ let enumsMap: Set<string> = new Set<string>([
 let typeMap: {[index: string]: any} = {
     {{#models}}
         {{#model}}
+            {{^isEnum}}
     "{{classname}}": {{classname}},
+            {{/isEnum}}
         {{/model}}
     {{/models}}
 }

modules/openapi-generator/src/main/resources/typescript/model/model.mustache

@@ -11,6 +11,7 @@ import { HttpFile } from '../http/http{{extensionForDeno}}';
 * {{{description}}}
 */
 {{/description}}
+{{^isEnum}}
 export class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
 {{#vars}}
 {{#description}}
@@ -75,5 +76,9 @@ export type {{classname}}{{enumName}} ={{#allowableValues}}{{#values}} "{{.}}" {
 {{/vars}}
 
 {{/hasEnums}}
+{{/isEnum}}
+{{#isEnum}}
+export type {{classname}} ={{#allowableValues}}{{#values}} "{{.}}" {{^-last}}|{{/-last}}{{/values}}{{/allowableValues}};
+{{/isEnum}}
 {{/model}}
 {{/models}}

samples/openapi3/client/petstore/typescript/builds/default/models/ObjectSerializer.ts

@@ -35,8 +35,8 @@ const supportedMediaTypes: { [mediaType: string]: number } = {
 
 
 let enumsMap: Set<string> = new Set<string>([
-					"OrderStatusEnum",
-					"PetStatusEnum",
+    "OrderStatusEnum",
+    "PetStatusEnum",
 ]);
 
 let typeMap: {[index: string]: any} = {

samples/openapi3/client/petstore/typescript/builds/deno/models/ObjectSerializer.ts

@@ -35,8 +35,8 @@ const supportedMediaTypes: { [mediaType: string]: number } = {
 
 
 let enumsMap: Set<string> = new Set<string>([
-					"OrderStatusEnum",
-					"PetStatusEnum",
+    "OrderStatusEnum",
+    "PetStatusEnum",
 ]);
 
 let typeMap: {[index: string]: any} = {

samples/openapi3/client/petstore/typescript/builds/inversify/models/ObjectSerializer.ts

@@ -35,8 +35,8 @@ const supportedMediaTypes: { [mediaType: string]: number } = {
 
 
 let enumsMap: Set<string> = new Set<string>([
-					"OrderStatusEnum",
-					"PetStatusEnum",
+    "OrderStatusEnum",
+    "PetStatusEnum",
 ]);
 
 let typeMap: {[index: string]: any} = {

samples/openapi3/client/petstore/typescript/builds/jquery/models/ObjectSerializer.ts

@@ -35,8 +35,8 @@ const supportedMediaTypes: { [mediaType: string]: number } = {
 
 
 let enumsMap: Set<string> = new Set<string>([
-					"OrderStatusEnum",
-					"PetStatusEnum",
+    "OrderStatusEnum",
+    "PetStatusEnum",
 ]);
 
 let typeMap: {[index: string]: any} = {

samples/openapi3/client/petstore/typescript/builds/object_params/models/ObjectSerializer.ts

@@ -35,8 +35,8 @@ const supportedMediaTypes: { [mediaType: string]: number } = {
 
 
 let enumsMap: Set<string> = new Set<string>([
-					"OrderStatusEnum",
-					"PetStatusEnum",
+    "OrderStatusEnum",
+    "PetStatusEnum",
 ]);
 
 let typeMap: {[index: string]: any} = {