From e6b745c8cfb054fb54ba929ae77c2f91a3480666 Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Wed, 15 May 2019 17:19:58 +0200 Subject: [PATCH 01/16] [typescript-fetch] Fix uploading files --- .../src/main/resources/typescript-fetch/runtime.mustache | 4 +++- .../builds/default/.openapi-generator/VERSION | 2 +- .../petstore/typescript-fetch/builds/default/apis/PetApi.ts | 2 +- .../petstore/typescript-fetch/builds/default/apis/StoreApi.ts | 2 +- .../petstore/typescript-fetch/builds/default/apis/UserApi.ts | 2 +- .../typescript-fetch/builds/default/models/Category.ts | 2 +- .../builds/default/models/ModelApiResponse.ts | 2 +- .../petstore/typescript-fetch/builds/default/models/Order.ts | 2 +- .../petstore/typescript-fetch/builds/default/models/Pet.ts | 2 +- .../petstore/typescript-fetch/builds/default/models/Tag.ts | 2 +- .../petstore/typescript-fetch/builds/default/models/User.ts | 2 +- .../petstore/typescript-fetch/builds/default/runtime.ts | 3 +-- .../builds/es6-target/.openapi-generator/VERSION | 2 +- .../typescript-fetch/builds/es6-target/apis/PetApi.ts | 2 +- .../typescript-fetch/builds/es6-target/apis/StoreApi.ts | 2 +- .../typescript-fetch/builds/es6-target/apis/UserApi.ts | 2 +- .../typescript-fetch/builds/es6-target/models/Category.ts | 2 +- .../builds/es6-target/models/ModelApiResponse.ts | 2 +- .../typescript-fetch/builds/es6-target/models/Order.ts | 2 +- .../petstore/typescript-fetch/builds/es6-target/models/Pet.ts | 2 +- .../petstore/typescript-fetch/builds/es6-target/models/Tag.ts | 2 +- .../typescript-fetch/builds/es6-target/models/User.ts | 2 +- .../petstore/typescript-fetch/builds/es6-target/package.json | 4 ++-- .../petstore/typescript-fetch/builds/es6-target/runtime.ts | 3 +-- .../builds/with-interfaces/.openapi-generator/VERSION | 2 +- .../typescript-fetch/builds/with-interfaces/apis/PetApi.ts | 2 +- .../typescript-fetch/builds/with-interfaces/apis/StoreApi.ts | 2 +- .../typescript-fetch/builds/with-interfaces/apis/UserApi.ts | 2 +- .../builds/with-interfaces/models/Category.ts | 2 +- .../builds/with-interfaces/models/ModelApiResponse.ts | 2 +- .../typescript-fetch/builds/with-interfaces/models/Order.ts | 2 +- .../typescript-fetch/builds/with-interfaces/models/Pet.ts | 2 +- .../typescript-fetch/builds/with-interfaces/models/Tag.ts | 2 +- .../typescript-fetch/builds/with-interfaces/models/User.ts | 2 +- .../typescript-fetch/builds/with-interfaces/runtime.ts | 3 +-- .../builds/with-npm-version/.openapi-generator/VERSION | 2 +- .../typescript-fetch/builds/with-npm-version/apis/PetApi.ts | 2 +- .../typescript-fetch/builds/with-npm-version/apis/StoreApi.ts | 2 +- .../typescript-fetch/builds/with-npm-version/apis/UserApi.ts | 2 +- .../builds/with-npm-version/models/Category.ts | 2 +- .../builds/with-npm-version/models/ModelApiResponse.ts | 2 +- .../typescript-fetch/builds/with-npm-version/models/Order.ts | 2 +- .../typescript-fetch/builds/with-npm-version/models/Pet.ts | 2 +- .../typescript-fetch/builds/with-npm-version/models/Tag.ts | 2 +- .../typescript-fetch/builds/with-npm-version/models/User.ts | 2 +- .../typescript-fetch/builds/with-npm-version/package.json | 4 ++-- .../typescript-fetch/builds/with-npm-version/runtime.ts | 3 +-- 47 files changed, 51 insertions(+), 53 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache index 624feac809f8..ef55c2acc7bc 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache @@ -47,7 +47,9 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = context.body instanceof FormData ? context.body : JSON.stringify(context.body); + const body = (context.body instanceof FormData || context.body instanceof File) + ? context.body + : JSON.stringify(context.body); const init = { method: context.method, headers: context.headers, diff --git a/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION index 06b5019af3f4..afa636560641 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.1-SNAPSHOT \ No newline at end of file +4.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts index 1fcb27ef1c5e..364800af0322 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts index 4b645dea987e..d9f9a0465f4c 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts index 4126b817ee94..a54a53211d34 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/default/models/Category.ts index 99df10e5f1a8..0c2fa5ccdcd8 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/Category.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/Category.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/default/models/ModelApiResponse.ts index 369973446b9a..fdfab390edd1 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/ModelApiResponse.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/ModelApiResponse.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/default/models/Order.ts index ef002a60fc9c..7b16f43c4d56 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/Order.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/Order.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/default/models/Pet.ts index 27de4cee46bf..349b27b39e97 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/Pet.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/Pet.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/default/models/Tag.ts index a7dd45562096..39f76e6ddc99 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/Tag.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/Tag.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/User.ts b/samples/client/petstore/typescript-fetch/builds/default/models/User.ts index f42cf94d748d..6fe285d7222d 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/User.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/User.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts index 3af222044b24..0afb0ba14c0a 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -209,7 +209,6 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string { } return `${encodeURIComponent(fullKey)}=${encodeURIComponent(String(value))}`; }) - .filter(part => part.length > 0) .join('&'); } diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION index 06b5019af3f4..afa636560641 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.1-SNAPSHOT \ No newline at end of file +4.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts index 1fcb27ef1c5e..364800af0322 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts index 4b645dea987e..d9f9a0465f4c 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts index 4126b817ee94..a54a53211d34 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Category.ts index 99df10e5f1a8..0c2fa5ccdcd8 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Category.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Category.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/ModelApiResponse.ts index 369973446b9a..fdfab390edd1 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/ModelApiResponse.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/ModelApiResponse.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Order.ts index ef002a60fc9c..7b16f43c4d56 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Order.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Order.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Pet.ts index 27de4cee46bf..349b27b39e97 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Pet.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Pet.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Tag.ts index a7dd45562096..39f76e6ddc99 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Tag.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Tag.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/User.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/User.ts index f42cf94d748d..6fe285d7222d 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/User.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/User.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/package.json b/samples/client/petstore/typescript-fetch/builds/es6-target/package.json index 84e82f3f158d..e600d94f88d1 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/package.json +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/package.json @@ -12,7 +12,7 @@ "devDependencies": { "typescript": "^2.4" }, - "publishConfig": { - "registry": "https://skimdb.npmjs.com/registry" + "publishConfig":{ + "registry":"https://skimdb.npmjs.com/registry" } } diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts index 3af222044b24..0afb0ba14c0a 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -209,7 +209,6 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string { } return `${encodeURIComponent(fullKey)}=${encodeURIComponent(String(value))}`; }) - .filter(part => part.length > 0) .join('&'); } diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION index 06b5019af3f4..afa636560641 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.1-SNAPSHOT \ No newline at end of file +4.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts index 1fcb27ef1c5e..364800af0322 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts index 4b645dea987e..d9f9a0465f4c 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts index 4126b817ee94..a54a53211d34 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Category.ts index 99df10e5f1a8..0c2fa5ccdcd8 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Category.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Category.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ModelApiResponse.ts index 369973446b9a..fdfab390edd1 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ModelApiResponse.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ModelApiResponse.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Order.ts index ef002a60fc9c..7b16f43c4d56 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Order.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Order.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Pet.ts index 27de4cee46bf..349b27b39e97 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Pet.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Pet.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Tag.ts index a7dd45562096..39f76e6ddc99 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Tag.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Tag.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/User.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/User.ts index f42cf94d748d..6fe285d7222d 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/User.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/User.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts index 3af222044b24..0afb0ba14c0a 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -209,7 +209,6 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string { } return `${encodeURIComponent(fullKey)}=${encodeURIComponent(String(value))}`; }) - .filter(part => part.length > 0) .join('&'); } diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION index 06b5019af3f4..afa636560641 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.1-SNAPSHOT \ No newline at end of file +4.0.0-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts index 1fcb27ef1c5e..364800af0322 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts index 4b645dea987e..d9f9a0465f4c 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts index 4126b817ee94..a54a53211d34 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Category.ts index 99df10e5f1a8..0c2fa5ccdcd8 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Category.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Category.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ModelApiResponse.ts index 369973446b9a..fdfab390edd1 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ModelApiResponse.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ModelApiResponse.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Order.ts index ef002a60fc9c..7b16f43c4d56 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Order.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Order.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Pet.ts index 27de4cee46bf..349b27b39e97 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Pet.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Pet.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Tag.ts index a7dd45562096..39f76e6ddc99 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Tag.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Tag.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/User.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/User.ts index f42cf94d748d..6fe285d7222d 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/User.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/User.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/package.json b/samples/client/petstore/typescript-fetch/builds/with-npm-version/package.json index 84e82f3f158d..e600d94f88d1 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/package.json +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/package.json @@ -12,7 +12,7 @@ "devDependencies": { "typescript": "^2.4" }, - "publishConfig": { - "registry": "https://skimdb.npmjs.com/registry" + "publishConfig":{ + "registry":"https://skimdb.npmjs.com/registry" } } diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts index 3af222044b24..0afb0ba14c0a 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * The version of the OpenAPI document: 1.0.0 + * OpenAPI spec version: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -209,7 +209,6 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string { } return `${encodeURIComponent(fullKey)}=${encodeURIComponent(String(value))}`; }) - .filter(part => part.length > 0) .join('&'); } From 8bdc162c6c9461d5599e01d13364de13e8d3a6bf Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Thu, 16 May 2019 09:10:34 +0200 Subject: [PATCH 02/16] Check for Blob instead of File --- .../typescript-fetch/runtime.mustache | 2 +- .../builds/default/apis/PetApi.ts | 21 +++++++----- .../builds/default/apis/StoreApi.ts | 8 ++--- .../builds/default/apis/UserApi.ts | 32 +++++++++---------- .../builds/default/models/index.ts | 2 ++ .../builds/es6-target/apis/PetApi.ts | 21 +++++++----- .../builds/es6-target/apis/StoreApi.ts | 8 ++--- .../builds/es6-target/apis/UserApi.ts | 32 +++++++++---------- .../builds/es6-target/models/index.ts | 2 ++ .../builds/with-interfaces/apis/PetApi.ts | 21 +++++++----- .../builds/with-interfaces/apis/StoreApi.ts | 8 ++--- .../builds/with-interfaces/apis/UserApi.ts | 32 +++++++++---------- .../builds/with-interfaces/models/index.ts | 2 ++ .../builds/with-npm-version/apis/PetApi.ts | 21 +++++++----- .../builds/with-npm-version/apis/StoreApi.ts | 8 ++--- .../builds/with-npm-version/apis/UserApi.ts | 32 +++++++++---------- .../builds/with-npm-version/models/index.ts | 2 ++ 17 files changed, 141 insertions(+), 113 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache index ef55c2acc7bc..652f3a7c88f3 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache @@ -47,7 +47,7 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = (context.body instanceof FormData || context.body instanceof File) + const body = (context.body instanceof FormData || context.body instanceof Body) ? context.body : JSON.stringify(context.body); const init = { diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts index 364800af0322..7d05b40ce17c 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -207,6 +208,10 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts index d9f9a0465f4c..e11c35947a64 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts index a54a53211d34..e1a58762591e 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts index 364800af0322..7d05b40ce17c 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -207,6 +208,10 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts index d9f9a0465f4c..e11c35947a64 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts index a54a53211d34..e1a58762591e 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts index 364800af0322..7d05b40ce17c 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -207,6 +208,10 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts index d9f9a0465f4c..e11c35947a64 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts index a54a53211d34..e1a58762591e 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts index 364800af0322..7d05b40ce17c 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -207,6 +208,10 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts index d9f9a0465f4c..e11c35947a64 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts index a54a53211d34..e1a58762591e 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; From f621eaa62d1545b8a224bd9bb8ae8025a30fd00a Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Mon, 20 May 2019 12:57:16 +0200 Subject: [PATCH 03/16] Update samples --- .../builds/default/apis/PetApi.ts | 21 +++++------- .../builds/default/apis/StoreApi.ts | 8 ++--- .../builds/default/apis/UserApi.ts | 32 +++++++++---------- .../builds/default/models/Category.ts | 2 +- .../builds/default/models/ModelApiResponse.ts | 2 +- .../builds/default/models/Order.ts | 2 +- .../builds/default/models/Pet.ts | 2 +- .../builds/default/models/Tag.ts | 2 +- .../builds/default/models/User.ts | 2 +- .../builds/default/models/index.ts | 2 -- .../builds/default/runtime.ts | 7 ---- .../builds/es6-target/apis/PetApi.ts | 21 +++++------- .../builds/es6-target/apis/StoreApi.ts | 8 ++--- .../builds/es6-target/apis/UserApi.ts | 32 +++++++++---------- .../builds/es6-target/models/Category.ts | 2 +- .../es6-target/models/ModelApiResponse.ts | 2 +- .../builds/es6-target/models/Order.ts | 2 +- .../builds/es6-target/models/Pet.ts | 2 +- .../builds/es6-target/models/Tag.ts | 2 +- .../builds/es6-target/models/User.ts | 2 +- .../builds/es6-target/models/index.ts | 2 -- .../builds/es6-target/runtime.ts | 7 ---- .../builds/with-interfaces/apis/PetApi.ts | 21 +++++------- .../builds/with-interfaces/apis/StoreApi.ts | 8 ++--- .../builds/with-interfaces/apis/UserApi.ts | 32 +++++++++---------- .../builds/with-interfaces/models/Category.ts | 2 +- .../models/ModelApiResponse.ts | 2 +- .../builds/with-interfaces/models/Order.ts | 2 +- .../builds/with-interfaces/models/Pet.ts | 2 +- .../builds/with-interfaces/models/Tag.ts | 2 +- .../builds/with-interfaces/models/User.ts | 2 +- .../builds/with-interfaces/models/index.ts | 2 -- .../builds/with-interfaces/runtime.ts | 7 ---- .../builds/with-npm-version/apis/PetApi.ts | 21 +++++------- .../builds/with-npm-version/apis/StoreApi.ts | 8 ++--- .../builds/with-npm-version/apis/UserApi.ts | 32 +++++++++---------- .../with-npm-version/models/Category.ts | 2 +- .../models/ModelApiResponse.ts | 2 +- .../builds/with-npm-version/models/Order.ts | 2 +- .../builds/with-npm-version/models/Pet.ts | 2 +- .../builds/with-npm-version/models/Tag.ts | 2 +- .../builds/with-npm-version/models/User.ts | 2 +- .../builds/with-npm-version/models/index.ts | 2 -- .../builds/with-npm-version/runtime.ts | 7 ---- 44 files changed, 136 insertions(+), 192 deletions(-) diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts index 7d05b40ce17c..364800af0322 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -208,10 +207,6 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts index e11c35947a64..d9f9a0465f4c 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts index e1a58762591e..a54a53211d34 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/default/models/Category.ts index f4f11d1dc3d6..0c2fa5ccdcd8 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/Category.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/Category.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; /** * A category for a pet * @export diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/default/models/ModelApiResponse.ts index e285742a7361..fdfab390edd1 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/ModelApiResponse.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/ModelApiResponse.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; /** * Describes the result of uploading an image resource * @export diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/default/models/Order.ts index ecd32c32f044..7b16f43c4d56 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/Order.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/Order.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; /** * An order for a pets from the pet store * @export diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/default/models/Pet.ts index 073e307cad98..349b27b39e97 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/Pet.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/Pet.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; import { Category, CategoryFromJSON, diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/default/models/Tag.ts index bf65ba6b04ef..39f76e6ddc99 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/Tag.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/Tag.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; /** * A tag for a pet * @export diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/User.ts b/samples/client/petstore/typescript-fetch/builds/default/models/User.ts index 94e300fafd12..6fe285d7222d 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/User.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/User.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; /** * A User who is purchasing from the pet store * @export diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts index 681379d9ca23..0afb0ba14c0a 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts @@ -212,13 +212,6 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string { .join('&'); } -export function mapValues(data: any, fn: (item: any) => any) { - return Object.keys(data).reduce( - (acc, key) => ({ ...acc, [key]: fn(data[key]) }), - {} - ); -} - export interface RequestContext { fetch: FetchAPI; url: string; diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts index 7d05b40ce17c..364800af0322 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -208,10 +207,6 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts index e11c35947a64..d9f9a0465f4c 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts index e1a58762591e..a54a53211d34 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Category.ts index f4f11d1dc3d6..0c2fa5ccdcd8 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Category.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Category.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; /** * A category for a pet * @export diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/ModelApiResponse.ts index e285742a7361..fdfab390edd1 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/ModelApiResponse.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/ModelApiResponse.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; /** * Describes the result of uploading an image resource * @export diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Order.ts index ecd32c32f044..7b16f43c4d56 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Order.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Order.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; /** * An order for a pets from the pet store * @export diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Pet.ts index 073e307cad98..349b27b39e97 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Pet.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Pet.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; import { Category, CategoryFromJSON, diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Tag.ts index bf65ba6b04ef..39f76e6ddc99 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Tag.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Tag.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; /** * A tag for a pet * @export diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/User.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/User.ts index 94e300fafd12..6fe285d7222d 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/User.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/User.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; /** * A User who is purchasing from the pet store * @export diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts index 681379d9ca23..0afb0ba14c0a 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts @@ -212,13 +212,6 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string { .join('&'); } -export function mapValues(data: any, fn: (item: any) => any) { - return Object.keys(data).reduce( - (acc, key) => ({ ...acc, [key]: fn(data[key]) }), - {} - ); -} - export interface RequestContext { fetch: FetchAPI; url: string; diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts index 7d05b40ce17c..364800af0322 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -208,10 +207,6 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts index e11c35947a64..d9f9a0465f4c 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts index e1a58762591e..a54a53211d34 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Category.ts index f4f11d1dc3d6..0c2fa5ccdcd8 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Category.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Category.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; /** * A category for a pet * @export diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ModelApiResponse.ts index e285742a7361..fdfab390edd1 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ModelApiResponse.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ModelApiResponse.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; /** * Describes the result of uploading an image resource * @export diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Order.ts index ecd32c32f044..7b16f43c4d56 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Order.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Order.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; /** * An order for a pets from the pet store * @export diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Pet.ts index 073e307cad98..349b27b39e97 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Pet.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Pet.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; import { Category, CategoryFromJSON, diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Tag.ts index bf65ba6b04ef..39f76e6ddc99 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Tag.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Tag.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; /** * A tag for a pet * @export diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/User.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/User.ts index 94e300fafd12..6fe285d7222d 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/User.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/User.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; /** * A User who is purchasing from the pet store * @export diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts index 681379d9ca23..0afb0ba14c0a 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts @@ -212,13 +212,6 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string { .join('&'); } -export function mapValues(data: any, fn: (item: any) => any) { - return Object.keys(data).reduce( - (acc, key) => ({ ...acc, [key]: fn(data[key]) }), - {} - ); -} - export interface RequestContext { fetch: FetchAPI; url: string; diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts index 7d05b40ce17c..364800af0322 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -208,10 +207,6 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts index e11c35947a64..d9f9a0465f4c 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts index e1a58762591e..a54a53211d34 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Category.ts index f4f11d1dc3d6..0c2fa5ccdcd8 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Category.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Category.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; /** * A category for a pet * @export diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ModelApiResponse.ts index e285742a7361..fdfab390edd1 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ModelApiResponse.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ModelApiResponse.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; /** * Describes the result of uploading an image resource * @export diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Order.ts index ecd32c32f044..7b16f43c4d56 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Order.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Order.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; /** * An order for a pets from the pet store * @export diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Pet.ts index 073e307cad98..349b27b39e97 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Pet.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Pet.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; import { Category, CategoryFromJSON, diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Tag.ts index bf65ba6b04ef..39f76e6ddc99 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Tag.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Tag.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; /** * A tag for a pet * @export diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/User.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/User.ts index 94e300fafd12..6fe285d7222d 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/User.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/User.ts @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists, mapValues } from '../runtime'; +import { exists } from '../runtime'; /** * A User who is purchasing from the pet store * @export diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts index 681379d9ca23..0afb0ba14c0a 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts @@ -212,13 +212,6 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string { .join('&'); } -export function mapValues(data: any, fn: (item: any) => any) { - return Object.keys(data).reduce( - (acc, key) => ({ ...acc, [key]: fn(data[key]) }), - {} - ); -} - export interface RequestContext { fetch: FetchAPI; url: string; From 04003ee1779d60c8981a9333b983a0ee83dfebf8 Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Mon, 20 May 2019 13:12:31 +0200 Subject: [PATCH 04/16] Update samples --- .../builds/default/apis/PetApi.ts | 21 +++++++----- .../builds/default/apis/StoreApi.ts | 8 ++--- .../builds/default/apis/UserApi.ts | 32 +++++++++---------- .../builds/default/models/index.ts | 2 ++ .../builds/es6-target/apis/PetApi.ts | 21 +++++++----- .../builds/es6-target/apis/StoreApi.ts | 8 ++--- .../builds/es6-target/apis/UserApi.ts | 32 +++++++++---------- .../builds/es6-target/models/index.ts | 2 ++ .../builds/with-interfaces/apis/PetApi.ts | 21 +++++++----- .../builds/with-interfaces/apis/StoreApi.ts | 8 ++--- .../builds/with-interfaces/apis/UserApi.ts | 32 +++++++++---------- .../builds/with-interfaces/models/index.ts | 2 ++ .../builds/with-npm-version/apis/PetApi.ts | 21 +++++++----- .../builds/with-npm-version/apis/StoreApi.ts | 8 ++--- .../builds/with-npm-version/apis/UserApi.ts | 32 +++++++++---------- .../builds/with-npm-version/models/index.ts | 2 ++ 16 files changed, 140 insertions(+), 112 deletions(-) diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts index 364800af0322..7d05b40ce17c 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -207,6 +208,10 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts index d9f9a0465f4c..e11c35947a64 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts index a54a53211d34..e1a58762591e 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts index 364800af0322..7d05b40ce17c 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -207,6 +208,10 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts index d9f9a0465f4c..e11c35947a64 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts index a54a53211d34..e1a58762591e 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts index 364800af0322..7d05b40ce17c 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -207,6 +208,10 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts index d9f9a0465f4c..e11c35947a64 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts index a54a53211d34..e1a58762591e 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts index 364800af0322..7d05b40ce17c 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -207,6 +208,10 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts index d9f9a0465f4c..e11c35947a64 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts index a54a53211d34..e1a58762591e 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; From 73ac4482ea97e7210aefceda22aee82885612143 Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Mon, 20 May 2019 13:32:21 +0200 Subject: [PATCH 05/16] Update samples --- .../builds/default/apis/PetApi.ts | 21 +++++------- .../builds/default/apis/StoreApi.ts | 8 ++--- .../builds/default/apis/UserApi.ts | 32 +++++++++---------- .../builds/default/models/index.ts | 2 -- .../builds/es6-target/apis/PetApi.ts | 21 +++++------- .../builds/es6-target/apis/StoreApi.ts | 8 ++--- .../builds/es6-target/apis/UserApi.ts | 32 +++++++++---------- .../builds/es6-target/models/index.ts | 2 -- .../builds/with-interfaces/apis/PetApi.ts | 21 +++++------- .../builds/with-interfaces/apis/StoreApi.ts | 8 ++--- .../builds/with-interfaces/apis/UserApi.ts | 32 +++++++++---------- .../builds/with-interfaces/models/index.ts | 2 -- .../builds/with-npm-version/apis/PetApi.ts | 21 +++++------- .../builds/with-npm-version/apis/StoreApi.ts | 8 ++--- .../builds/with-npm-version/apis/UserApi.ts | 32 +++++++++---------- .../builds/with-npm-version/models/index.ts | 2 -- 16 files changed, 112 insertions(+), 140 deletions(-) diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts index 7d05b40ce17c..364800af0322 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -208,10 +207,6 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts index e11c35947a64..d9f9a0465f4c 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts index e1a58762591e..a54a53211d34 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts index 7d05b40ce17c..364800af0322 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -208,10 +207,6 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts index e11c35947a64..d9f9a0465f4c 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts index e1a58762591e..a54a53211d34 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts index 7d05b40ce17c..364800af0322 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -208,10 +207,6 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts index e11c35947a64..d9f9a0465f4c 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts index e1a58762591e..a54a53211d34 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts index 7d05b40ce17c..364800af0322 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -208,10 +207,6 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts index e11c35947a64..d9f9a0465f4c 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts index e1a58762591e..a54a53211d34 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; From 0d1cfc8820df782fda047934e6d879f165920e8a Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Mon, 20 May 2019 13:37:35 +0200 Subject: [PATCH 06/16] Update samples --- .../builds/default/.openapi-generator/VERSION | 2 +- .../builds/default/apis/PetApi.ts | 27 +++++++++------ .../builds/default/apis/StoreApi.ts | 10 +++--- .../builds/default/apis/UserApi.ts | 34 +++++++++---------- .../builds/default/models/Category.ts | 4 +-- .../builds/default/models/ModelApiResponse.ts | 4 +-- .../builds/default/models/Order.ts | 4 +-- .../builds/default/models/Pet.ts | 4 +-- .../builds/default/models/Tag.ts | 4 +-- .../builds/default/models/User.ts | 4 +-- .../builds/default/models/index.ts | 2 ++ .../builds/default/runtime.ts | 14 ++++++-- .../es6-target/.openapi-generator/VERSION | 2 +- .../builds/es6-target/apis/PetApi.ts | 27 +++++++++------ .../builds/es6-target/apis/StoreApi.ts | 10 +++--- .../builds/es6-target/apis/UserApi.ts | 34 +++++++++---------- .../builds/es6-target/models/Category.ts | 4 +-- .../es6-target/models/ModelApiResponse.ts | 4 +-- .../builds/es6-target/models/Order.ts | 4 +-- .../builds/es6-target/models/Pet.ts | 4 +-- .../builds/es6-target/models/Tag.ts | 4 +-- .../builds/es6-target/models/User.ts | 4 +-- .../builds/es6-target/models/index.ts | 2 ++ .../builds/es6-target/package.json | 4 +-- .../builds/es6-target/runtime.ts | 14 ++++++-- .../.openapi-generator/VERSION | 2 +- .../builds/with-interfaces/apis/PetApi.ts | 27 +++++++++------ .../builds/with-interfaces/apis/StoreApi.ts | 10 +++--- .../builds/with-interfaces/apis/UserApi.ts | 34 +++++++++---------- .../builds/with-interfaces/models/Category.ts | 4 +-- .../models/ModelApiResponse.ts | 4 +-- .../builds/with-interfaces/models/Order.ts | 4 +-- .../builds/with-interfaces/models/Pet.ts | 4 +-- .../builds/with-interfaces/models/Tag.ts | 4 +-- .../builds/with-interfaces/models/User.ts | 4 +-- .../builds/with-interfaces/models/index.ts | 2 ++ .../builds/with-interfaces/runtime.ts | 14 ++++++-- .../.openapi-generator/VERSION | 2 +- .../builds/with-npm-version/apis/PetApi.ts | 27 +++++++++------ .../builds/with-npm-version/apis/StoreApi.ts | 10 +++--- .../builds/with-npm-version/apis/UserApi.ts | 34 +++++++++---------- .../with-npm-version/models/Category.ts | 4 +-- .../models/ModelApiResponse.ts | 4 +-- .../builds/with-npm-version/models/Order.ts | 4 +-- .../builds/with-npm-version/models/Pet.ts | 4 +-- .../builds/with-npm-version/models/Tag.ts | 4 +-- .../builds/with-npm-version/models/User.ts | 4 +-- .../builds/with-npm-version/models/index.ts | 2 ++ .../builds/with-npm-version/package.json | 4 +-- .../builds/with-npm-version/runtime.ts | 14 ++++++-- 50 files changed, 264 insertions(+), 196 deletions(-) diff --git a/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION index afa636560641..06b5019af3f4 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/default/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts index 364800af0322..4185547227aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts index d9f9a0465f4c..6ea93eb0757b 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts index a54a53211d34..e4daeb849130 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/default/models/Category.ts index 0c2fa5ccdcd8..f8809dccbea3 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/Category.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/Category.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; /** * A category for a pet * @export diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/default/models/ModelApiResponse.ts index fdfab390edd1..8b8e2c45fecd 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/ModelApiResponse.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/ModelApiResponse.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; /** * Describes the result of uploading an image resource * @export diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/default/models/Order.ts index 7b16f43c4d56..6ce0496794f6 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/Order.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/Order.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; /** * An order for a pets from the pet store * @export diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/default/models/Pet.ts index 349b27b39e97..770f991b89d9 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/Pet.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/Pet.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; import { Category, CategoryFromJSON, diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/default/models/Tag.ts index 39f76e6ddc99..7c8098f6dc01 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/Tag.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/Tag.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; /** * A tag for a pet * @export diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/User.ts b/samples/client/petstore/typescript-fetch/builds/default/models/User.ts index 6fe285d7222d..fd7430063f1c 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/User.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/User.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; /** * A User who is purchasing from the pet store * @export diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts index 0afb0ba14c0a..30278cad8aa4 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -58,7 +58,9 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = context.body instanceof FormData ? context.body : JSON.stringify(context.body); + const body = (context.body instanceof FormData || context.body instanceof Body) + ? context.body + : JSON.stringify(context.body); const init = { method: context.method, headers: context.headers, @@ -209,9 +211,17 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string { } return `${encodeURIComponent(fullKey)}=${encodeURIComponent(String(value))}`; }) + .filter(part => part.length > 0) .join('&'); } +export function mapValues(data: any, fn: (item: any) => any) { + return Object.keys(data).reduce( + (acc, key) => ({ ...acc, [key]: fn(data[key]) }), + {} + ); +} + export interface RequestContext { fetch: FetchAPI; url: string; diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION index afa636560641..06b5019af3f4 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts index 364800af0322..4185547227aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts index d9f9a0465f4c..6ea93eb0757b 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts index a54a53211d34..e4daeb849130 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Category.ts index 0c2fa5ccdcd8..f8809dccbea3 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Category.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Category.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; /** * A category for a pet * @export diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/ModelApiResponse.ts index fdfab390edd1..8b8e2c45fecd 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/ModelApiResponse.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/ModelApiResponse.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; /** * Describes the result of uploading an image resource * @export diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Order.ts index 7b16f43c4d56..6ce0496794f6 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Order.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Order.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; /** * An order for a pets from the pet store * @export diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Pet.ts index 349b27b39e97..770f991b89d9 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Pet.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Pet.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; import { Category, CategoryFromJSON, diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Tag.ts index 39f76e6ddc99..7c8098f6dc01 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/Tag.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/Tag.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; /** * A tag for a pet * @export diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/User.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/User.ts index 6fe285d7222d..fd7430063f1c 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/User.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/User.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; /** * A User who is purchasing from the pet store * @export diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/package.json b/samples/client/petstore/typescript-fetch/builds/es6-target/package.json index e600d94f88d1..84e82f3f158d 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/package.json +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/package.json @@ -12,7 +12,7 @@ "devDependencies": { "typescript": "^2.4" }, - "publishConfig":{ - "registry":"https://skimdb.npmjs.com/registry" + "publishConfig": { + "registry": "https://skimdb.npmjs.com/registry" } } diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts index 0afb0ba14c0a..30278cad8aa4 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -58,7 +58,9 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = context.body instanceof FormData ? context.body : JSON.stringify(context.body); + const body = (context.body instanceof FormData || context.body instanceof Body) + ? context.body + : JSON.stringify(context.body); const init = { method: context.method, headers: context.headers, @@ -209,9 +211,17 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string { } return `${encodeURIComponent(fullKey)}=${encodeURIComponent(String(value))}`; }) + .filter(part => part.length > 0) .join('&'); } +export function mapValues(data: any, fn: (item: any) => any) { + return Object.keys(data).reduce( + (acc, key) => ({ ...acc, [key]: fn(data[key]) }), + {} + ); +} + export interface RequestContext { fetch: FetchAPI; url: string; diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION index afa636560641..06b5019af3f4 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts index 364800af0322..4185547227aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts index d9f9a0465f4c..6ea93eb0757b 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts index a54a53211d34..e4daeb849130 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Category.ts index 0c2fa5ccdcd8..f8809dccbea3 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Category.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Category.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; /** * A category for a pet * @export diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ModelApiResponse.ts index fdfab390edd1..8b8e2c45fecd 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ModelApiResponse.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ModelApiResponse.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; /** * Describes the result of uploading an image resource * @export diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Order.ts index 7b16f43c4d56..6ce0496794f6 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Order.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Order.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; /** * An order for a pets from the pet store * @export diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Pet.ts index 349b27b39e97..770f991b89d9 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Pet.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Pet.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; import { Category, CategoryFromJSON, diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Tag.ts index 39f76e6ddc99..7c8098f6dc01 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Tag.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/Tag.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; /** * A tag for a pet * @export diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/User.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/User.ts index 6fe285d7222d..fd7430063f1c 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/User.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/User.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; /** * A User who is purchasing from the pet store * @export diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts index 0afb0ba14c0a..30278cad8aa4 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -58,7 +58,9 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = context.body instanceof FormData ? context.body : JSON.stringify(context.body); + const body = (context.body instanceof FormData || context.body instanceof Body) + ? context.body + : JSON.stringify(context.body); const init = { method: context.method, headers: context.headers, @@ -209,9 +211,17 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string { } return `${encodeURIComponent(fullKey)}=${encodeURIComponent(String(value))}`; }) + .filter(part => part.length > 0) .join('&'); } +export function mapValues(data: any, fn: (item: any) => any) { + return Object.keys(data).reduce( + (acc, key) => ({ ...acc, [key]: fn(data[key]) }), + {} + ); +} + export interface RequestContext { fetch: FetchAPI; url: string; diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION index afa636560641..06b5019af3f4 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.openapi-generator/VERSION @@ -1 +1 @@ -4.0.0-SNAPSHOT \ No newline at end of file +4.0.1-SNAPSHOT \ No newline at end of file diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts index 364800af0322..4185547227aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts index d9f9a0465f4c..6ea93eb0757b 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts index a54a53211d34..e4daeb849130 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Category.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Category.ts index 0c2fa5ccdcd8..f8809dccbea3 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Category.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Category.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; /** * A category for a pet * @export diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ModelApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ModelApiResponse.ts index fdfab390edd1..8b8e2c45fecd 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ModelApiResponse.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ModelApiResponse.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; /** * Describes the result of uploading an image resource * @export diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Order.ts index 7b16f43c4d56..6ce0496794f6 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Order.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Order.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; /** * An order for a pets from the pet store * @export diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Pet.ts index 349b27b39e97..770f991b89d9 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Pet.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Pet.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; import { Category, CategoryFromJSON, diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Tag.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Tag.ts index 39f76e6ddc99..7c8098f6dc01 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Tag.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/Tag.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; /** * A tag for a pet * @export diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/User.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/User.ts index 6fe285d7222d..fd7430063f1c 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/User.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/User.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -11,7 +11,7 @@ * Do not edit the class manually. */ -import { exists } from '../runtime'; +import { exists, mapValues } from '../runtime'; /** * A User who is purchasing from the pet store * @export diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/package.json b/samples/client/petstore/typescript-fetch/builds/with-npm-version/package.json index e600d94f88d1..84e82f3f158d 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/package.json +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/package.json @@ -12,7 +12,7 @@ "devDependencies": { "typescript": "^2.4" }, - "publishConfig":{ - "registry":"https://skimdb.npmjs.com/registry" + "publishConfig": { + "registry": "https://skimdb.npmjs.com/registry" } } diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts index 0afb0ba14c0a..30278cad8aa4 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts @@ -3,7 +3,7 @@ * OpenAPI Petstore * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. * - * OpenAPI spec version: 1.0.0 + * The version of the OpenAPI document: 1.0.0 * * * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). @@ -58,7 +58,9 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = context.body instanceof FormData ? context.body : JSON.stringify(context.body); + const body = (context.body instanceof FormData || context.body instanceof Body) + ? context.body + : JSON.stringify(context.body); const init = { method: context.method, headers: context.headers, @@ -209,9 +211,17 @@ export function querystring(params: HTTPQuery, prefix: string = ''): string { } return `${encodeURIComponent(fullKey)}=${encodeURIComponent(String(value))}`; }) + .filter(part => part.length > 0) .join('&'); } +export function mapValues(data: any, fn: (item: any) => any) { + return Object.keys(data).reduce( + (acc, key) => ({ ...acc, [key]: fn(data[key]) }), + {} + ); +} + export interface RequestContext { fetch: FetchAPI; url: string; From df125e6feae6b68f7b3fae74cb4c1d15352e6687 Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Wed, 22 May 2019 12:38:02 +0200 Subject: [PATCH 07/16] Regenerate samples --- .../builds/default/apis/PetApi.ts | 25 ++++----- .../builds/default/apis/StoreApi.ts | 8 +-- .../builds/default/apis/UserApi.ts | 32 ++++++------ .../builds/default/models/InlineObject.ts | 52 +++++++++++++++++++ .../builds/default/models/InlineObject1.ts | 52 +++++++++++++++++++ .../builds/default/models/index.ts | 2 - .../builds/es6-target/apis/PetApi.ts | 25 ++++----- .../builds/es6-target/apis/StoreApi.ts | 8 +-- .../builds/es6-target/apis/UserApi.ts | 32 ++++++------ .../builds/es6-target/models/InlineObject.ts | 52 +++++++++++++++++++ .../builds/es6-target/models/InlineObject1.ts | 52 +++++++++++++++++++ .../builds/es6-target/models/index.ts | 2 - .../builds/with-interfaces/apis/PetApi.ts | 25 ++++----- .../builds/with-interfaces/apis/StoreApi.ts | 8 +-- .../builds/with-interfaces/apis/UserApi.ts | 32 ++++++------ .../with-interfaces/models/InlineObject.ts | 52 +++++++++++++++++++ .../with-interfaces/models/InlineObject1.ts | 52 +++++++++++++++++++ .../builds/with-interfaces/models/index.ts | 2 - .../builds/with-npm-version/apis/PetApi.ts | 25 ++++----- .../builds/with-npm-version/apis/StoreApi.ts | 8 +-- .../builds/with-npm-version/apis/UserApi.ts | 32 ++++++------ .../with-npm-version/models/InlineObject.ts | 52 +++++++++++++++++++ .../with-npm-version/models/InlineObject1.ts | 52 +++++++++++++++++++ .../builds/with-npm-version/models/index.ts | 2 - 24 files changed, 536 insertions(+), 148 deletions(-) create mode 100644 samples/client/petstore/typescript-fetch/builds/default/models/InlineObject.ts create mode 100644 samples/client/petstore/typescript-fetch/builds/default/models/InlineObject1.ts create mode 100644 samples/client/petstore/typescript-fetch/builds/es6-target/models/InlineObject.ts create mode 100644 samples/client/petstore/typescript-fetch/builds/es6-target/models/InlineObject1.ts create mode 100644 samples/client/petstore/typescript-fetch/builds/with-interfaces/models/InlineObject.ts create mode 100644 samples/client/petstore/typescript-fetch/builds/with-interfaces/models/InlineObject1.ts create mode 100644 samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject.ts create mode 100644 samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject1.ts diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts index 4185547227aa..1fcb27ef1c5e 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -168,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -208,16 +207,12 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts index 6ea93eb0757b..4b645dea987e 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts index e4daeb849130..4126b817ee94 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/InlineObject.ts b/samples/client/petstore/typescript-fetch/builds/default/models/InlineObject.ts new file mode 100644 index 000000000000..2998b1463ce5 --- /dev/null +++ b/samples/client/petstore/typescript-fetch/builds/default/models/InlineObject.ts @@ -0,0 +1,52 @@ +// tslint:disable +/** + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +import { exists, mapValues } from '../runtime'; +/** + * + * @export + * @interface InlineObject + */ +export interface InlineObject { + /** + * Updated name of the pet + * @type {string} + * @memberof InlineObject + */ + name?: string; + /** + * Updated status of the pet + * @type {string} + * @memberof InlineObject + */ + status?: string; +} + +export function InlineObjectFromJSON(json: any): InlineObject { + return { + 'name': !exists(json, 'name') ? undefined : json['name'], + 'status': !exists(json, 'status') ? undefined : json['status'], + }; +} + +export function InlineObjectToJSON(value?: InlineObject): any { + if (value === undefined) { + return undefined; + } + return { + 'name': value.name, + 'status': value.status, + }; +} + + diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/InlineObject1.ts b/samples/client/petstore/typescript-fetch/builds/default/models/InlineObject1.ts new file mode 100644 index 000000000000..4cd90b137959 --- /dev/null +++ b/samples/client/petstore/typescript-fetch/builds/default/models/InlineObject1.ts @@ -0,0 +1,52 @@ +// tslint:disable +/** + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +import { exists, mapValues } from '../runtime'; +/** + * + * @export + * @interface InlineObject1 + */ +export interface InlineObject1 { + /** + * Additional data to pass to server + * @type {string} + * @memberof InlineObject1 + */ + additionalMetadata?: string; + /** + * file to upload + * @type {Blob} + * @memberof InlineObject1 + */ + file?: Blob; +} + +export function InlineObject1FromJSON(json: any): InlineObject1 { + return { + 'additionalMetadata': !exists(json, 'additionalMetadata') ? undefined : json['additionalMetadata'], + 'file': !exists(json, 'file') ? undefined : json['file'], + }; +} + +export function InlineObject1ToJSON(value?: InlineObject1): any { + if (value === undefined) { + return undefined; + } + return { + 'additionalMetadata': value.additionalMetadata, + 'file': value.file, + }; +} + + diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts index 4185547227aa..1fcb27ef1c5e 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -168,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -208,16 +207,12 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts index 6ea93eb0757b..4b645dea987e 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts index e4daeb849130..4126b817ee94 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/InlineObject.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/InlineObject.ts new file mode 100644 index 000000000000..2998b1463ce5 --- /dev/null +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/InlineObject.ts @@ -0,0 +1,52 @@ +// tslint:disable +/** + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +import { exists, mapValues } from '../runtime'; +/** + * + * @export + * @interface InlineObject + */ +export interface InlineObject { + /** + * Updated name of the pet + * @type {string} + * @memberof InlineObject + */ + name?: string; + /** + * Updated status of the pet + * @type {string} + * @memberof InlineObject + */ + status?: string; +} + +export function InlineObjectFromJSON(json: any): InlineObject { + return { + 'name': !exists(json, 'name') ? undefined : json['name'], + 'status': !exists(json, 'status') ? undefined : json['status'], + }; +} + +export function InlineObjectToJSON(value?: InlineObject): any { + if (value === undefined) { + return undefined; + } + return { + 'name': value.name, + 'status': value.status, + }; +} + + diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/InlineObject1.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/InlineObject1.ts new file mode 100644 index 000000000000..4cd90b137959 --- /dev/null +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/InlineObject1.ts @@ -0,0 +1,52 @@ +// tslint:disable +/** + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +import { exists, mapValues } from '../runtime'; +/** + * + * @export + * @interface InlineObject1 + */ +export interface InlineObject1 { + /** + * Additional data to pass to server + * @type {string} + * @memberof InlineObject1 + */ + additionalMetadata?: string; + /** + * file to upload + * @type {Blob} + * @memberof InlineObject1 + */ + file?: Blob; +} + +export function InlineObject1FromJSON(json: any): InlineObject1 { + return { + 'additionalMetadata': !exists(json, 'additionalMetadata') ? undefined : json['additionalMetadata'], + 'file': !exists(json, 'file') ? undefined : json['file'], + }; +} + +export function InlineObject1ToJSON(value?: InlineObject1): any { + if (value === undefined) { + return undefined; + } + return { + 'additionalMetadata': value.additionalMetadata, + 'file': value.file, + }; +} + + diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts index 4185547227aa..1fcb27ef1c5e 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -168,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -208,16 +207,12 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts index 6ea93eb0757b..4b645dea987e 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts index e4daeb849130..4126b817ee94 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/InlineObject.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/InlineObject.ts new file mode 100644 index 000000000000..2998b1463ce5 --- /dev/null +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/InlineObject.ts @@ -0,0 +1,52 @@ +// tslint:disable +/** + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +import { exists, mapValues } from '../runtime'; +/** + * + * @export + * @interface InlineObject + */ +export interface InlineObject { + /** + * Updated name of the pet + * @type {string} + * @memberof InlineObject + */ + name?: string; + /** + * Updated status of the pet + * @type {string} + * @memberof InlineObject + */ + status?: string; +} + +export function InlineObjectFromJSON(json: any): InlineObject { + return { + 'name': !exists(json, 'name') ? undefined : json['name'], + 'status': !exists(json, 'status') ? undefined : json['status'], + }; +} + +export function InlineObjectToJSON(value?: InlineObject): any { + if (value === undefined) { + return undefined; + } + return { + 'name': value.name, + 'status': value.status, + }; +} + + diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/InlineObject1.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/InlineObject1.ts new file mode 100644 index 000000000000..4cd90b137959 --- /dev/null +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/InlineObject1.ts @@ -0,0 +1,52 @@ +// tslint:disable +/** + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +import { exists, mapValues } from '../runtime'; +/** + * + * @export + * @interface InlineObject1 + */ +export interface InlineObject1 { + /** + * Additional data to pass to server + * @type {string} + * @memberof InlineObject1 + */ + additionalMetadata?: string; + /** + * file to upload + * @type {Blob} + * @memberof InlineObject1 + */ + file?: Blob; +} + +export function InlineObject1FromJSON(json: any): InlineObject1 { + return { + 'additionalMetadata': !exists(json, 'additionalMetadata') ? undefined : json['additionalMetadata'], + 'file': !exists(json, 'file') ? undefined : json['file'], + }; +} + +export function InlineObject1ToJSON(value?: InlineObject1): any { + if (value === undefined) { + return undefined; + } + return { + 'additionalMetadata': value.additionalMetadata, + 'file': value.file, + }; +} + + diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts index 4185547227aa..1fcb27ef1c5e 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -168,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -208,16 +207,12 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts index 6ea93eb0757b..4b645dea987e 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts index e4daeb849130..4126b817ee94 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject.ts new file mode 100644 index 000000000000..2998b1463ce5 --- /dev/null +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject.ts @@ -0,0 +1,52 @@ +// tslint:disable +/** + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +import { exists, mapValues } from '../runtime'; +/** + * + * @export + * @interface InlineObject + */ +export interface InlineObject { + /** + * Updated name of the pet + * @type {string} + * @memberof InlineObject + */ + name?: string; + /** + * Updated status of the pet + * @type {string} + * @memberof InlineObject + */ + status?: string; +} + +export function InlineObjectFromJSON(json: any): InlineObject { + return { + 'name': !exists(json, 'name') ? undefined : json['name'], + 'status': !exists(json, 'status') ? undefined : json['status'], + }; +} + +export function InlineObjectToJSON(value?: InlineObject): any { + if (value === undefined) { + return undefined; + } + return { + 'name': value.name, + 'status': value.status, + }; +} + + diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject1.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject1.ts new file mode 100644 index 000000000000..4cd90b137959 --- /dev/null +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject1.ts @@ -0,0 +1,52 @@ +// tslint:disable +/** + * OpenAPI Petstore + * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +import { exists, mapValues } from '../runtime'; +/** + * + * @export + * @interface InlineObject1 + */ +export interface InlineObject1 { + /** + * Additional data to pass to server + * @type {string} + * @memberof InlineObject1 + */ + additionalMetadata?: string; + /** + * file to upload + * @type {Blob} + * @memberof InlineObject1 + */ + file?: Blob; +} + +export function InlineObject1FromJSON(json: any): InlineObject1 { + return { + 'additionalMetadata': !exists(json, 'additionalMetadata') ? undefined : json['additionalMetadata'], + 'file': !exists(json, 'file') ? undefined : json['file'], + }; +} + +export function InlineObject1ToJSON(value?: InlineObject1): any { + if (value === undefined) { + return undefined; + } + return { + 'additionalMetadata': value.additionalMetadata, + 'file': value.file, + }; +} + + diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; From bf7ee5ec4cd93fcd075643c276281bd5e9fbc00c Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Wed, 22 May 2019 13:01:20 +0200 Subject: [PATCH 08/16] Bug --- .../typescript-fetch/runtime.mustache | 2 +- .../builds/default/apis/PetApi.ts | 25 +++++++++------ .../builds/default/apis/StoreApi.ts | 8 ++--- .../builds/default/apis/UserApi.ts | 32 +++++++++---------- .../builds/default/models/index.ts | 2 ++ .../builds/default/runtime.ts | 2 +- .../builds/es6-target/apis/PetApi.ts | 25 +++++++++------ .../builds/es6-target/apis/StoreApi.ts | 8 ++--- .../builds/es6-target/apis/UserApi.ts | 32 +++++++++---------- .../builds/es6-target/models/index.ts | 2 ++ .../builds/es6-target/runtime.ts | 2 +- .../builds/with-interfaces/apis/PetApi.ts | 25 +++++++++------ .../builds/with-interfaces/apis/StoreApi.ts | 8 ++--- .../builds/with-interfaces/apis/UserApi.ts | 32 +++++++++---------- .../builds/with-interfaces/models/index.ts | 2 ++ .../builds/with-interfaces/runtime.ts | 2 +- .../builds/with-npm-version/apis/PetApi.ts | 25 +++++++++------ .../builds/with-npm-version/apis/StoreApi.ts | 8 ++--- .../builds/with-npm-version/apis/UserApi.ts | 32 +++++++++---------- .../builds/with-npm-version/models/index.ts | 2 ++ .../builds/with-npm-version/runtime.ts | 2 +- 21 files changed, 153 insertions(+), 125 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache index d786fa6b1465..9130a8e5332b 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache @@ -47,7 +47,7 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = (context.body instanceof FormData || context.body instanceof Body) + const body = (context.body instanceof FormData || context.body instanceof Blob) ? context.body : JSON.stringify(context.body); const init = { diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts index 1fcb27ef1c5e..4185547227aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts index 4b645dea987e..6ea93eb0757b 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts index 4126b817ee94..e4daeb849130 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts index 30278cad8aa4..5d5f1ed75ead 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts @@ -58,7 +58,7 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = (context.body instanceof FormData || context.body instanceof Body) + const body = (context.body instanceof FormData || context.body instanceof Blob) ? context.body : JSON.stringify(context.body); const init = { diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts index 1fcb27ef1c5e..4185547227aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts index 4b645dea987e..6ea93eb0757b 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts index 4126b817ee94..e4daeb849130 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts index 30278cad8aa4..5d5f1ed75ead 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts @@ -58,7 +58,7 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = (context.body instanceof FormData || context.body instanceof Body) + const body = (context.body instanceof FormData || context.body instanceof Blob) ? context.body : JSON.stringify(context.body); const init = { diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts index 1fcb27ef1c5e..4185547227aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts index 4b645dea987e..6ea93eb0757b 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts index 4126b817ee94..e4daeb849130 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts index 30278cad8aa4..5d5f1ed75ead 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts @@ -58,7 +58,7 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = (context.body instanceof FormData || context.body instanceof Body) + const body = (context.body instanceof FormData || context.body instanceof Blob) ? context.body : JSON.stringify(context.body); const init = { diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts index 1fcb27ef1c5e..4185547227aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts index 4b645dea987e..6ea93eb0757b 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts index 4126b817ee94..e4daeb849130 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts index 30278cad8aa4..5d5f1ed75ead 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts @@ -58,7 +58,7 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = (context.body instanceof FormData || context.body instanceof Body) + const body = (context.body instanceof FormData || context.body instanceof Blob) ? context.body : JSON.stringify(context.body); const init = { From d8514aa7eef446531ba02db339308143deaba467 Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Wed, 22 May 2019 13:31:06 +0200 Subject: [PATCH 09/16] Manually fix samples --- .../petstore/typescript-fetch/tests/default/test/PetApi.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/client/petstore/typescript-fetch/tests/default/test/PetApi.ts b/samples/client/petstore/typescript-fetch/tests/default/test/PetApi.ts index c452573699d5..0890467a5c07 100644 --- a/samples/client/petstore/typescript-fetch/tests/default/test/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/tests/default/test/PetApi.ts @@ -16,7 +16,7 @@ describe('PetApi', () => { }); it('should add and delete Pet', () => { - return api.addPet({ body: fixture }).then(() => { + return api.addPet({ pet: fixture }).then(() => { }); }); @@ -29,7 +29,7 @@ describe('PetApi', () => { it('should update Pet by ID', () => { return api.getPetById({ petId: fixture.id }).then((result: Pet) => { result.name = 'newname'; - return api.updatePet({ body: result }).then(() => { + return api.updatePet({ pet: result }).then(() => { return api.getPetById({ petId: fixture.id }).then((result: Pet) => { return expect(result.name).to.deep.equal('newname'); }); From 68cd6dcf75ca4b6171094d023d70eda8226e6f53 Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Thu, 23 May 2019 14:00:11 +0200 Subject: [PATCH 10/16] Implement support for Buffer and Blob in a backwards-compatible way --- .../typescript-fetch/runtime.mustache | 7 ++-- .../builds/default/apis/PetApi.ts | 25 ++++++--------- .../builds/default/apis/StoreApi.ts | 8 ++--- .../builds/default/apis/UserApi.ts | 32 +++++++++---------- .../builds/default/models/index.ts | 2 -- .../builds/default/runtime.ts | 7 ++-- .../builds/es6-target/apis/PetApi.ts | 25 ++++++--------- .../builds/es6-target/apis/StoreApi.ts | 8 ++--- .../builds/es6-target/apis/UserApi.ts | 32 +++++++++---------- .../builds/es6-target/models/index.ts | 2 -- .../builds/es6-target/runtime.ts | 7 ++-- .../builds/with-interfaces/apis/PetApi.ts | 25 ++++++--------- .../builds/with-interfaces/apis/StoreApi.ts | 8 ++--- .../builds/with-interfaces/apis/UserApi.ts | 32 +++++++++---------- .../builds/with-interfaces/models/index.ts | 2 -- .../builds/with-interfaces/runtime.ts | 7 ++-- .../builds/with-npm-version/apis/PetApi.ts | 25 ++++++--------- .../builds/with-npm-version/apis/StoreApi.ts | 8 ++--- .../builds/with-npm-version/apis/UserApi.ts | 32 +++++++++---------- .../builds/with-npm-version/models/index.ts | 2 -- .../builds/with-npm-version/runtime.ts | 7 ++-- 21 files changed, 145 insertions(+), 158 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache index 9130a8e5332b..93656a69bd60 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache @@ -3,6 +3,9 @@ export const BASE_PATH = "{{{basePath}}}".replace(/\/+$/, ""); +const Blob = Blob !== undefined ? Blob : function() {}; +const Buffer = Buffer !== undefined ? Buffer : function() {}; + /** * This is the base class for all generated API classes. */ @@ -47,7 +50,7 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = (context.body instanceof FormData || context.body instanceof Blob) + const body = (context.body instanceof FormData || context.body instanceof Blob || context.body instanceof Buffer) ? context.body : JSON.stringify(context.body); const init = { @@ -164,7 +167,7 @@ export type Json = any; export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'; export type HTTPHeaders = { [key: string]: string }; export type HTTPQuery = { [key: string]: string | number | null | boolean | Array | HTTPQuery }; -export type HTTPBody = Json | FormData; +export type HTTPBody = Json | FormData | Blob | Buffer; export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original'; export interface FetchParams { diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts index 4185547227aa..1fcb27ef1c5e 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -168,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -208,16 +207,12 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts index 6ea93eb0757b..4b645dea987e 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts index e4daeb849130..4126b817ee94 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts index 5d5f1ed75ead..795e0745eab2 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts @@ -14,6 +14,9 @@ export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); +const Blob = Blob !== undefined ? Blob : function() {}; +const Buffer = Buffer !== undefined ? Buffer : function() {}; + /** * This is the base class for all generated API classes. */ @@ -58,7 +61,7 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = (context.body instanceof FormData || context.body instanceof Blob) + const body = (context.body instanceof FormData || context.body instanceof Blob || context.body instanceof Buffer) ? context.body : JSON.stringify(context.body); const init = { @@ -175,7 +178,7 @@ export type Json = any; export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'; export type HTTPHeaders = { [key: string]: string }; export type HTTPQuery = { [key: string]: string | number | null | boolean | Array | HTTPQuery }; -export type HTTPBody = Json | FormData; +export type HTTPBody = Json | FormData | Blob | Buffer; export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original'; export interface FetchParams { diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts index 4185547227aa..1fcb27ef1c5e 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -168,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -208,16 +207,12 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts index 6ea93eb0757b..4b645dea987e 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts index e4daeb849130..4126b817ee94 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts index 5d5f1ed75ead..795e0745eab2 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts @@ -14,6 +14,9 @@ export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); +const Blob = Blob !== undefined ? Blob : function() {}; +const Buffer = Buffer !== undefined ? Buffer : function() {}; + /** * This is the base class for all generated API classes. */ @@ -58,7 +61,7 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = (context.body instanceof FormData || context.body instanceof Blob) + const body = (context.body instanceof FormData || context.body instanceof Blob || context.body instanceof Buffer) ? context.body : JSON.stringify(context.body); const init = { @@ -175,7 +178,7 @@ export type Json = any; export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'; export type HTTPHeaders = { [key: string]: string }; export type HTTPQuery = { [key: string]: string | number | null | boolean | Array | HTTPQuery }; -export type HTTPBody = Json | FormData; +export type HTTPBody = Json | FormData | Blob | Buffer; export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original'; export interface FetchParams { diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts index 4185547227aa..1fcb27ef1c5e 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -168,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -208,16 +207,12 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts index 6ea93eb0757b..4b645dea987e 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts index e4daeb849130..4126b817ee94 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts index 5d5f1ed75ead..795e0745eab2 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts @@ -14,6 +14,9 @@ export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); +const Blob = Blob !== undefined ? Blob : function() {}; +const Buffer = Buffer !== undefined ? Buffer : function() {}; + /** * This is the base class for all generated API classes. */ @@ -58,7 +61,7 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = (context.body instanceof FormData || context.body instanceof Blob) + const body = (context.body instanceof FormData || context.body instanceof Blob || context.body instanceof Buffer) ? context.body : JSON.stringify(context.body); const init = { @@ -175,7 +178,7 @@ export type Json = any; export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'; export type HTTPHeaders = { [key: string]: string }; export type HTTPQuery = { [key: string]: string | number | null | boolean | Array | HTTPQuery }; -export type HTTPBody = Json | FormData; +export type HTTPBody = Json | FormData | Blob | Buffer; export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original'; export interface FetchParams { diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts index 4185547227aa..1fcb27ef1c5e 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -168,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -208,16 +207,12 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts index 6ea93eb0757b..4b645dea987e 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts index e4daeb849130..4126b817ee94 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts index 5d5f1ed75ead..795e0745eab2 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts @@ -14,6 +14,9 @@ export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); +const Blob = Blob !== undefined ? Blob : function() {}; +const Buffer = Buffer !== undefined ? Buffer : function() {}; + /** * This is the base class for all generated API classes. */ @@ -58,7 +61,7 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = (context.body instanceof FormData || context.body instanceof Blob) + const body = (context.body instanceof FormData || context.body instanceof Blob || context.body instanceof Buffer) ? context.body : JSON.stringify(context.body); const init = { @@ -175,7 +178,7 @@ export type Json = any; export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'; export type HTTPHeaders = { [key: string]: string }; export type HTTPQuery = { [key: string]: string | number | null | boolean | Array | HTTPQuery }; -export type HTTPBody = Json | FormData; +export type HTTPBody = Json | FormData | Blob | Buffer; export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original'; export interface FetchParams { From 915868a4f36e56612673af60b1d73a3594edc777 Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Fri, 24 May 2019 10:51:57 +0200 Subject: [PATCH 11/16] Rework how blob and buffer instance checking works --- .../typescript-fetch/runtime.mustache | 6 ++-- .../builds/default/apis/PetApi.ts | 25 +++++++++------ .../builds/default/apis/StoreApi.ts | 8 ++--- .../builds/default/apis/UserApi.ts | 32 +++++++++---------- .../builds/default/models/index.ts | 2 ++ .../builds/default/runtime.ts | 6 ++-- .../builds/es6-target/apis/PetApi.ts | 25 +++++++++------ .../builds/es6-target/apis/StoreApi.ts | 8 ++--- .../builds/es6-target/apis/UserApi.ts | 32 +++++++++---------- .../builds/es6-target/models/index.ts | 2 ++ .../builds/es6-target/runtime.ts | 6 ++-- .../builds/with-interfaces/apis/PetApi.ts | 25 +++++++++------ .../builds/with-interfaces/apis/StoreApi.ts | 8 ++--- .../builds/with-interfaces/apis/UserApi.ts | 32 +++++++++---------- .../builds/with-interfaces/models/index.ts | 2 ++ .../builds/with-interfaces/runtime.ts | 6 ++-- .../builds/with-npm-version/apis/PetApi.ts | 25 +++++++++------ .../builds/with-npm-version/apis/StoreApi.ts | 8 ++--- .../builds/with-npm-version/apis/UserApi.ts | 32 +++++++++---------- .../builds/with-npm-version/models/index.ts | 2 ++ .../builds/with-npm-version/runtime.ts | 6 ++-- 21 files changed, 163 insertions(+), 135 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache index 93656a69bd60..3fbe764ced94 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache @@ -3,8 +3,8 @@ export const BASE_PATH = "{{{basePath}}}".replace(/\/+$/, ""); -const Blob = Blob !== undefined ? Blob : function() {}; -const Buffer = Buffer !== undefined ? Buffer : function() {}; +const isBlob = (value: any) => Blob !== undefined && value instanceof Blob; +const isBuffer = (value: any) => Buffer !== undefined && value instanceof Buffer; /** * This is the base class for all generated API classes. @@ -50,7 +50,7 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = (context.body instanceof FormData || context.body instanceof Blob || context.body instanceof Buffer) + const body = (context.body instanceof FormData || isBlob(context.body) || isBuffer(context.body)) ? context.body : JSON.stringify(context.body); const init = { diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts index 1fcb27ef1c5e..4185547227aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts index 4b645dea987e..6ea93eb0757b 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts index 4126b817ee94..e4daeb849130 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts index 795e0745eab2..13b1c85974f1 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts @@ -14,8 +14,8 @@ export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); -const Blob = Blob !== undefined ? Blob : function() {}; -const Buffer = Buffer !== undefined ? Buffer : function() {}; +const isBlob = (value: any) => Blob !== undefined && value instanceof Blob; +const isBuffer = (value: any) => Buffer !== undefined && value instanceof Buffer; /** * This is the base class for all generated API classes. @@ -61,7 +61,7 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = (context.body instanceof FormData || context.body instanceof Blob || context.body instanceof Buffer) + const body = (context.body instanceof FormData || isBlob(context.body) || isBuffer(context.body)) ? context.body : JSON.stringify(context.body); const init = { diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts index 1fcb27ef1c5e..4185547227aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts index 4b645dea987e..6ea93eb0757b 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts index 4126b817ee94..e4daeb849130 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts index 795e0745eab2..13b1c85974f1 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts @@ -14,8 +14,8 @@ export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); -const Blob = Blob !== undefined ? Blob : function() {}; -const Buffer = Buffer !== undefined ? Buffer : function() {}; +const isBlob = (value: any) => Blob !== undefined && value instanceof Blob; +const isBuffer = (value: any) => Buffer !== undefined && value instanceof Buffer; /** * This is the base class for all generated API classes. @@ -61,7 +61,7 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = (context.body instanceof FormData || context.body instanceof Blob || context.body instanceof Buffer) + const body = (context.body instanceof FormData || isBlob(context.body) || isBuffer(context.body)) ? context.body : JSON.stringify(context.body); const init = { diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts index 1fcb27ef1c5e..4185547227aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts index 4b645dea987e..6ea93eb0757b 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts index 4126b817ee94..e4daeb849130 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts index 795e0745eab2..13b1c85974f1 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts @@ -14,8 +14,8 @@ export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); -const Blob = Blob !== undefined ? Blob : function() {}; -const Buffer = Buffer !== undefined ? Buffer : function() {}; +const isBlob = (value: any) => Blob !== undefined && value instanceof Blob; +const isBuffer = (value: any) => Buffer !== undefined && value instanceof Buffer; /** * This is the base class for all generated API classes. @@ -61,7 +61,7 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = (context.body instanceof FormData || context.body instanceof Blob || context.body instanceof Buffer) + const body = (context.body instanceof FormData || isBlob(context.body) || isBuffer(context.body)) ? context.body : JSON.stringify(context.body); const init = { diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts index 1fcb27ef1c5e..4185547227aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts index 4b645dea987e..6ea93eb0757b 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts index 4126b817ee94..e4daeb849130 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts index 795e0745eab2..13b1c85974f1 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts @@ -14,8 +14,8 @@ export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); -const Blob = Blob !== undefined ? Blob : function() {}; -const Buffer = Buffer !== undefined ? Buffer : function() {}; +const isBlob = (value: any) => Blob !== undefined && value instanceof Blob; +const isBuffer = (value: any) => Buffer !== undefined && value instanceof Buffer; /** * This is the base class for all generated API classes. @@ -61,7 +61,7 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = (context.body instanceof FormData || context.body instanceof Blob || context.body instanceof Buffer) + const body = (context.body instanceof FormData || isBlob(context.body) || isBuffer(context.body)) ? context.body : JSON.stringify(context.body); const init = { From a1a3a6da3b9476318f1315586dd19866bb08fded Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Fri, 24 May 2019 11:29:29 +0200 Subject: [PATCH 12/16] Check for Blob/Buffer existence properly --- .../typescript-fetch/runtime.mustache | 4 +-- .../builds/default/apis/PetApi.ts | 25 ++++++--------- .../builds/default/apis/StoreApi.ts | 8 ++--- .../builds/default/apis/UserApi.ts | 32 +++++++++---------- .../builds/default/models/index.ts | 2 -- .../builds/default/runtime.ts | 4 +-- .../builds/es6-target/apis/PetApi.ts | 25 ++++++--------- .../builds/es6-target/apis/StoreApi.ts | 8 ++--- .../builds/es6-target/apis/UserApi.ts | 32 +++++++++---------- .../builds/es6-target/models/index.ts | 2 -- .../builds/es6-target/runtime.ts | 4 +-- .../builds/with-interfaces/apis/PetApi.ts | 25 ++++++--------- .../builds/with-interfaces/apis/StoreApi.ts | 8 ++--- .../builds/with-interfaces/apis/UserApi.ts | 32 +++++++++---------- .../builds/with-interfaces/models/index.ts | 2 -- .../builds/with-interfaces/runtime.ts | 4 +-- .../builds/with-npm-version/apis/PetApi.ts | 25 ++++++--------- .../builds/with-npm-version/apis/StoreApi.ts | 8 ++--- .../builds/with-npm-version/apis/UserApi.ts | 32 +++++++++---------- .../builds/with-npm-version/models/index.ts | 2 -- .../builds/with-npm-version/runtime.ts | 4 +-- 21 files changed, 130 insertions(+), 158 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache index 3fbe764ced94..345269c6b659 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache @@ -3,8 +3,8 @@ export const BASE_PATH = "{{{basePath}}}".replace(/\/+$/, ""); -const isBlob = (value: any) => Blob !== undefined && value instanceof Blob; -const isBuffer = (value: any) => Buffer !== undefined && value instanceof Buffer; +const isBlob = (value: any) => typeof Blob !== 'undefined' && value instanceof Blob; +const isBuffer = (value: any) => typeof Buffer !== 'undefined' && value instanceof Buffer; /** * This is the base class for all generated API classes. diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts index 4185547227aa..1fcb27ef1c5e 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -168,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -208,16 +207,12 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts index 6ea93eb0757b..4b645dea987e 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts index e4daeb849130..4126b817ee94 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts index 13b1c85974f1..2cf4cc484630 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts @@ -14,8 +14,8 @@ export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); -const isBlob = (value: any) => Blob !== undefined && value instanceof Blob; -const isBuffer = (value: any) => Buffer !== undefined && value instanceof Buffer; +const isBlob = (value: any) => typeof Blob !== 'undefined' && value instanceof Blob; +const isBuffer = (value: any) => typeof Buffer !== 'undefined' && value instanceof Buffer; /** * This is the base class for all generated API classes. diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts index 4185547227aa..1fcb27ef1c5e 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -168,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -208,16 +207,12 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts index 6ea93eb0757b..4b645dea987e 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts index e4daeb849130..4126b817ee94 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts index 13b1c85974f1..2cf4cc484630 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts @@ -14,8 +14,8 @@ export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); -const isBlob = (value: any) => Blob !== undefined && value instanceof Blob; -const isBuffer = (value: any) => Buffer !== undefined && value instanceof Buffer; +const isBlob = (value: any) => typeof Blob !== 'undefined' && value instanceof Blob; +const isBuffer = (value: any) => typeof Buffer !== 'undefined' && value instanceof Buffer; /** * This is the base class for all generated API classes. diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts index 4185547227aa..1fcb27ef1c5e 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -168,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -208,16 +207,12 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts index 6ea93eb0757b..4b645dea987e 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts index e4daeb849130..4126b817ee94 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts index 13b1c85974f1..2cf4cc484630 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts @@ -14,8 +14,8 @@ export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); -const isBlob = (value: any) => Blob !== undefined && value instanceof Blob; -const isBuffer = (value: any) => Buffer !== undefined && value instanceof Buffer; +const isBlob = (value: any) => typeof Blob !== 'undefined' && value instanceof Blob; +const isBuffer = (value: any) => typeof Buffer !== 'undefined' && value instanceof Buffer; /** * This is the base class for all generated API classes. diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts index 4185547227aa..1fcb27ef1c5e 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -168,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -208,16 +207,12 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts index 6ea93eb0757b..4b645dea987e 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts index e4daeb849130..4126b817ee94 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts index 13b1c85974f1..2cf4cc484630 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts @@ -14,8 +14,8 @@ export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); -const isBlob = (value: any) => Blob !== undefined && value instanceof Blob; -const isBuffer = (value: any) => Buffer !== undefined && value instanceof Buffer; +const isBlob = (value: any) => typeof Blob !== 'undefined' && value instanceof Blob; +const isBuffer = (value: any) => typeof Buffer !== 'undefined' && value instanceof Buffer; /** * This is the base class for all generated API classes. From f61c1c2a3a1ecf01d40b06b613198d13b3554932 Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Fri, 24 May 2019 12:15:48 +0200 Subject: [PATCH 13/16] Avoid using Buffer and Blob in type declarations --- .../typescript-fetch/runtime.mustache | 2 +- .../builds/default/apis/PetApi.ts | 25 +++++++++------ .../builds/default/apis/StoreApi.ts | 8 ++--- .../builds/default/apis/UserApi.ts | 32 +++++++++---------- .../builds/default/models/index.ts | 2 ++ .../builds/default/runtime.ts | 2 +- .../builds/es6-target/apis/PetApi.ts | 25 +++++++++------ .../builds/es6-target/apis/StoreApi.ts | 8 ++--- .../builds/es6-target/apis/UserApi.ts | 32 +++++++++---------- .../builds/es6-target/models/index.ts | 2 ++ .../builds/es6-target/runtime.ts | 2 +- .../builds/with-interfaces/apis/PetApi.ts | 25 +++++++++------ .../builds/with-interfaces/apis/StoreApi.ts | 8 ++--- .../builds/with-interfaces/apis/UserApi.ts | 32 +++++++++---------- .../builds/with-interfaces/models/index.ts | 2 ++ .../builds/with-interfaces/runtime.ts | 2 +- .../builds/with-npm-version/apis/PetApi.ts | 25 +++++++++------ .../builds/with-npm-version/apis/StoreApi.ts | 8 ++--- .../builds/with-npm-version/apis/UserApi.ts | 32 +++++++++---------- .../builds/with-npm-version/models/index.ts | 2 ++ .../builds/with-npm-version/runtime.ts | 2 +- 21 files changed, 153 insertions(+), 125 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache index 345269c6b659..aa45692585ef 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache @@ -167,7 +167,7 @@ export type Json = any; export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'; export type HTTPHeaders = { [key: string]: string }; export type HTTPQuery = { [key: string]: string | number | null | boolean | Array | HTTPQuery }; -export type HTTPBody = Json | FormData | Blob | Buffer; +export type HTTPBody = Json | FormData; export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original'; export interface FetchParams { diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts index 1fcb27ef1c5e..4185547227aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts index 4b645dea987e..6ea93eb0757b 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts index 4126b817ee94..e4daeb849130 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts index 2cf4cc484630..dbfd6e826f0c 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts @@ -178,7 +178,7 @@ export type Json = any; export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'; export type HTTPHeaders = { [key: string]: string }; export type HTTPQuery = { [key: string]: string | number | null | boolean | Array | HTTPQuery }; -export type HTTPBody = Json | FormData | Blob | Buffer; +export type HTTPBody = Json | FormData; export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original'; export interface FetchParams { diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts index 1fcb27ef1c5e..4185547227aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts index 4b645dea987e..6ea93eb0757b 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts index 4126b817ee94..e4daeb849130 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts index 2cf4cc484630..dbfd6e826f0c 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts @@ -178,7 +178,7 @@ export type Json = any; export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'; export type HTTPHeaders = { [key: string]: string }; export type HTTPQuery = { [key: string]: string | number | null | boolean | Array | HTTPQuery }; -export type HTTPBody = Json | FormData | Blob | Buffer; +export type HTTPBody = Json | FormData; export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original'; export interface FetchParams { diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts index 1fcb27ef1c5e..4185547227aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts index 4b645dea987e..6ea93eb0757b 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts index 4126b817ee94..e4daeb849130 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts index 2cf4cc484630..dbfd6e826f0c 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts @@ -178,7 +178,7 @@ export type Json = any; export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'; export type HTTPHeaders = { [key: string]: string }; export type HTTPQuery = { [key: string]: string | number | null | boolean | Array | HTTPQuery }; -export type HTTPBody = Json | FormData | Blob | Buffer; +export type HTTPBody = Json | FormData; export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original'; export interface FetchParams { diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts index 1fcb27ef1c5e..4185547227aa 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - body: Pet; + pet: Pet; } export interface DeletePetRequest { @@ -37,6 +37,7 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; + maxCount?: number; } export interface GetPetByIdRequest { @@ -44,7 +45,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - body: Pet; + pet: Pet; } export interface UpdatePetWithFormRequest { @@ -68,8 +69,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -92,7 +93,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); @@ -167,7 +168,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -207,12 +208,16 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } + if (requestParameters.maxCount !== undefined) { + queryParameters['maxCount'] = requestParameters.maxCount; + } + const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -277,8 +282,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); + if (requestParameters.pet === null || requestParameters.pet === undefined) { + throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -301,7 +306,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.body), + body: PetToJSON(requestParameters.pet), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts index 4b645dea987e..6ea93eb0757b 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - body: Order; + order: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); + if (requestParameters.order === null || requestParameters.order === undefined) { + throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.body), + body: OrderToJSON(requestParameters.order), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts index 4126b817ee94..e4daeb849130 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - body: User; + user: User; } export interface CreateUsersWithArrayInputRequest { - body: Array; + user: Array; } export interface CreateUsersWithListInputRequest { - body: Array; + user: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - body: User; + user: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.body.map(UserToJSON), + body: requestParameters.user.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.body === null || requestParameters.body === undefined) { - throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); + if (requestParameters.user === null || requestParameters.user === undefined) { + throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.body), + body: UserToJSON(requestParameters.user), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts index b07ddc8446a0..5eefa748f29f 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts @@ -1,4 +1,6 @@ export * from './Category'; +export * from './InlineObject'; +export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts index 2cf4cc484630..dbfd6e826f0c 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts @@ -178,7 +178,7 @@ export type Json = any; export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS'; export type HTTPHeaders = { [key: string]: string }; export type HTTPQuery = { [key: string]: string | number | null | boolean | Array | HTTPQuery }; -export type HTTPBody = Json | FormData | Blob | Buffer; +export type HTTPBody = Json | FormData; export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original'; export interface FetchParams { From 8adcb8e8f2514ed1e51b4d09b45df42fa0ab7b69 Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Wed, 29 May 2019 12:23:56 +0200 Subject: [PATCH 14/16] Remove Buffer support --- .../typescript-fetch/runtime.mustache | 3 +- .../builds/default/apis/PetApi.ts | 25 ++++++--------- .../builds/default/apis/StoreApi.ts | 8 ++--- .../builds/default/apis/UserApi.ts | 32 +++++++++---------- .../builds/default/models/index.ts | 2 -- .../builds/default/runtime.ts | 3 +- .../builds/es6-target/apis/PetApi.ts | 25 ++++++--------- .../builds/es6-target/apis/StoreApi.ts | 8 ++--- .../builds/es6-target/apis/UserApi.ts | 32 +++++++++---------- .../builds/es6-target/models/index.ts | 2 -- .../builds/es6-target/runtime.ts | 3 +- .../builds/with-interfaces/apis/PetApi.ts | 25 ++++++--------- .../builds/with-interfaces/apis/StoreApi.ts | 8 ++--- .../builds/with-interfaces/apis/UserApi.ts | 32 +++++++++---------- .../builds/with-interfaces/models/index.ts | 2 -- .../builds/with-interfaces/runtime.ts | 3 +- .../builds/with-npm-version/apis/PetApi.ts | 25 ++++++--------- .../builds/with-npm-version/apis/StoreApi.ts | 8 ++--- .../builds/with-npm-version/apis/UserApi.ts | 32 +++++++++---------- .../builds/with-npm-version/models/index.ts | 2 -- .../builds/with-npm-version/runtime.ts | 3 +- 21 files changed, 125 insertions(+), 158 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache index aa45692585ef..cb7f747ea45f 100644 --- a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache +++ b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache @@ -4,7 +4,6 @@ export const BASE_PATH = "{{{basePath}}}".replace(/\/+$/, ""); const isBlob = (value: any) => typeof Blob !== 'undefined' && value instanceof Blob; -const isBuffer = (value: any) => typeof Buffer !== 'undefined' && value instanceof Buffer; /** * This is the base class for all generated API classes. @@ -50,7 +49,7 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = (context.body instanceof FormData || isBlob(context.body) || isBuffer(context.body)) + const body = (context.body instanceof FormData || isBlob(context.body)) ? context.body : JSON.stringify(context.body); const init = { diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts index 4185547227aa..1fcb27ef1c5e 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -168,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -208,16 +207,12 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts index 6ea93eb0757b..4b645dea987e 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts index e4daeb849130..4126b817ee94 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts index dbfd6e826f0c..5b07f8111862 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts @@ -15,7 +15,6 @@ export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); const isBlob = (value: any) => typeof Blob !== 'undefined' && value instanceof Blob; -const isBuffer = (value: any) => typeof Buffer !== 'undefined' && value instanceof Buffer; /** * This is the base class for all generated API classes. @@ -61,7 +60,7 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = (context.body instanceof FormData || isBlob(context.body) || isBuffer(context.body)) + const body = (context.body instanceof FormData || isBlob(context.body)) ? context.body : JSON.stringify(context.body); const init = { diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts index 4185547227aa..1fcb27ef1c5e 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -168,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -208,16 +207,12 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts index 6ea93eb0757b..4b645dea987e 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts index e4daeb849130..4126b817ee94 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts index dbfd6e826f0c..5b07f8111862 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts @@ -15,7 +15,6 @@ export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); const isBlob = (value: any) => typeof Blob !== 'undefined' && value instanceof Blob; -const isBuffer = (value: any) => typeof Buffer !== 'undefined' && value instanceof Buffer; /** * This is the base class for all generated API classes. @@ -61,7 +60,7 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = (context.body instanceof FormData || isBlob(context.body) || isBuffer(context.body)) + const body = (context.body instanceof FormData || isBlob(context.body)) ? context.body : JSON.stringify(context.body); const init = { diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts index 4185547227aa..1fcb27ef1c5e 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -168,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -208,16 +207,12 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts index 6ea93eb0757b..4b645dea987e 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts index e4daeb849130..4126b817ee94 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts index dbfd6e826f0c..5b07f8111862 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts @@ -15,7 +15,6 @@ export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); const isBlob = (value: any) => typeof Blob !== 'undefined' && value instanceof Blob; -const isBuffer = (value: any) => typeof Buffer !== 'undefined' && value instanceof Buffer; /** * This is the base class for all generated API classes. @@ -61,7 +60,7 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = (context.body instanceof FormData || isBlob(context.body) || isBuffer(context.body)) + const body = (context.body instanceof FormData || isBlob(context.body)) ? context.body : JSON.stringify(context.body); const init = { diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts index 4185547227aa..1fcb27ef1c5e 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts @@ -23,7 +23,7 @@ import { } from '../models'; export interface AddPetRequest { - pet: Pet; + body: Pet; } export interface DeletePetRequest { @@ -37,7 +37,6 @@ export interface FindPetsByStatusRequest { export interface FindPetsByTagsRequest { tags: Array; - maxCount?: number; } export interface GetPetByIdRequest { @@ -45,7 +44,7 @@ export interface GetPetByIdRequest { } export interface UpdatePetRequest { - pet: Pet; + body: Pet; } export interface UpdatePetWithFormRequest { @@ -69,8 +68,8 @@ export class PetApi extends runtime.BaseAPI { * Add a new pet to the store */ async addPetRaw(requestParameters: AddPetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling addPet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -93,7 +92,7 @@ export class PetApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -168,7 +167,7 @@ export class PetApi extends runtime.BaseAPI { if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -208,16 +207,12 @@ export class PetApi extends runtime.BaseAPI { queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]); } - if (requestParameters.maxCount !== undefined) { - queryParameters['maxCount'] = requestParameters.maxCount; - } - const headerParameters: runtime.HTTPHeaders = {}; if (this.configuration && this.configuration.accessToken) { // oauth required if (typeof this.configuration.accessToken === 'function') { - headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["read:pets"]); + headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]); } else { headerParameters["Authorization"] = this.configuration.accessToken; } @@ -282,8 +277,8 @@ export class PetApi extends runtime.BaseAPI { * Update an existing pet */ async updatePetRaw(requestParameters: UpdatePetRequest): Promise> { - if (requestParameters.pet === null || requestParameters.pet === undefined) { - throw new runtime.RequiredError('pet','Required parameter requestParameters.pet was null or undefined when calling updatePet.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -306,7 +301,7 @@ export class PetApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: PetToJSON(requestParameters.pet), + body: PetToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts index 6ea93eb0757b..4b645dea987e 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts @@ -28,7 +28,7 @@ export interface GetOrderByIdRequest { } export interface PlaceOrderRequest { - order: Order; + body: Order; } /** @@ -135,8 +135,8 @@ export class StoreApi extends runtime.BaseAPI { * Place an order for a pet */ async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise> { - if (requestParameters.order === null || requestParameters.order === undefined) { - throw new runtime.RequiredError('order','Required parameter requestParameters.order was null or undefined when calling placeOrder.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -150,7 +150,7 @@ export class StoreApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: OrderToJSON(requestParameters.order), + body: OrderToJSON(requestParameters.body), }); return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue)); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts index e4daeb849130..4126b817ee94 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts @@ -20,15 +20,15 @@ import { } from '../models'; export interface CreateUserRequest { - user: User; + body: User; } export interface CreateUsersWithArrayInputRequest { - user: Array; + body: Array; } export interface CreateUsersWithListInputRequest { - user: Array; + body: Array; } export interface DeleteUserRequest { @@ -46,7 +46,7 @@ export interface LoginUserRequest { export interface UpdateUserRequest { username: string; - user: User; + body: User; } /** @@ -59,8 +59,8 @@ export class UserApi extends runtime.BaseAPI { * Create user */ async createUserRaw(requestParameters: CreateUserRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -74,7 +74,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); @@ -92,8 +92,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithArrayInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -107,7 +107,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -124,8 +124,8 @@ export class UserApi extends runtime.BaseAPI { * Creates list of users with given input array */ async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise> { - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling createUsersWithListInput.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -139,7 +139,7 @@ export class UserApi extends runtime.BaseAPI { method: 'POST', headers: headerParameters, query: queryParameters, - body: requestParameters.user.map(UserToJSON), + body: requestParameters.body.map(UserToJSON), }); return new runtime.VoidApiResponse(response); @@ -289,8 +289,8 @@ export class UserApi extends runtime.BaseAPI { throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.'); } - if (requestParameters.user === null || requestParameters.user === undefined) { - throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling updateUser.'); + if (requestParameters.body === null || requestParameters.body === undefined) { + throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.'); } const queryParameters: runtime.HTTPQuery = {}; @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { method: 'PUT', headers: headerParameters, query: queryParameters, - body: UserToJSON(requestParameters.user), + body: UserToJSON(requestParameters.body), }); return new runtime.VoidApiResponse(response); diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts index 5eefa748f29f..b07ddc8446a0 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/index.ts @@ -1,6 +1,4 @@ export * from './Category'; -export * from './InlineObject'; -export * from './InlineObject1'; export * from './ModelApiResponse'; export * from './Order'; export * from './Pet'; diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts index dbfd6e826f0c..5b07f8111862 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts @@ -15,7 +15,6 @@ export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ""); const isBlob = (value: any) => typeof Blob !== 'undefined' && value instanceof Blob; -const isBuffer = (value: any) => typeof Buffer !== 'undefined' && value instanceof Buffer; /** * This is the base class for all generated API classes. @@ -61,7 +60,7 @@ export class BaseAPI { // do not handle correctly sometimes. url += '?' + querystring(context.query); } - const body = (context.body instanceof FormData || isBlob(context.body) || isBuffer(context.body)) + const body = (context.body instanceof FormData || isBlob(context.body)) ? context.body : JSON.stringify(context.body); const init = { From f5c1ed200b40050be7997864a32993e34e12ae9c Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Wed, 29 May 2019 12:50:29 +0200 Subject: [PATCH 15/16] Update samples/client/petstore/typescript-fetch/tests/default/test/PetApi.ts Co-Authored-By: Esteban Marin --- .../petstore/typescript-fetch/tests/default/test/PetApi.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/client/petstore/typescript-fetch/tests/default/test/PetApi.ts b/samples/client/petstore/typescript-fetch/tests/default/test/PetApi.ts index 0890467a5c07..10d3fdff53c6 100644 --- a/samples/client/petstore/typescript-fetch/tests/default/test/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/tests/default/test/PetApi.ts @@ -29,7 +29,7 @@ describe('PetApi', () => { it('should update Pet by ID', () => { return api.getPetById({ petId: fixture.id }).then((result: Pet) => { result.name = 'newname'; - return api.updatePet({ pet: result }).then(() => { + return api.updatePet({ body: result }).then(() => { return api.getPetById({ petId: fixture.id }).then((result: Pet) => { return expect(result.name).to.deep.equal('newname'); }); From 2ea96f7a0e9c769e3bd9558173464afc048e3e12 Mon Sep 17 00:00:00 2001 From: Jan Buchar Date: Wed, 29 May 2019 12:50:51 +0200 Subject: [PATCH 16/16] Update samples/client/petstore/typescript-fetch/tests/default/test/PetApi.ts Co-Authored-By: Esteban Marin --- .../petstore/typescript-fetch/tests/default/test/PetApi.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/client/petstore/typescript-fetch/tests/default/test/PetApi.ts b/samples/client/petstore/typescript-fetch/tests/default/test/PetApi.ts index 10d3fdff53c6..c452573699d5 100644 --- a/samples/client/petstore/typescript-fetch/tests/default/test/PetApi.ts +++ b/samples/client/petstore/typescript-fetch/tests/default/test/PetApi.ts @@ -16,7 +16,7 @@ describe('PetApi', () => { }); it('should add and delete Pet', () => { - return api.addPet({ pet: fixture }).then(() => { + return api.addPet({ body: fixture }).then(() => { }); });