loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-08 16:40:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This fixes #665 for the consolidated typescript generator.
Original fix for typescript-node was in PR #2266, merged as
8417c5bed0e23764dc841816c2322cf7dc4e9b0d in version 4.1.0.
This commit is contained in:
Bodo Graumann 2020-09-28 16:28:08 +02:00 committed by GitHub
parent d7dfcc20c0
commit 54dd18535a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/openapi-generator/src/main/resources/typescript/model/ObjectSerializer.mustache vendored
View File

@ -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}}
}

5
modules/openapi-generator/src/main/resources/typescript/model/model.mustache vendored
View File

@ -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}}

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

@ -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} = {

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

@ -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} = {

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

@ -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} = {

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

@ -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} = {

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

@ -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} = {