loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

represent swagger enums as union of literal types (#6233)

Browse Source 
* represent swagger enums as union of literal types

enabling their easy use in angular templates, structural subtyping
among enums (in particular, different instances of the same enum
are now mutually assignable), improving type safety by preventing
incorrect widening, and permitting numeric enum values
(albeit without descriptive names)

Fixes #6206, #5146, #3500

* update samples

* restore blank lines at end of file

* fix typo
This commit is contained in:
Adrian Moos
2017-10-07 15:42:46 +02:00
committed by wing328
parent cc756b5563
commit eab9c72a42
10 changed files with 13 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/swagger-codegen/src/main/resources/typescript-angular/modelEnum.mustache
View File

@@ -1,7 +1,2 @@
export enum {{classname}} {
{{#allowableValues}}
{{#enumVars}}
{{{name}}} = <any> {{{value}}}{{^-last}},{{/-last}}
{{/enumVars}}
{{/allowableValues}}
}
export type {{classname}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}};

11
modules/swagger-codegen/src/main/resources/typescript-angular/modelGeneric.mustache
View File

@@ -16,13 +16,8 @@ export interface {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
export namespace {{classname}} {
{{#vars}}
{{#isEnum}}
export enum {{enumName}} {
{{#allowableValues}}
{{#enumVars}}
{{{name}}} = <any> {{{value}}}{{^-last}},{{/-last}}
{{/enumVars}}
{{/allowableValues}}
}
export type {{enumName}} = {{#allowableValues}}{{#enumVars}}{{{value}}}{{^-last}} | {{/-last}}{{/enumVars}}{{/allowableValues}};
{{/isEnum}}
{{/vars}}
}{{/hasEnums}}
}{{/hasEnums}}

6
samples/client/petstore/typescript-angular-v2/default/model/order.ts
View File

@@ -33,9 +33,5 @@ export interface Order {
}
export namespace Order {
export enum StatusEnum {
Placed = <any> 'placed',
Approved = <any> 'approved',
Delivered = <any> 'delivered'
}
export type StatusEnum = 'placed' | 'approved' | 'delivered';
}

6
samples/client/petstore/typescript-angular-v2/default/model/pet.ts
View File

@@ -35,9 +35,5 @@ export interface Pet {
}
export namespace Pet {
export enum StatusEnum {
Available = <any> 'available',
Pending = <any> 'pending',
Sold = <any> 'sold'
}
export type StatusEnum = 'available' | 'pending' | 'sold';
}

6
samples/client/petstore/typescript-angular-v2/npm/model/order.ts
View File

@@ -33,9 +33,5 @@ export interface Order {
}
export namespace Order {
export enum StatusEnum {
Placed = <any> 'placed',
Approved = <any> 'approved',
Delivered = <any> 'delivered'
}
export type StatusEnum = 'placed' | 'approved' | 'delivered';
}

6
samples/client/petstore/typescript-angular-v2/npm/model/pet.ts
View File

@@ -35,9 +35,5 @@ export interface Pet {
}
export namespace Pet {
export enum StatusEnum {
Available = <any> 'available',
Pending = <any> 'pending',
Sold = <any> 'sold'
}
export type StatusEnum = 'available' | 'pending' | 'sold';
}

6
samples/client/petstore/typescript-angular-v2/with-interfaces/model/Order.ts
View File

@@ -33,9 +33,5 @@ export interface Order {
}
export namespace Order {
export enum StatusEnum {
Placed = <any> 'placed',
Approved = <any> 'approved',
Delivered = <any> 'delivered'
}
export type StatusEnum = 'placed' | 'approved' | 'delivered';
}

6
samples/client/petstore/typescript-angular-v2/with-interfaces/model/Pet.ts
View File

@@ -35,9 +35,5 @@ export interface Pet {
}
export namespace Pet {
export enum StatusEnum {
Available = <any> 'available',
Pending = <any> 'pending',
Sold = <any> 'sold'
}
export type StatusEnum = 'available' | 'pending' | 'sold';
}

6
samples/client/petstore/typescript-angular-v4/npm/model/order.ts
View File

@@ -33,9 +33,5 @@ export interface Order {
}
export namespace Order {
export enum StatusEnum {
Placed = <any> 'placed',
Approved = <any> 'approved',
Delivered = <any> 'delivered'
}
export type StatusEnum = 'placed' | 'approved' | 'delivered';
}

6
samples/client/petstore/typescript-angular-v4/npm/model/pet.ts
View File

@@ -35,9 +35,5 @@ export interface Pet {
}
export namespace Pet {
export enum StatusEnum {
Available = <any> 'available',
Pending = <any> 'pending',
Sold = <any> 'sold'
}
export type StatusEnum = 'available' | 'pending' | 'sold';
}