From 7fc17a26c7046e2a7fda8a9229a1fddbc36f1251 Mon Sep 17 00:00:00 2001 From: Albert Pastrana Date: Wed, 26 Oct 2016 09:52:24 +0200 Subject: [PATCH] [TypeScript Fetch] Fixes typo in `FetchParamCreactor` (#4075) There was a typo, just changing `FetchParamCreactor` to `FetchParamCreator` --- .../resources/TypeScript-Fetch/api.mustache | 6 +-- .../typescript-fetch/builds/default/api.ts | 48 +++++++++---------- .../typescript-fetch/builds/es6-target/api.ts | 48 +++++++++---------- .../builds/with-npm-version/api.ts | 48 +++++++++---------- 4 files changed, 75 insertions(+), 75 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache b/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache index 44c69c31d65..11f18d7d70a 100644 --- a/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache +++ b/modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache @@ -16,7 +16,7 @@ const BASE_PATH = "{{{basePath}}}".replace(/\/+$/, ''); export interface FetchArgs { url: string; - options: any; + options: any; } export class BaseAPI { @@ -68,7 +68,7 @@ export type {{{enumName}}} = {{#allowableValues}}{{#values}}"{{{.}}}"{{^-last}} * {{classname}} - fetch parameter creator{{#description}} * {{&description}}{{/description}} */ -export const {{classname}}FetchParamCreactor = { +export const {{classname}}FetchParamCreator = { {{#operation}} /** {{#summary}} * {{summary}}{{/summary}}{{#notes}} @@ -173,7 +173,7 @@ export const {{classname}}Fp = { * @param {{paramName}} {{description}}{{/allParams}} */ {{nickname}}({{#hasParams}}params: { {{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}; {{/allParams}} }{{/hasParams}}{{#hasAuthMethods}}{{#hasParams}}, {{/hasParams}}configuration: Configuration{{/hasAuthMethods}}): (fetch: FetchAPI, basePath?: string) => Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}any{{/returnType}}> { - const fetchArgs = {{classname}}FetchParamCreactor.{{nickname}}({{#hasParams}}params{{/hasParams}}{{#hasAuthMethods}}{{#hasParams}}, {{/hasParams}}configuration{{/hasAuthMethods}}); + const fetchArgs = {{classname}}FetchParamCreator.{{nickname}}({{#hasParams}}params{{/hasParams}}{{#hasAuthMethods}}{{#hasParams}}, {{/hasParams}}configuration{{/hasAuthMethods}}); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { diff --git a/samples/client/petstore/typescript-fetch/builds/default/api.ts b/samples/client/petstore/typescript-fetch/builds/default/api.ts index 7a03eb902ca..2cc868b1905 100644 --- a/samples/client/petstore/typescript-fetch/builds/default/api.ts +++ b/samples/client/petstore/typescript-fetch/builds/default/api.ts @@ -37,7 +37,7 @@ const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ''); export interface FetchArgs { url: string; - options: any; + options: any; } export class BaseAPI { @@ -132,7 +132,7 @@ export interface User { /** * PetApi - fetch parameter creator */ -export const PetApiFetchParamCreactor = { +export const PetApiFetchParamCreator = { /** * Add a new pet to the store * @@ -425,7 +425,7 @@ export const PetApiFp = { * @param body Pet object that needs to be added to the store */ addPet(params: { body: Pet; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = PetApiFetchParamCreactor.addPet(params, configuration); + const fetchArgs = PetApiFetchParamCreator.addPet(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -443,7 +443,7 @@ export const PetApiFp = { * @param apiKey */ deletePet(params: { petId: number; apiKey?: string; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = PetApiFetchParamCreactor.deletePet(params, configuration); + const fetchArgs = PetApiFetchParamCreator.deletePet(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -460,7 +460,7 @@ export const PetApiFp = { * @param status Status values that need to be considered for filter */ findPetsByStatus(params: { status: Array; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise> { - const fetchArgs = PetApiFetchParamCreactor.findPetsByStatus(params, configuration); + const fetchArgs = PetApiFetchParamCreator.findPetsByStatus(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -477,7 +477,7 @@ export const PetApiFp = { * @param tags Tags to filter by */ findPetsByTags(params: { tags: Array; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise> { - const fetchArgs = PetApiFetchParamCreactor.findPetsByTags(params, configuration); + const fetchArgs = PetApiFetchParamCreator.findPetsByTags(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -494,7 +494,7 @@ export const PetApiFp = { * @param petId ID of pet to return */ getPetById(params: { petId: number; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = PetApiFetchParamCreactor.getPetById(params, configuration); + const fetchArgs = PetApiFetchParamCreator.getPetById(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -511,7 +511,7 @@ export const PetApiFp = { * @param body Pet object that needs to be added to the store */ updatePet(params: { body: Pet; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = PetApiFetchParamCreactor.updatePet(params, configuration); + const fetchArgs = PetApiFetchParamCreator.updatePet(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -530,7 +530,7 @@ export const PetApiFp = { * @param status Updated status of the pet */ updatePetWithForm(params: { petId: number; name?: string; status?: string; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = PetApiFetchParamCreactor.updatePetWithForm(params, configuration); + const fetchArgs = PetApiFetchParamCreator.updatePetWithForm(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -549,7 +549,7 @@ export const PetApiFp = { * @param file file to upload */ uploadFile(params: { petId: number; additionalMetadata?: string; file?: any; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = PetApiFetchParamCreactor.uploadFile(params, configuration); + const fetchArgs = PetApiFetchParamCreator.uploadFile(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -718,7 +718,7 @@ export const PetApiFactory = function (fetch?: FetchAPI, basePath?: string) { /** * StoreApi - fetch parameter creator */ -export const StoreApiFetchParamCreactor = { +export const StoreApiFetchParamCreator = { /** * Delete purchase order by ID * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors @@ -834,7 +834,7 @@ export const StoreApiFp = { * @param orderId ID of the order that needs to be deleted */ deleteOrder(params: { orderId: string; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = StoreApiFetchParamCreactor.deleteOrder(params); + const fetchArgs = StoreApiFetchParamCreator.deleteOrder(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -850,7 +850,7 @@ export const StoreApiFp = { * Returns a map of status codes to quantities */ getInventory(configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise<{ [key: string]: number; }> { - const fetchArgs = StoreApiFetchParamCreactor.getInventory(configuration); + const fetchArgs = StoreApiFetchParamCreator.getInventory(configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -867,7 +867,7 @@ export const StoreApiFp = { * @param orderId ID of pet that needs to be fetched */ getOrderById(params: { orderId: number; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = StoreApiFetchParamCreactor.getOrderById(params); + const fetchArgs = StoreApiFetchParamCreator.getOrderById(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -884,7 +884,7 @@ export const StoreApiFp = { * @param body order placed for purchasing the pet */ placeOrder(params: { body: Order; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = StoreApiFetchParamCreactor.placeOrder(params); + const fetchArgs = StoreApiFetchParamCreator.placeOrder(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -977,7 +977,7 @@ export const StoreApiFactory = function (fetch?: FetchAPI, basePath?: string) { /** * UserApi - fetch parameter creator */ -export const UserApiFetchParamCreactor = { +export const UserApiFetchParamCreator = { /** * Create user * This can only be done by the logged in user. @@ -1210,7 +1210,7 @@ export const UserApiFp = { * @param body Created user object */ createUser(params: { body: User; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.createUser(params); + const fetchArgs = UserApiFetchParamCreator.createUser(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -1227,7 +1227,7 @@ export const UserApiFp = { * @param body List of user object */ createUsersWithArrayInput(params: { body: Array; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.createUsersWithArrayInput(params); + const fetchArgs = UserApiFetchParamCreator.createUsersWithArrayInput(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -1244,7 +1244,7 @@ export const UserApiFp = { * @param body List of user object */ createUsersWithListInput(params: { body: Array; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.createUsersWithListInput(params); + const fetchArgs = UserApiFetchParamCreator.createUsersWithListInput(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -1261,7 +1261,7 @@ export const UserApiFp = { * @param username The name that needs to be deleted */ deleteUser(params: { username: string; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.deleteUser(params); + const fetchArgs = UserApiFetchParamCreator.deleteUser(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -1278,7 +1278,7 @@ export const UserApiFp = { * @param username The name that needs to be fetched. Use user1 for testing. */ getUserByName(params: { username: string; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.getUserByName(params); + const fetchArgs = UserApiFetchParamCreator.getUserByName(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -1296,7 +1296,7 @@ export const UserApiFp = { * @param password The password for login in clear text */ loginUser(params: { username: string; password: string; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.loginUser(params); + const fetchArgs = UserApiFetchParamCreator.loginUser(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -1312,7 +1312,7 @@ export const UserApiFp = { * */ logoutUser(): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.logoutUser(); + const fetchArgs = UserApiFetchParamCreator.logoutUser(); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -1330,7 +1330,7 @@ export const UserApiFp = { * @param body Updated user object */ updateUser(params: { username: string; body: User; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.updateUser(params); + const fetchArgs = UserApiFetchParamCreator.updateUser(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/api.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/api.ts index e0b26bdb9c8..c86a84ec2fc 100644 --- a/samples/client/petstore/typescript-fetch/builds/es6-target/api.ts +++ b/samples/client/petstore/typescript-fetch/builds/es6-target/api.ts @@ -36,7 +36,7 @@ const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ''); export interface FetchArgs { url: string; - options: any; + options: any; } export class BaseAPI { @@ -131,7 +131,7 @@ export interface User { /** * PetApi - fetch parameter creator */ -export const PetApiFetchParamCreactor = { +export const PetApiFetchParamCreator = { /** * Add a new pet to the store * @@ -424,7 +424,7 @@ export const PetApiFp = { * @param body Pet object that needs to be added to the store */ addPet(params: { body: Pet; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = PetApiFetchParamCreactor.addPet(params, configuration); + const fetchArgs = PetApiFetchParamCreator.addPet(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -442,7 +442,7 @@ export const PetApiFp = { * @param apiKey */ deletePet(params: { petId: number; apiKey?: string; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = PetApiFetchParamCreactor.deletePet(params, configuration); + const fetchArgs = PetApiFetchParamCreator.deletePet(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -459,7 +459,7 @@ export const PetApiFp = { * @param status Status values that need to be considered for filter */ findPetsByStatus(params: { status: Array; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise> { - const fetchArgs = PetApiFetchParamCreactor.findPetsByStatus(params, configuration); + const fetchArgs = PetApiFetchParamCreator.findPetsByStatus(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -476,7 +476,7 @@ export const PetApiFp = { * @param tags Tags to filter by */ findPetsByTags(params: { tags: Array; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise> { - const fetchArgs = PetApiFetchParamCreactor.findPetsByTags(params, configuration); + const fetchArgs = PetApiFetchParamCreator.findPetsByTags(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -493,7 +493,7 @@ export const PetApiFp = { * @param petId ID of pet to return */ getPetById(params: { petId: number; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = PetApiFetchParamCreactor.getPetById(params, configuration); + const fetchArgs = PetApiFetchParamCreator.getPetById(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -510,7 +510,7 @@ export const PetApiFp = { * @param body Pet object that needs to be added to the store */ updatePet(params: { body: Pet; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = PetApiFetchParamCreactor.updatePet(params, configuration); + const fetchArgs = PetApiFetchParamCreator.updatePet(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -529,7 +529,7 @@ export const PetApiFp = { * @param status Updated status of the pet */ updatePetWithForm(params: { petId: number; name?: string; status?: string; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = PetApiFetchParamCreactor.updatePetWithForm(params, configuration); + const fetchArgs = PetApiFetchParamCreator.updatePetWithForm(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -548,7 +548,7 @@ export const PetApiFp = { * @param file file to upload */ uploadFile(params: { petId: number; additionalMetadata?: string; file?: any; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = PetApiFetchParamCreactor.uploadFile(params, configuration); + const fetchArgs = PetApiFetchParamCreator.uploadFile(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -717,7 +717,7 @@ export const PetApiFactory = function (fetch?: FetchAPI, basePath?: string) { /** * StoreApi - fetch parameter creator */ -export const StoreApiFetchParamCreactor = { +export const StoreApiFetchParamCreator = { /** * Delete purchase order by ID * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors @@ -833,7 +833,7 @@ export const StoreApiFp = { * @param orderId ID of the order that needs to be deleted */ deleteOrder(params: { orderId: string; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = StoreApiFetchParamCreactor.deleteOrder(params); + const fetchArgs = StoreApiFetchParamCreator.deleteOrder(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -849,7 +849,7 @@ export const StoreApiFp = { * Returns a map of status codes to quantities */ getInventory(configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise<{ [key: string]: number; }> { - const fetchArgs = StoreApiFetchParamCreactor.getInventory(configuration); + const fetchArgs = StoreApiFetchParamCreator.getInventory(configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -866,7 +866,7 @@ export const StoreApiFp = { * @param orderId ID of pet that needs to be fetched */ getOrderById(params: { orderId: number; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = StoreApiFetchParamCreactor.getOrderById(params); + const fetchArgs = StoreApiFetchParamCreator.getOrderById(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -883,7 +883,7 @@ export const StoreApiFp = { * @param body order placed for purchasing the pet */ placeOrder(params: { body: Order; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = StoreApiFetchParamCreactor.placeOrder(params); + const fetchArgs = StoreApiFetchParamCreator.placeOrder(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -976,7 +976,7 @@ export const StoreApiFactory = function (fetch?: FetchAPI, basePath?: string) { /** * UserApi - fetch parameter creator */ -export const UserApiFetchParamCreactor = { +export const UserApiFetchParamCreator = { /** * Create user * This can only be done by the logged in user. @@ -1209,7 +1209,7 @@ export const UserApiFp = { * @param body Created user object */ createUser(params: { body: User; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.createUser(params); + const fetchArgs = UserApiFetchParamCreator.createUser(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -1226,7 +1226,7 @@ export const UserApiFp = { * @param body List of user object */ createUsersWithArrayInput(params: { body: Array; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.createUsersWithArrayInput(params); + const fetchArgs = UserApiFetchParamCreator.createUsersWithArrayInput(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -1243,7 +1243,7 @@ export const UserApiFp = { * @param body List of user object */ createUsersWithListInput(params: { body: Array; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.createUsersWithListInput(params); + const fetchArgs = UserApiFetchParamCreator.createUsersWithListInput(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -1260,7 +1260,7 @@ export const UserApiFp = { * @param username The name that needs to be deleted */ deleteUser(params: { username: string; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.deleteUser(params); + const fetchArgs = UserApiFetchParamCreator.deleteUser(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -1277,7 +1277,7 @@ export const UserApiFp = { * @param username The name that needs to be fetched. Use user1 for testing. */ getUserByName(params: { username: string; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.getUserByName(params); + const fetchArgs = UserApiFetchParamCreator.getUserByName(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -1295,7 +1295,7 @@ export const UserApiFp = { * @param password The password for login in clear text */ loginUser(params: { username: string; password: string; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.loginUser(params); + const fetchArgs = UserApiFetchParamCreator.loginUser(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -1311,7 +1311,7 @@ export const UserApiFp = { * */ logoutUser(): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.logoutUser(); + const fetchArgs = UserApiFetchParamCreator.logoutUser(); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -1329,7 +1329,7 @@ export const UserApiFp = { * @param body Updated user object */ updateUser(params: { username: string; body: User; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.updateUser(params); + const fetchArgs = UserApiFetchParamCreator.updateUser(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts index 7a03eb902ca..2cc868b1905 100644 --- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts +++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/api.ts @@ -37,7 +37,7 @@ const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, ''); export interface FetchArgs { url: string; - options: any; + options: any; } export class BaseAPI { @@ -132,7 +132,7 @@ export interface User { /** * PetApi - fetch parameter creator */ -export const PetApiFetchParamCreactor = { +export const PetApiFetchParamCreator = { /** * Add a new pet to the store * @@ -425,7 +425,7 @@ export const PetApiFp = { * @param body Pet object that needs to be added to the store */ addPet(params: { body: Pet; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = PetApiFetchParamCreactor.addPet(params, configuration); + const fetchArgs = PetApiFetchParamCreator.addPet(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -443,7 +443,7 @@ export const PetApiFp = { * @param apiKey */ deletePet(params: { petId: number; apiKey?: string; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = PetApiFetchParamCreactor.deletePet(params, configuration); + const fetchArgs = PetApiFetchParamCreator.deletePet(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -460,7 +460,7 @@ export const PetApiFp = { * @param status Status values that need to be considered for filter */ findPetsByStatus(params: { status: Array; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise> { - const fetchArgs = PetApiFetchParamCreactor.findPetsByStatus(params, configuration); + const fetchArgs = PetApiFetchParamCreator.findPetsByStatus(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -477,7 +477,7 @@ export const PetApiFp = { * @param tags Tags to filter by */ findPetsByTags(params: { tags: Array; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise> { - const fetchArgs = PetApiFetchParamCreactor.findPetsByTags(params, configuration); + const fetchArgs = PetApiFetchParamCreator.findPetsByTags(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -494,7 +494,7 @@ export const PetApiFp = { * @param petId ID of pet to return */ getPetById(params: { petId: number; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = PetApiFetchParamCreactor.getPetById(params, configuration); + const fetchArgs = PetApiFetchParamCreator.getPetById(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -511,7 +511,7 @@ export const PetApiFp = { * @param body Pet object that needs to be added to the store */ updatePet(params: { body: Pet; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = PetApiFetchParamCreactor.updatePet(params, configuration); + const fetchArgs = PetApiFetchParamCreator.updatePet(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -530,7 +530,7 @@ export const PetApiFp = { * @param status Updated status of the pet */ updatePetWithForm(params: { petId: number; name?: string; status?: string; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = PetApiFetchParamCreactor.updatePetWithForm(params, configuration); + const fetchArgs = PetApiFetchParamCreator.updatePetWithForm(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -549,7 +549,7 @@ export const PetApiFp = { * @param file file to upload */ uploadFile(params: { petId: number; additionalMetadata?: string; file?: any; }, configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = PetApiFetchParamCreactor.uploadFile(params, configuration); + const fetchArgs = PetApiFetchParamCreator.uploadFile(params, configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -718,7 +718,7 @@ export const PetApiFactory = function (fetch?: FetchAPI, basePath?: string) { /** * StoreApi - fetch parameter creator */ -export const StoreApiFetchParamCreactor = { +export const StoreApiFetchParamCreator = { /** * Delete purchase order by ID * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors @@ -834,7 +834,7 @@ export const StoreApiFp = { * @param orderId ID of the order that needs to be deleted */ deleteOrder(params: { orderId: string; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = StoreApiFetchParamCreactor.deleteOrder(params); + const fetchArgs = StoreApiFetchParamCreator.deleteOrder(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -850,7 +850,7 @@ export const StoreApiFp = { * Returns a map of status codes to quantities */ getInventory(configuration: Configuration): (fetch: FetchAPI, basePath?: string) => Promise<{ [key: string]: number; }> { - const fetchArgs = StoreApiFetchParamCreactor.getInventory(configuration); + const fetchArgs = StoreApiFetchParamCreator.getInventory(configuration); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -867,7 +867,7 @@ export const StoreApiFp = { * @param orderId ID of pet that needs to be fetched */ getOrderById(params: { orderId: number; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = StoreApiFetchParamCreactor.getOrderById(params); + const fetchArgs = StoreApiFetchParamCreator.getOrderById(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -884,7 +884,7 @@ export const StoreApiFp = { * @param body order placed for purchasing the pet */ placeOrder(params: { body: Order; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = StoreApiFetchParamCreactor.placeOrder(params); + const fetchArgs = StoreApiFetchParamCreator.placeOrder(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -977,7 +977,7 @@ export const StoreApiFactory = function (fetch?: FetchAPI, basePath?: string) { /** * UserApi - fetch parameter creator */ -export const UserApiFetchParamCreactor = { +export const UserApiFetchParamCreator = { /** * Create user * This can only be done by the logged in user. @@ -1210,7 +1210,7 @@ export const UserApiFp = { * @param body Created user object */ createUser(params: { body: User; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.createUser(params); + const fetchArgs = UserApiFetchParamCreator.createUser(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -1227,7 +1227,7 @@ export const UserApiFp = { * @param body List of user object */ createUsersWithArrayInput(params: { body: Array; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.createUsersWithArrayInput(params); + const fetchArgs = UserApiFetchParamCreator.createUsersWithArrayInput(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -1244,7 +1244,7 @@ export const UserApiFp = { * @param body List of user object */ createUsersWithListInput(params: { body: Array; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.createUsersWithListInput(params); + const fetchArgs = UserApiFetchParamCreator.createUsersWithListInput(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -1261,7 +1261,7 @@ export const UserApiFp = { * @param username The name that needs to be deleted */ deleteUser(params: { username: string; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.deleteUser(params); + const fetchArgs = UserApiFetchParamCreator.deleteUser(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -1278,7 +1278,7 @@ export const UserApiFp = { * @param username The name that needs to be fetched. Use user1 for testing. */ getUserByName(params: { username: string; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.getUserByName(params); + const fetchArgs = UserApiFetchParamCreator.getUserByName(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -1296,7 +1296,7 @@ export const UserApiFp = { * @param password The password for login in clear text */ loginUser(params: { username: string; password: string; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.loginUser(params); + const fetchArgs = UserApiFetchParamCreator.loginUser(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -1312,7 +1312,7 @@ export const UserApiFp = { * */ logoutUser(): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.logoutUser(); + const fetchArgs = UserApiFetchParamCreator.logoutUser(); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) { @@ -1330,7 +1330,7 @@ export const UserApiFp = { * @param body Updated user object */ updateUser(params: { username: string; body: User; }): (fetch: FetchAPI, basePath?: string) => Promise { - const fetchArgs = UserApiFetchParamCreactor.updateUser(params); + const fetchArgs = UserApiFetchParamCreator.updateUser(params); return (fetch: FetchAPI = isomorphicFetch, basePath: string = BASE_PATH) => { return fetch(basePath + fetchArgs.url, fetchArgs.options).then((response) => { if (response.status >= 200 && response.status < 300) {