Skip to content

Typescript Axios returned types and export paths fixed #5102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 27, 2020
Merged

Typescript Axios returned types and export paths fixed #5102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d55914f
Typescript Axiom templates fixed
mstefaniuk Jan 24, 2020
a5526be
Added petstore generated samples for typescript-axios
Jan 24, 2020
f2050c0
Fixing line endings
Jan 24, 2020
e75d7a0
Remove unnecessary change in function signature
mstefaniuk Jan 24, 2020
85ccff8
re-generate typescript-axios samples
macjohnny Jan 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/typescript-axios/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } fr
{{>apiInner}}
{{/apis}}{{/apiInfo}}
{{/withSeparateModelsAndApi}}{{#withSeparateModelsAndApi}}
{{#apiInfo}}{{#apis}}{{#operations}}export * from './{{apiPackage}}/{{classFilename}}';
{{#apiInfo}}{{#apis}}{{#operations}}export * from './{{tsApiPackage}}/{{classFilename}}';
{{/operations}}{{/apis}}{{/apiInfo}}
{{/withSeparateModelsAndApi}}
6 changes: 3 additions & 3 deletions modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export const {{classname}}AxiosParamCreator = function (configuration?: Configur
{{#isBasicBasic}}
// http basic authentication required
if (configuration && (configuration.username || configuration.password)) {
localVarRequestOptions["auth"] = { username: configuration.username, password: configuration.password };
localVarRequestOptions["auth"] = { username: configuration.username, password: configuration.password };
}
{{/isBasicBasic}}
{{#isBasicBearer}}
Expand Down Expand Up @@ -256,7 +256,7 @@ export const {{classname}}Factory = function (configuration?: Configuration, bas
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
{{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}options?: any) {
{{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}options?: any): AxiosPromise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> {
return {{classname}}Fp(configuration).{{nickname}}({{#allParams}}{{paramName}}, {{/allParams}}options)(axios, basePath);
},
{{/operation}}
Expand Down Expand Up @@ -284,7 +284,7 @@ export interface {{classname}}Interface {
* @throws {RequiredError}
* @memberof {{classname}}Interface
*/
{{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}options?: any): AxiosPromise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}{}{{/returnType}}>;
{{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}options?: any): AxiosPromise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}>;

{{/operation}}
}
Expand Down
40 changes: 20 additions & 20 deletions samples/client/petstore/typescript-axios/builds/default/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?:
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
addPet(body: Pet, options?: any) {
addPet(body: Pet, options?: any): AxiosPromise<void> {
return PetApiFp(configuration).addPet(body, options)(axios, basePath);
},
/**
Expand All @@ -801,7 +801,7 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?:
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
deletePet(petId: number, apiKey?: string, options?: any) {
deletePet(petId: number, apiKey?: string, options?: any): AxiosPromise<void> {
return PetApiFp(configuration).deletePet(petId, apiKey, options)(axios, basePath);
},
/**
Expand All @@ -811,7 +811,7 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?:
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any) {
findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): AxiosPromise<Array<Pet>> {
return PetApiFp(configuration).findPetsByStatus(status, options)(axios, basePath);
},
/**
Expand All @@ -821,7 +821,7 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?:
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
findPetsByTags(tags: Array<string>, options?: any) {
findPetsByTags(tags: Array<string>, options?: any): AxiosPromise<Array<Pet>> {
return PetApiFp(configuration).findPetsByTags(tags, options)(axios, basePath);
},
/**
Expand All @@ -831,7 +831,7 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?:
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
getPetById(petId: number, options?: any) {
getPetById(petId: number, options?: any): AxiosPromise<Pet> {
return PetApiFp(configuration).getPetById(petId, options)(axios, basePath);
},
/**
Expand All @@ -841,7 +841,7 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?:
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
updatePet(body: Pet, options?: any) {
updatePet(body: Pet, options?: any): AxiosPromise<void> {
return PetApiFp(configuration).updatePet(body, options)(axios, basePath);
},
/**
Expand All @@ -853,7 +853,7 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?:
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
updatePetWithForm(petId: number, name?: string, status?: string, options?: any) {
updatePetWithForm(petId: number, name?: string, status?: string, options?: any): AxiosPromise<void> {
return PetApiFp(configuration).updatePetWithForm(petId, name, status, options)(axios, basePath);
},
/**
Expand All @@ -865,7 +865,7 @@ export const PetApiFactory = function (configuration?: Configuration, basePath?:
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
uploadFile(petId: number, additionalMetadata?: string, file?: any, options?: any) {
uploadFile(petId: number, additionalMetadata?: string, file?: any, options?: any): AxiosPromise<ApiResponse> {
return PetApiFp(configuration).uploadFile(petId, additionalMetadata, file, options)(axios, basePath);
},
};
Expand Down Expand Up @@ -1213,7 +1213,7 @@ export const StoreApiFactory = function (configuration?: Configuration, basePath
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
deleteOrder(orderId: string, options?: any) {
deleteOrder(orderId: string, options?: any): AxiosPromise<void> {
return StoreApiFp(configuration).deleteOrder(orderId, options)(axios, basePath);
},
/**
Expand All @@ -1222,7 +1222,7 @@ export const StoreApiFactory = function (configuration?: Configuration, basePath
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
getInventory(options?: any) {
getInventory(options?: any): AxiosPromise<{ [key: string]: number; }> {
return StoreApiFp(configuration).getInventory(options)(axios, basePath);
},
/**
Expand All @@ -1232,7 +1232,7 @@ export const StoreApiFactory = function (configuration?: Configuration, basePath
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
getOrderById(orderId: number, options?: any) {
getOrderById(orderId: number, options?: any): AxiosPromise<Order> {
return StoreApiFp(configuration).getOrderById(orderId, options)(axios, basePath);
},
/**
Expand All @@ -1242,7 +1242,7 @@ export const StoreApiFactory = function (configuration?: Configuration, basePath
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
placeOrder(body: Order, options?: any) {
placeOrder(body: Order, options?: any): AxiosPromise<Order> {
return StoreApiFp(configuration).placeOrder(body, options)(axios, basePath);
},
};
Expand Down Expand Up @@ -1753,7 +1753,7 @@ export const UserApiFactory = function (configuration?: Configuration, basePath?
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
createUser(body: User, options?: any) {
createUser(body: User, options?: any): AxiosPromise<void> {
return UserApiFp(configuration).createUser(body, options)(axios, basePath);
},
/**
Expand All @@ -1763,7 +1763,7 @@ export const UserApiFactory = function (configuration?: Configuration, basePath?
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
createUsersWithArrayInput(body: Array<User>, options?: any) {
createUsersWithArrayInput(body: Array<User>, options?: any): AxiosPromise<void> {
return UserApiFp(configuration).createUsersWithArrayInput(body, options)(axios, basePath);
},
/**
Expand All @@ -1773,7 +1773,7 @@ export const UserApiFactory = function (configuration?: Configuration, basePath?
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
createUsersWithListInput(body: Array<User>, options?: any) {
createUsersWithListInput(body: Array<User>, options?: any): AxiosPromise<void> {
return UserApiFp(configuration).createUsersWithListInput(body, options)(axios, basePath);
},
/**
Expand All @@ -1783,7 +1783,7 @@ export const UserApiFactory = function (configuration?: Configuration, basePath?
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
deleteUser(username: string, options?: any) {
deleteUser(username: string, options?: any): AxiosPromise<void> {
return UserApiFp(configuration).deleteUser(username, options)(axios, basePath);
},
/**
Expand All @@ -1793,7 +1793,7 @@ export const UserApiFactory = function (configuration?: Configuration, basePath?
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
getUserByName(username: string, options?: any) {
getUserByName(username: string, options?: any): AxiosPromise<User> {
return UserApiFp(configuration).getUserByName(username, options)(axios, basePath);
},
/**
Expand All @@ -1804,7 +1804,7 @@ export const UserApiFactory = function (configuration?: Configuration, basePath?
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
loginUser(username: string, password: string, options?: any) {
loginUser(username: string, password: string, options?: any): AxiosPromise<string> {
return UserApiFp(configuration).loginUser(username, password, options)(axios, basePath);
},
/**
Expand All @@ -1813,7 +1813,7 @@ export const UserApiFactory = function (configuration?: Configuration, basePath?
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
logoutUser(options?: any) {
logoutUser(options?: any): AxiosPromise<void> {
return UserApiFp(configuration).logoutUser(options)(axios, basePath);
},
/**
Expand All @@ -1824,7 +1824,7 @@ export const UserApiFactory = function (configuration?: Configuration, basePath?
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
updateUser(username: string, body: User, options?: any) {
updateUser(username: string, body: User, options?: any): AxiosPromise<void> {
return UserApiFp(configuration).updateUser(username, body, options)(axios, basePath);
},
};
Expand Down
Loading