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

#2147: fix compiler error in angular typescript codegen (#2149)

Browse Source 
* #2147: fix compiler error in angular typescript codegen

* #2147: generate samples
This commit is contained in:
Esteban Marin 2019-02-14 09:39:08 +01:00 committed by William Cheng
parent 804b589f5f
commit e01a786bc9
11 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache vendored
View File

@ -296,17 +296,17 @@ export class {{classname}} {
if ({{paramName}}) { if ({{paramName}}) {
{{#isCollectionFormatMulti}} {{#isCollectionFormatMulti}}
{{paramName}}.forEach((element) => { {{paramName}}.forEach((element) => {
{{#useHttpClient}}formParams = {{/useHttpClient}}formParams.append('{{baseName}}', <any>element){{#useHttpClient}} || formParams{{/useHttpClient}}; {{#useHttpClient}}formParams = {{/useHttpClient}}formParams.append('{{baseName}}', <any>element){{#useHttpClient}} as any || formParams{{/useHttpClient}};
}) })
{{/isCollectionFormatMulti}} {{/isCollectionFormatMulti}}
{{^isCollectionFormatMulti}} {{^isCollectionFormatMulti}}
{{#useHttpClient}}formParams = {{/useHttpClient}}formParams.append('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}'])){{#useHttpClient}} || formParams{{/useHttpClient}}; {{#useHttpClient}}formParams = {{/useHttpClient}}formParams.append('{{baseName}}', {{paramName}}.join(COLLECTION_FORMATS['{{collectionFormat}}'])){{#useHttpClient}} as any || formParams{{/useHttpClient}};
{{/isCollectionFormatMulti}} {{/isCollectionFormatMulti}}
} }
{{/isListContainer}} {{/isListContainer}}
{{^isListContainer}} {{^isListContainer}}
if ({{paramName}} !== undefined) { if ({{paramName}} !== undefined) {
{{#useHttpClient}}formParams = {{/useHttpClient}}formParams.append('{{baseName}}', <any>{{paramName}}){{#useHttpClient}} || formParams{{/useHttpClient}}; {{#useHttpClient}}formParams = {{/useHttpClient}}formParams.append('{{baseName}}', <any>{{paramName}}){{#useHttpClient}} as any || formParams{{/useHttpClient}};
} }
{{/isListContainer}} {{/isListContainer}}
{{/formParams}} {{/formParams}}

4
samples/client/petstore/typescript-angular-v2/npm/encoder.ts
View File

@ -8,9 +8,7 @@
export class CustomQueryEncoderHelper extends QueryEncoder { export class CustomQueryEncoderHelper extends QueryEncoder {
encodeKey(k: string): string { encodeKey(k: string): string {
k = super.encodeKey(k); k = super.encodeKey(k);
return k.replace(/\+/gi, '%2B') return k.replace(/\+/gi, '%2B');
.replace(/%5B/, "[").replace(/%5D/, "]")
;
} }
encodeValue(v: string): string { encodeValue(v: string): string {
v = super.encodeValue(v); v = super.encodeValue(v);

8
samples/client/petstore/typescript-angular-v4.3/npm/api/pet.service.ts
View File

@ -425,10 +425,10 @@ export class PetService {
} }
if (name !== undefined) { if (name !== undefined) {
formParams = formParams.append('name', <any>name) || formParams; formParams = formParams.append('name', <any>name) as any || formParams;
} }
if (status !== undefined) { if (status !== undefined) {
formParams = formParams.append('status', <any>status) || formParams; formParams = formParams.append('status', <any>status) as any || formParams;
} }
return this.httpClient.post<any>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, return this.httpClient.post<any>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`,
@ -498,10 +498,10 @@ export class PetService {
} }
if (additionalMetadata !== undefined) { if (additionalMetadata !== undefined) {
formParams = formParams.append('additionalMetadata', <any>additionalMetadata) || formParams; formParams = formParams.append('additionalMetadata', <any>additionalMetadata) as any || formParams;
} }
if (file !== undefined) { if (file !== undefined) {
formParams = formParams.append('file', <any>file) || formParams; formParams = formParams.append('file', <any>file) as any || formParams;
} }
return this.httpClient.post<ApiResponse>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, return this.httpClient.post<ApiResponse>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`,

8
samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/pet.service.ts
View File

@ -425,10 +425,10 @@ export class PetService {
} }
if (name !== undefined) { if (name !== undefined) {
formParams = formParams.append('name', <any>name) || formParams; formParams = formParams.append('name', <any>name) as any || formParams;
} }
if (status !== undefined) { if (status !== undefined) {
formParams = formParams.append('status', <any>status) || formParams; formParams = formParams.append('status', <any>status) as any || formParams;
} }
return this.httpClient.post<any>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, return this.httpClient.post<any>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`,
@ -498,10 +498,10 @@ export class PetService {
} }
if (additionalMetadata !== undefined) { if (additionalMetadata !== undefined) {
formParams = formParams.append('additionalMetadata', <any>additionalMetadata) || formParams; formParams = formParams.append('additionalMetadata', <any>additionalMetadata) as any || formParams;
} }
if (file !== undefined) { if (file !== undefined) {
formParams = formParams.append('file', <any>file) || formParams; formParams = formParams.append('file', <any>file) as any || formParams;
} }
return this.httpClient.post<ApiResponse>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, return this.httpClient.post<ApiResponse>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`,

8
samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/pet.service.ts
View File

@ -425,10 +425,10 @@ export class PetService {
} }
if (name !== undefined) { if (name !== undefined) {
formParams = formParams.append('name', <any>name) || formParams; formParams = formParams.append('name', <any>name) as any || formParams;
} }
if (status !== undefined) { if (status !== undefined) {
formParams = formParams.append('status', <any>status) || formParams; formParams = formParams.append('status', <any>status) as any || formParams;
} }
return this.httpClient.post<any>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, return this.httpClient.post<any>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`,
@ -498,10 +498,10 @@ export class PetService {
} }
if (additionalMetadata !== undefined) { if (additionalMetadata !== undefined) {
formParams = formParams.append('additionalMetadata', <any>additionalMetadata) || formParams; formParams = formParams.append('additionalMetadata', <any>additionalMetadata) as any || formParams;
} }
if (file !== undefined) { if (file !== undefined) {
formParams = formParams.append('file', <any>file) || formParams; formParams = formParams.append('file', <any>file) as any || formParams;
} }
return this.httpClient.post<ApiResponse>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, return this.httpClient.post<ApiResponse>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`,

8
samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/pet.service.ts
View File

@ -427,10 +427,10 @@ export class PetService {
} }
if (name !== undefined) { if (name !== undefined) {
formParams = formParams.append('name', <any>name) || formParams; formParams = formParams.append('name', <any>name) as any || formParams;
} }
if (status !== undefined) { if (status !== undefined) {
formParams = formParams.append('status', <any>status) || formParams; formParams = formParams.append('status', <any>status) as any || formParams;
} }
return this.httpClient.post<any>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, return this.httpClient.post<any>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`,
@ -500,10 +500,10 @@ export class PetService {
} }
if (additionalMetadata !== undefined) { if (additionalMetadata !== undefined) {
formParams = formParams.append('additionalMetadata', <any>additionalMetadata) || formParams; formParams = formParams.append('additionalMetadata', <any>additionalMetadata) as any || formParams;
} }
if (file !== undefined) { if (file !== undefined) {
formParams = formParams.append('file', <any>file) || formParams; formParams = formParams.append('file', <any>file) as any || formParams;
} }
return this.httpClient.post<ApiResponse>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, return this.httpClient.post<ApiResponse>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`,

8
samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/pet.service.ts
View File

@ -427,10 +427,10 @@ export class PetService {
} }
if (name !== undefined) { if (name !== undefined) {
formParams = formParams.append('name', <any>name) || formParams; formParams = formParams.append('name', <any>name) as any || formParams;
} }
if (status !== undefined) { if (status !== undefined) {
formParams = formParams.append('status', <any>status) || formParams; formParams = formParams.append('status', <any>status) as any || formParams;
} }
return this.httpClient.post<any>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, return this.httpClient.post<any>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`,
@ -500,10 +500,10 @@ export class PetService {
} }
if (additionalMetadata !== undefined) { if (additionalMetadata !== undefined) {
formParams = formParams.append('additionalMetadata', <any>additionalMetadata) || formParams; formParams = formParams.append('additionalMetadata', <any>additionalMetadata) as any || formParams;
} }
if (file !== undefined) { if (file !== undefined) {
formParams = formParams.append('file', <any>file) || formParams; formParams = formParams.append('file', <any>file) as any || formParams;
} }
return this.httpClient.post<ApiResponse>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, return this.httpClient.post<ApiResponse>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`,

8
samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/pet.service.ts
View File

@ -425,10 +425,10 @@ export class PetService {
} }
if (name !== undefined) { if (name !== undefined) {
formParams = formParams.append('name', <any>name) || formParams; formParams = formParams.append('name', <any>name) as any || formParams;
} }
if (status !== undefined) { if (status !== undefined) {
formParams = formParams.append('status', <any>status) || formParams; formParams = formParams.append('status', <any>status) as any || formParams;
} }
return this.httpClient.post<any>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, return this.httpClient.post<any>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`,
@ -498,10 +498,10 @@ export class PetService {
} }
if (additionalMetadata !== undefined) { if (additionalMetadata !== undefined) {
formParams = formParams.append('additionalMetadata', <any>additionalMetadata) || formParams; formParams = formParams.append('additionalMetadata', <any>additionalMetadata) as any || formParams;
} }
if (file !== undefined) { if (file !== undefined) {
formParams = formParams.append('file', <any>file) || formParams; formParams = formParams.append('file', <any>file) as any || formParams;
} }
return this.httpClient.post<ApiResponse>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, return this.httpClient.post<ApiResponse>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`,

8
samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/pet.service.ts
View File

@ -425,10 +425,10 @@ export class PetService {
} }
if (name !== undefined) { if (name !== undefined) {
formParams = formParams.append('name', <any>name) || formParams; formParams = formParams.append('name', <any>name) as any || formParams;
} }
if (status !== undefined) { if (status !== undefined) {
formParams = formParams.append('status', <any>status) || formParams; formParams = formParams.append('status', <any>status) as any || formParams;
} }
return this.httpClient.post<any>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, return this.httpClient.post<any>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`,
@ -498,10 +498,10 @@ export class PetService {
} }
if (additionalMetadata !== undefined) { if (additionalMetadata !== undefined) {
formParams = formParams.append('additionalMetadata', <any>additionalMetadata) || formParams; formParams = formParams.append('additionalMetadata', <any>additionalMetadata) as any || formParams;
} }
if (file !== undefined) { if (file !== undefined) {
formParams = formParams.append('file', <any>file) || formParams; formParams = formParams.append('file', <any>file) as any || formParams;
} }
return this.httpClient.post<ApiResponse>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, return this.httpClient.post<ApiResponse>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`,

8
samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/pet.service.ts
View File

@ -427,10 +427,10 @@ export class PetService {
} }
if (name !== undefined) { if (name !== undefined) {
formParams = formParams.append('name', <any>name) || formParams; formParams = formParams.append('name', <any>name) as any || formParams;
} }
if (status !== undefined) { if (status !== undefined) {
formParams = formParams.append('status', <any>status) || formParams; formParams = formParams.append('status', <any>status) as any || formParams;
} }
return this.httpClient.post<any>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, return this.httpClient.post<any>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`,
@ -500,10 +500,10 @@ export class PetService {
} }
if (additionalMetadata !== undefined) { if (additionalMetadata !== undefined) {
formParams = formParams.append('additionalMetadata', <any>additionalMetadata) || formParams; formParams = formParams.append('additionalMetadata', <any>additionalMetadata) as any || formParams;
} }
if (file !== undefined) { if (file !== undefined) {
formParams = formParams.append('file', <any>file) || formParams; formParams = formParams.append('file', <any>file) as any || formParams;
} }
return this.httpClient.post<ApiResponse>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, return this.httpClient.post<ApiResponse>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`,

8
samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/pet.service.ts
View File

@ -427,10 +427,10 @@ export class PetService {
} }
if (name !== undefined) { if (name !== undefined) {
formParams = formParams.append('name', <any>name) || formParams; formParams = formParams.append('name', <any>name) as any || formParams;
} }
if (status !== undefined) { if (status !== undefined) {
formParams = formParams.append('status', <any>status) || formParams; formParams = formParams.append('status', <any>status) as any || formParams;
} }
return this.httpClient.post<any>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`, return this.httpClient.post<any>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}`,
@ -500,10 +500,10 @@ export class PetService {
} }
if (additionalMetadata !== undefined) { if (additionalMetadata !== undefined) {
formParams = formParams.append('additionalMetadata', <any>additionalMetadata) || formParams; formParams = formParams.append('additionalMetadata', <any>additionalMetadata) as any || formParams;
} }
if (file !== undefined) { if (file !== undefined) {
formParams = formParams.append('file', <any>file) || formParams; formParams = formParams.append('file', <any>file) as any || formParams;
} }
return this.httpClient.post<ApiResponse>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`, return this.httpClient.post<ApiResponse>(`${this.configuration.basePath}/pet/${encodeURIComponent(String(petId))}/uploadImage`,