diff --git a/test/example-dest/2.0/pet-store.ts b/test/example-dest/2.0/pet-store.ts index c0aed8c..f7a0f33 100644 --- a/test/example-dest/2.0/pet-store.ts +++ b/test/example-dest/2.0/pet-store.ts @@ -22,22 +22,15 @@ import {zAddPetData,zUpdatePetData,zFindPetsByStatusParams,zFindPetsByStatusResp * @param data Pet object that needs to be added to the store * @param [config] request config */ -export async function addPet(data:Type.AddPetData,config?:AxiosRequestConfig): Promise> { +export async function addPet(data:Type.AddPetData,config?:AxiosRequestConfig) { zAddPetData.parse(data) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => data, -], -}; -return axios({ +const resp = await axios>({ method: "POST", url: `/pet`, data: data, ...config -}) +}); +return resp; } /** * @description @@ -46,22 +39,15 @@ data: data, * @param data Pet object that needs to be added to the store * @param [config] request config */ -export async function updatePet(data:Type.UpdatePetData,config?:AxiosRequestConfig): Promise> { +export async function updatePet(data:Type.UpdatePetData,config?:AxiosRequestConfig) { zUpdatePetData.parse(data) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => data, -], -}; -return axios({ +const resp = await axios>({ method: "PUT", url: `/pet`, data: data, ...config -}) +}); +return resp; } /** * @description Multiple status values can be provided with comma separated strings @@ -71,22 +57,16 @@ data: data, * @param [config] request config * @returns successful operation */ -export async function findPetsByStatus(status:Type.FindPetsByStatusParams,config?:AxiosRequestConfig): Promise> { +export async function findPetsByStatus(status:Type.FindPetsByStatusParams,config?:AxiosRequestConfig) { zFindPetsByStatusParams.parse(status) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zFindPetsByStatusResponse.parse(data), -], -}; -return axios({ +const resp = await axios>({ method: "GET", url: `/pet/findByStatus`, params: {"status": status}, ...config -}) +}); +zFindPetsByStatusResponse.parse(resp["data"]); +return resp; } /** * @deprecated @@ -97,22 +77,16 @@ params: {"status": status}, * @param [config] request config * @returns successful operation */ -export async function findPetsByTags(tags:Type.FindPetsByTagsParams,config?:AxiosRequestConfig): Promise> { +export async function findPetsByTags(tags:Type.FindPetsByTagsParams,config?:AxiosRequestConfig) { zFindPetsByTagsParams.parse(tags) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zFindPetsByTagsResponse.parse(data), -], -}; -return axios({ +const resp = await axios>({ method: "GET", url: `/pet/findByTags`, params: {"tags": tags}, ...config -}) +}); +zFindPetsByTagsResponse.parse(resp["data"]); +return resp; } /** * @description Returns a single pet @@ -122,21 +96,15 @@ params: {"tags": tags}, * @param [config] request config * @returns successful operation */ -export async function getPetById(petId:Type.GetPetByIdPath,config?:AxiosRequestConfig): Promise> { +export async function getPetById(petId:Type.GetPetByIdPath,config?:AxiosRequestConfig) { zGetPetByIdPath.parse(petId) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zGetPetByIdResponse.parse(data), -], -}; -return axios({ +const resp = await axios>({ method: "GET", url: `/pet/${petId}`, ...config -}) +}); +zGetPetByIdResponse.parse(resp["data"]); +return resp; } /** * @description @@ -146,23 +114,16 @@ url: `/pet/${petId}`, * @param data request data * @param [config] request config */ -export async function updatePetWithForm(petId:Type.UpdatePetWithFormPath,data:Type.UpdatePetWithFormData,config?:AxiosRequestConfig): Promise> { +export async function updatePetWithForm(petId:Type.UpdatePetWithFormPath,data:Type.UpdatePetWithFormData,config?:AxiosRequestConfig) { zUpdatePetWithFormPath.parse(petId) zUpdatePetWithFormData.parse(data) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => data, -], -}; -return axios({ +const resp = await axios>({ method: "POST", url: `/pet/${petId}`, data: data, ...config -}) +}); +return resp; } /** * @description @@ -172,23 +133,16 @@ data: data, * @param [apiKey] request headers "api_key" * @param [config] request config */ -export async function deletePet(petId:Type.DeletePetPath,apiKey?:Type.DeletePetHeaders,config?:AxiosRequestConfig): Promise> { +export async function deletePet(petId:Type.DeletePetPath,apiKey?:Type.DeletePetHeaders,config?:AxiosRequestConfig) { zDeletePetPath.parse(petId) zDeletePetHeaders.parse(apiKey) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => data, -], -}; -return axios({ +const resp = await axios>({ method: "DELETE", url: `/pet/${petId}`, headers: {"api_key": apiKey}, ...config -}) +}); +return resp; } /** * @description @@ -199,23 +153,17 @@ headers: {"api_key": apiKey}, * @param [config] request config * @returns successful operation */ -export async function uploadFile(petId:Type.UploadFilePath,data:Type.UploadFileData,config?:AxiosRequestConfig): Promise> { +export async function uploadFile(petId:Type.UploadFilePath,data:Type.UploadFileData,config?:AxiosRequestConfig) { zUploadFilePath.parse(petId) zUploadFileData.parse(data) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zUploadFileResponse.parse(data), -], -}; -return axios({ +const resp = await axios>({ method: "POST", url: `/pet/${petId}/uploadImage`, data: data, ...config -}) +}); +zUploadFileResponse.parse(resp["data"]); +return resp; } /** * @description Returns a map of status codes to quantities @@ -224,20 +172,14 @@ data: data, * @param [config] request config * @returns successful operation */ -export async function getInventory(config?:AxiosRequestConfig): Promise> { -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zGetInventoryResponse.parse(data), -], -}; -return axios({ +export async function getInventory(config?:AxiosRequestConfig) { +const resp = await axios>({ method: "GET", url: `/store/inventory`, ...config -}) +}); +zGetInventoryResponse.parse(resp["data"]); +return resp; } /** * @description @@ -247,22 +189,16 @@ url: `/store/inventory`, * @param [config] request config * @returns successful operation */ -export async function placeOrder(data:Type.PlaceOrderData,config?:AxiosRequestConfig): Promise> { +export async function placeOrder(data:Type.PlaceOrderData,config?:AxiosRequestConfig) { zPlaceOrderData.parse(data) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zPlaceOrderResponse.parse(data), -], -}; -return axios({ +const resp = await axios>({ method: "POST", url: `/store/order`, data: data, ...config -}) +}); +zPlaceOrderResponse.parse(resp["data"]); +return resp; } /** * @description For valid response try integer IDs with value >= 1 and <= 10. Other values will generated exceptions @@ -272,21 +208,15 @@ data: data, * @param [config] request config * @returns successful operation */ -export async function getOrderById(orderId:Type.GetOrderByIdPath,config?:AxiosRequestConfig): Promise> { +export async function getOrderById(orderId:Type.GetOrderByIdPath,config?:AxiosRequestConfig) { zGetOrderByIdPath.parse(orderId) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zGetOrderByIdResponse.parse(data), -], -}; -return axios({ +const resp = await axios>({ method: "GET", url: `/store/order/${orderId}`, ...config -}) +}); +zGetOrderByIdResponse.parse(resp["data"]); +return resp; } /** * @description For valid response try integer IDs with positive integer value. Negative or non-integer values will generate API errors @@ -295,21 +225,14 @@ url: `/store/order/${orderId}`, * @param orderId ID of the order that needs to be deleted * @param [config] request config */ -export async function deleteOrder(orderId:Type.DeleteOrderPath,config?:AxiosRequestConfig): Promise> { +export async function deleteOrder(orderId:Type.DeleteOrderPath,config?:AxiosRequestConfig) { zDeleteOrderPath.parse(orderId) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => data, -], -}; -return axios({ +const resp = await axios>({ method: "DELETE", url: `/store/order/${orderId}`, ...config -}) +}); +return resp; } /** * @description This can only be done by the logged in user. @@ -318,22 +241,15 @@ url: `/store/order/${orderId}`, * @param data Created user object * @param [config] request config */ -export async function createUser(data:Type.CreateUserData,config?:AxiosRequestConfig): Promise> { +export async function createUser(data:Type.CreateUserData,config?:AxiosRequestConfig) { zCreateUserData.parse(data) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => data, -], -}; -return axios({ +const resp = await axios>({ method: "POST", url: `/user`, data: data, ...config -}) +}); +return resp; } /** * @description @@ -342,22 +258,15 @@ data: data, * @param data List of user object * @param [config] request config */ -export async function createUsersWithArrayInput(data:Type.CreateUsersWithArrayInputData,config?:AxiosRequestConfig): Promise> { +export async function createUsersWithArrayInput(data:Type.CreateUsersWithArrayInputData,config?:AxiosRequestConfig) { zCreateUsersWithArrayInputData.parse(data) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => data, -], -}; -return axios({ +const resp = await axios>({ method: "POST", url: `/user/createWithArray`, data: data, ...config -}) +}); +return resp; } /** * @description @@ -366,22 +275,15 @@ data: data, * @param data List of user object * @param [config] request config */ -export async function createUsersWithListInput(data:Type.CreateUsersWithListInputData,config?:AxiosRequestConfig): Promise> { +export async function createUsersWithListInput(data:Type.CreateUsersWithListInputData,config?:AxiosRequestConfig) { zCreateUsersWithListInputData.parse(data) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => data, -], -}; -return axios({ +const resp = await axios>({ method: "POST", url: `/user/createWithList`, data: data, ...config -}) +}); +return resp; } /** * @description @@ -391,22 +293,16 @@ data: data, * @param [config] request config * @returns successful operation */ -export async function loginUser(params:Type.LoginUserParams,config?:AxiosRequestConfig): Promise> { +export async function loginUser(params:Type.LoginUserParams,config?:AxiosRequestConfig) { zLoginUserParams.parse(params) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zLoginUserResponse.parse(data), -], -}; -return axios({ +const resp = await axios>({ method: "GET", url: `/user/login`, params: params, ...config -}) +}); +zLoginUserResponse.parse(resp["data"]); +return resp; } /** * @description @@ -414,20 +310,13 @@ params: params, * @see user Operations about user {@link http://swagger.io Find out more about our store} * @param [config] request config */ -export async function logoutUser(config?:AxiosRequestConfig): Promise> { -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => data, -], -}; -return axios({ +export async function logoutUser(config?:AxiosRequestConfig) { +const resp = await axios>({ method: "GET", url: `/user/logout`, ...config -}) +}); +return resp; } /** * @description @@ -437,21 +326,15 @@ url: `/user/logout`, * @param [config] request config * @returns successful operation */ -export async function getUserByName(username:Type.GetUserByNamePath,config?:AxiosRequestConfig): Promise> { +export async function getUserByName(username:Type.GetUserByNamePath,config?:AxiosRequestConfig) { zGetUserByNamePath.parse(username) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zGetUserByNameResponse.parse(data), -], -}; -return axios({ +const resp = await axios>({ method: "GET", url: `/user/${username}`, ...config -}) +}); +zGetUserByNameResponse.parse(resp["data"]); +return resp; } /** * @description This can only be done by the logged in user. @@ -460,21 +343,14 @@ url: `/user/${username}`, * @param username The name that needs to be deleted * @param [config] request config */ -export async function deleteUser(username:Type.DeleteUserPath,config?:AxiosRequestConfig): Promise> { +export async function deleteUser(username:Type.DeleteUserPath,config?:AxiosRequestConfig) { zDeleteUserPath.parse(username) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => data, -], -}; -return axios({ +const resp = await axios>({ method: "DELETE", url: `/user/${username}`, ...config -}) +}); +return resp; } /** * @description This can only be done by the logged in user. @@ -484,21 +360,14 @@ url: `/user/${username}`, * @param data Updated user object * @param [config] request config */ -export async function updateUser(username:Type.UpdateUserPath,data:Type.UpdateUserData,config?:AxiosRequestConfig): Promise> { +export async function updateUser(username:Type.UpdateUserPath,data:Type.UpdateUserData,config?:AxiosRequestConfig) { zUpdateUserPath.parse(username) zUpdateUserData.parse(data) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => data, -], -}; -return axios({ +const resp = await axios>({ method: "PUT", url: `/user/${username}`, data: data, ...config -}) +}); +return resp; } \ No newline at end of file diff --git a/test/example-dest/3.0/pet-store.ts b/test/example-dest/3.0/pet-store.ts index b4922fc..69e56a5 100644 --- a/test/example-dest/3.0/pet-store.ts +++ b/test/example-dest/3.0/pet-store.ts @@ -30,22 +30,16 @@ import {zAddPetData,zAddPetResponse,zUpdatePetData,zUpdatePetResponse,zFindPetsB * @param [config] request config * @returns Successful operation */ -export async function addPet(data:Type.AddPetData,config?:AxiosRequestConfig): Promise> { +export async function addPet(data:Type.AddPetData,config?:AxiosRequestConfig) { zAddPetData.parse(data) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zAddPetResponse.parse(data), -], -}; -return axios({ +const resp = await axios>({ method: "POST", url: `/pet`, data: data, ...config -}) +}); +zAddPetResponse.parse(resp["data"]); +return resp; } /** * @description Update an existing pet by Id @@ -55,22 +49,16 @@ data: data, * @param [config] request config * @returns Successful operation */ -export async function updatePet(data:Type.UpdatePetData,config?:AxiosRequestConfig): Promise> { +export async function updatePet(data:Type.UpdatePetData,config?:AxiosRequestConfig) { zUpdatePetData.parse(data) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zUpdatePetResponse.parse(data), -], -}; -return axios({ +const resp = await axios>({ method: "PUT", url: `/pet`, data: data, ...config -}) +}); +zUpdatePetResponse.parse(resp["data"]); +return resp; } /** * @description Multiple status values can be provided with comma separated strings @@ -80,22 +68,16 @@ data: data, * @param [config] request config * @returns successful operation */ -export async function findPetsByStatus(status?:Type.FindPetsByStatusParams,config?:AxiosRequestConfig): Promise> { +export async function findPetsByStatus(status?:Type.FindPetsByStatusParams,config?:AxiosRequestConfig) { zFindPetsByStatusParams.parse(status) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zFindPetsByStatusResponse.parse(data), -], -}; -return axios({ +const resp = await axios>({ method: "GET", url: `/pet/findByStatus`, params: {"status": status}, ...config -}) +}); +zFindPetsByStatusResponse.parse(resp["data"]); +return resp; } /** * @description Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. @@ -105,22 +87,16 @@ params: {"status": status}, * @param [config] request config * @returns successful operation */ -export async function findPetsByTags(tags?:Type.FindPetsByTagsParams,config?:AxiosRequestConfig): Promise> { +export async function findPetsByTags(tags?:Type.FindPetsByTagsParams,config?:AxiosRequestConfig) { zFindPetsByTagsParams.parse(tags) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zFindPetsByTagsResponse.parse(data), -], -}; -return axios({ +const resp = await axios>({ method: "GET", url: `/pet/findByTags`, params: {"tags": tags}, ...config -}) +}); +zFindPetsByTagsResponse.parse(resp["data"]); +return resp; } /** * @description Returns a single pet @@ -130,21 +106,15 @@ params: {"tags": tags}, * @param [config] request config * @returns successful operation */ -export async function getPetById(petId:Type.GetPetByIdPath,config?:AxiosRequestConfig): Promise> { +export async function getPetById(petId:Type.GetPetByIdPath,config?:AxiosRequestConfig) { zGetPetByIdPath.parse(petId) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zGetPetByIdResponse.parse(data), -], -}; -return axios({ +const resp = await axios>({ method: "GET", url: `/pet/${petId}`, ...config -}) +}); +zGetPetByIdResponse.parse(resp["data"]); +return resp; } /** * @description @@ -154,23 +124,16 @@ url: `/pet/${petId}`, * @param [params] request params * @param [config] request config */ -export async function updatePetWithForm(petId:Type.UpdatePetWithFormPath,params?:Type.UpdatePetWithFormParams,config?:AxiosRequestConfig): Promise> { +export async function updatePetWithForm(petId:Type.UpdatePetWithFormPath,params?:Type.UpdatePetWithFormParams,config?:AxiosRequestConfig) { zUpdatePetWithFormPath.parse(petId) zUpdatePetWithFormParams.parse(params) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => data, -], -}; -return axios({ +const resp = await axios>({ method: "POST", url: `/pet/${petId}`, params: params, ...config -}) +}); +return resp; } /** * @description @@ -180,23 +143,16 @@ params: params, * @param [apiKey] request headers "api_key" * @param [config] request config */ -export async function deletePet(petId:Type.DeletePetPath,apiKey?:Type.DeletePetHeaders,config?:AxiosRequestConfig): Promise> { +export async function deletePet(petId:Type.DeletePetPath,apiKey?:Type.DeletePetHeaders,config?:AxiosRequestConfig) { zDeletePetPath.parse(petId) zDeletePetHeaders.parse(apiKey) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => data, -], -}; -return axios({ +const resp = await axios>({ method: "DELETE", url: `/pet/${petId}`, headers: {"api_key": apiKey}, ...config -}) +}); +return resp; } /** * @description @@ -208,25 +164,19 @@ headers: {"api_key": apiKey}, * @param [config] request config * @returns successful operation */ -export async function uploadFile(petId:Type.UploadFilePath,data:Type.UploadFileData,additionalMetadata?:Type.UploadFileParams,config?:AxiosRequestConfig): Promise> { +export async function uploadFile(petId:Type.UploadFilePath,data:Type.UploadFileData,additionalMetadata?:Type.UploadFileParams,config?:AxiosRequestConfig) { zUploadFilePath.parse(petId) zUploadFileData.parse(data) zUploadFileParams.parse(additionalMetadata) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zUploadFileResponse.parse(data), -], -}; -return axios({ +const resp = await axios>({ method: "POST", url: `/pet/${petId}/uploadImage`, data: data, params: {"additionalMetadata": additionalMetadata}, ...config -}) +}); +zUploadFileResponse.parse(resp["data"]); +return resp; } /** * @description Returns a map of status codes to quantities @@ -235,20 +185,14 @@ params: {"additionalMetadata": additionalMetadata}, * @param [config] request config * @returns successful operation */ -export async function getInventory(config?:AxiosRequestConfig): Promise> { -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zGetInventoryResponse.parse(data), -], -}; -return axios({ +export async function getInventory(config?:AxiosRequestConfig) { +const resp = await axios>({ method: "GET", url: `/store/inventory`, ...config -}) +}); +zGetInventoryResponse.parse(resp["data"]); +return resp; } /** * @description Place a new order in the store @@ -258,22 +202,16 @@ url: `/store/inventory`, * @param [config] request config * @returns successful operation */ -export async function placeOrder(data:Type.PlaceOrderData,config?:AxiosRequestConfig): Promise> { +export async function placeOrder(data:Type.PlaceOrderData,config?:AxiosRequestConfig) { zPlaceOrderData.parse(data) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zPlaceOrderResponse.parse(data), -], -}; -return axios({ +const resp = await axios>({ method: "POST", url: `/store/order`, data: data, ...config -}) +}); +zPlaceOrderResponse.parse(resp["data"]); +return resp; } /** * @description For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions. @@ -283,21 +221,15 @@ data: data, * @param [config] request config * @returns successful operation */ -export async function getOrderById(orderId:Type.GetOrderByIdPath,config?:AxiosRequestConfig): Promise> { +export async function getOrderById(orderId:Type.GetOrderByIdPath,config?:AxiosRequestConfig) { zGetOrderByIdPath.parse(orderId) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zGetOrderByIdResponse.parse(data), -], -}; -return axios({ +const resp = await axios>({ method: "GET", url: `/store/order/${orderId}`, ...config -}) +}); +zGetOrderByIdResponse.parse(resp["data"]); +return resp; } /** * @description For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors @@ -306,21 +238,14 @@ url: `/store/order/${orderId}`, * @param orderId ID of the order that needs to be deleted * @param [config] request config */ -export async function deleteOrder(orderId:Type.DeleteOrderPath,config?:AxiosRequestConfig): Promise> { +export async function deleteOrder(orderId:Type.DeleteOrderPath,config?:AxiosRequestConfig) { zDeleteOrderPath.parse(orderId) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => data, -], -}; -return axios({ +const resp = await axios>({ method: "DELETE", url: `/store/order/${orderId}`, ...config -}) +}); +return resp; } /** * @description This can only be done by the logged in user. @@ -329,22 +254,15 @@ url: `/store/order/${orderId}`, * @param data Created user object * @param [config] request config */ -export async function createUser(data:Type.CreateUserData,config?:AxiosRequestConfig): Promise> { +export async function createUser(data:Type.CreateUserData,config?:AxiosRequestConfig) { zCreateUserData.parse(data) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => data, -], -}; -return axios({ +const resp = await axios>({ method: "POST", url: `/user`, data: data, ...config -}) +}); +return resp; } /** * @description Creates list of users with given input array @@ -354,22 +272,16 @@ data: data, * @param [config] request config * @returns Successful operation */ -export async function createUsersWithListInput(data:Type.CreateUsersWithListInputData,config?:AxiosRequestConfig): Promise> { +export async function createUsersWithListInput(data:Type.CreateUsersWithListInputData,config?:AxiosRequestConfig) { zCreateUsersWithListInputData.parse(data) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zCreateUsersWithListInputResponse.parse(data), -], -}; -return axios({ +const resp = await axios>({ method: "POST", url: `/user/createWithList`, data: data, ...config -}) +}); +zCreateUsersWithListInputResponse.parse(resp["data"]); +return resp; } /** * @description @@ -379,22 +291,16 @@ data: data, * @param [config] request config * @returns successful operation */ -export async function loginUser(params?:Type.LoginUserParams,config?:AxiosRequestConfig): Promise> { +export async function loginUser(params?:Type.LoginUserParams,config?:AxiosRequestConfig) { zLoginUserParams.parse(params) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zLoginUserResponse.parse(data), -], -}; -return axios({ +const resp = await axios>({ method: "GET", url: `/user/login`, params: params, ...config -}) +}); +zLoginUserResponse.parse(resp["data"]); +return resp; } /** * @description @@ -402,20 +308,13 @@ params: params, * @see user Operations about user * @param [config] request config */ -export async function logoutUser(config?:AxiosRequestConfig): Promise> { -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => data, -], -}; -return axios({ +export async function logoutUser(config?:AxiosRequestConfig) { +const resp = await axios>({ method: "GET", url: `/user/logout`, ...config -}) +}); +return resp; } /** * @description @@ -425,21 +324,15 @@ url: `/user/logout`, * @param [config] request config * @returns successful operation */ -export async function getUserByName(username:Type.GetUserByNamePath,config?:AxiosRequestConfig): Promise> { +export async function getUserByName(username:Type.GetUserByNamePath,config?:AxiosRequestConfig) { zGetUserByNamePath.parse(username) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zGetUserByNameResponse.parse(data), -], -}; -return axios({ +const resp = await axios>({ method: "GET", url: `/user/${username}`, ...config -}) +}); +zGetUserByNameResponse.parse(resp["data"]); +return resp; } /** * @description This can only be done by the logged in user. @@ -448,21 +341,14 @@ url: `/user/${username}`, * @param username The name that needs to be deleted * @param [config] request config */ -export async function deleteUser(username:Type.DeleteUserPath,config?:AxiosRequestConfig): Promise> { +export async function deleteUser(username:Type.DeleteUserPath,config?:AxiosRequestConfig) { zDeleteUserPath.parse(username) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => data, -], -}; -return axios({ +const resp = await axios>({ method: "DELETE", url: `/user/${username}`, ...config -}) +}); +return resp; } /** * @description This can only be done by the logged in user. @@ -472,21 +358,14 @@ url: `/user/${username}`, * @param data Update an existent user in the store * @param [config] request config */ -export async function updateUser(username:Type.UpdateUserPath,data:Type.UpdateUserData,config?:AxiosRequestConfig): Promise> { +export async function updateUser(username:Type.UpdateUserPath,data:Type.UpdateUserData,config?:AxiosRequestConfig) { zUpdateUserPath.parse(username) zUpdateUserData.parse(data) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => data, -], -}; -return axios({ +const resp = await axios>({ method: "PUT", url: `/user/${username}`, data: data, ...config -}) +}); +return resp; } \ No newline at end of file diff --git a/test/example-dest/3.1/pet-store.ts b/test/example-dest/3.1/pet-store.ts index ae4abc8..b62f78b 100644 --- a/test/example-dest/3.1/pet-store.ts +++ b/test/example-dest/3.1/pet-store.ts @@ -27,22 +27,16 @@ import {zUpdatePetData,zUpdatePetResponse,zAddPetData,zAddPetResponse,zGetPetByI * @param [config] request config * @returns Successful operation */ -export async function updatePet(data:Type.UpdatePetData,config?:AxiosRequestConfig): Promise> { +export async function updatePet(data:Type.UpdatePetData,config?:AxiosRequestConfig) { zUpdatePetData.parse(data) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zUpdatePetResponse.parse(data), -], -}; -return axios({ +const resp = await axios>({ method: "PUT", url: `/pet`, data: data, ...config -}) +}); +zUpdatePetResponse.parse(resp["data"]); +return resp; } /** * @description Add a new pet to the store @@ -52,22 +46,16 @@ data: data, * @param [config] request config * @returns Successful operation */ -export async function addPet(data:Type.AddPetData,config?:AxiosRequestConfig): Promise> { +export async function addPet(data:Type.AddPetData,config?:AxiosRequestConfig) { zAddPetData.parse(data) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => zAddPetResponse.parse(data), -], -}; -return axios({ +const resp = await axios>({ method: "POST", url: `/pet`, data: data, ...config -}) +}); +zAddPetResponse.parse(resp["data"]); +return resp; } /** * @description Returns a pet when 0 < ID <= 10. ID > 10 or nonintegers will simulate API error conditions @@ -75,19 +63,12 @@ data: data, * @param petId ID of pet that needs to be fetched * @param [config] request config */ -export async function getPetById(petId:Type.GetPetByIdPath,config?:AxiosRequestConfig): Promise> { +export async function getPetById(petId:Type.GetPetByIdPath,config?:AxiosRequestConfig) { zGetPetByIdPath.parse(petId) -const transformResponse = config?.transformResponse; -config = { -...config, -transformResponse: [ -...Array.isArray(transformResponse) ? transformResponse : (transformResponse ? [transformResponse] : []), -data => data, -], -}; -return axios({ +const resp = await axios>({ method: "GET", url: `/pet/${petId}`, ...config -}) +}); +return resp; } \ No newline at end of file diff --git a/test/printer/arg.test.ts b/test/printer/arg.test.ts index ef748d4..37faadf 100644 --- a/test/printer/arg.test.ts +++ b/test/printer/arg.test.ts @@ -76,15 +76,16 @@ it('1*path + 1*query + 1*header', () => { * @param [config] request config * @returns pet name */ - export async function getPet(petId:Type.GetPetPath,data:Type.GetPetData,xAuthKey?:Type.GetPetHeaders,categoryId?:Type.GetPetParams,config?:AxiosRequestConfig): Promise> { - return axios({ + export async function getPet(petId:Type.GetPetPath,data:Type.GetPetData,xAuthKey?:Type.GetPetHeaders,categoryId?:Type.GetPetParams,config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/pets/\${petId}\`, data: data, headers: {"x-auth-key": xAuthKey}, params: {"category-id": categoryId}, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(` @@ -174,15 +175,16 @@ it('n*path + 1*query + 1*header', () => { * @param [categoryId] request params "category-id" * @param [config] request config */ - export async function getPet(path:Type.GetPetPath,data:Type.GetPetData,xAuthKey?:Type.GetPetHeaders,categoryId?:Type.GetPetParams,config?:AxiosRequestConfig): Promise> { - return axios({ + export async function getPet(path:Type.GetPetPath,data:Type.GetPetData,xAuthKey?:Type.GetPetHeaders,categoryId?:Type.GetPetParams,config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/zoo/\${path["zoo-id"]}/pets/\${path["pet-id"]}\`, data: data, headers: {"x-auth-key": xAuthKey}, params: {"category-id": categoryId}, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(` @@ -283,15 +285,16 @@ it('n*path + n*query + 1*header', () => { * @param [params] request params * @param [config] request config */ - export async function getPet(path:Type.GetPetPath,data:Type.GetPetData,xAuthKey?:Type.GetPetHeaders,params?:Type.GetPetParams,config?:AxiosRequestConfig): Promise> { - return axios({ + export async function getPet(path:Type.GetPetPath,data:Type.GetPetData,xAuthKey?:Type.GetPetHeaders,params?:Type.GetPetParams,config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/zoo/\${path["zoo-id"]}/pets/\${path["pet-id"]}\`, data: data, headers: {"x-auth-key": xAuthKey}, params: params, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(` @@ -405,15 +408,16 @@ it('n*path + n*query + n*header', () => { * @param [params] request params * @param [config] request config */ - export async function getPet(path:Type.GetPetPath,data:Type.GetPetData,headers?:Type.GetPetHeaders,params?:Type.GetPetParams,config?:AxiosRequestConfig): Promise> { - return axios({ + export async function getPet(path:Type.GetPetPath,data:Type.GetPetData,headers?:Type.GetPetHeaders,params?:Type.GetPetParams,config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/zoo/\${path["zoo-id"]}/pets/\${path["pet-id"]}\`, data: data, headers: headers, params: params, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(` @@ -486,12 +490,13 @@ it('path name unique', () => { * @param type request path "type" * @param [config] request config */ - export async function getPet(type:Type.GetPetPath,config?:AxiosRequestConfig): Promise> { - return axios({ + export async function getPet(type:Type.GetPetPath,config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/pets/\${type}\`, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(`"export type GetPetPath = string;"`); diff --git a/test/printer/options.test.ts b/test/printer/options.test.ts index 9245274..e4e58d7 100644 --- a/test/printer/options.test.ts +++ b/test/printer/options.test.ts @@ -26,12 +26,13 @@ it('axios 模块导入名称默认', () => { "/** * @param [config] request config */ - export async function get(config?:AxiosRequestConfig): Promise> { - return axios({ + export async function get(config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/\`, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(`""`); @@ -65,12 +66,13 @@ it('axios 模块导入名称指定', () => { "/** * @param [config] request config */ - export async function get(config?:AxiosRequestConfig): Promise> { - return axios({ + export async function get(config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/\`, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(`""`); @@ -104,12 +106,13 @@ it('axios 默认导入名称为空', () => { "/** * @param [config] request config */ - export async function get(config?:AxiosRequestConfig): Promise> { - return axios({ + export async function get(config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/\`, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(`""`); @@ -147,12 +150,13 @@ it('axios 模块和类型指定文件', () => { "/** * @param [config] request config */ - export async function get(config?:AxiosRequestConfig): Promise> { - return axios({ + export async function get(config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/\`, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(`""`); diff --git a/test/printer/path.test.ts b/test/printer/path.test.ts index 21bacfa..c275e3e 100644 --- a/test/printer/path.test.ts +++ b/test/printer/path.test.ts @@ -25,12 +25,13 @@ it('1路径 + 1请求', () => { "/** * @param [config] request config */ - export async function getApiAbc(config?:AxiosRequestConfig): Promise> { - return axios({ + export async function getApiAbc(config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/api/abc\`, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(`""`); @@ -62,12 +63,13 @@ it('1路径 + 1请求 * module', () => { "/** * @param [config] request config */ - export async function getApiAbc(config?:AxiosRequestConfig): Promise> { - return axios({ + export async function getApiAbc(config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/api/abc\`, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(`""`); @@ -100,22 +102,24 @@ it('1路径 + 2请求', () => { "/** * @param [config] request config */ - export async function getApiAbc(config?:AxiosRequestConfig): Promise> { - return axios({ + export async function getApiAbc(config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/api/abc\`, ...config - }) + }); + return resp; } /** * @param [config] request config */ - export async function postApiAbc(config?:AxiosRequestConfig): Promise> { - return axios({ + export async function postApiAbc(config?:AxiosRequestConfig) { + const resp = await axios>({ method: "POST", url: \`/api/abc\`, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(`""`); @@ -165,13 +169,14 @@ it('1路径 + 1请求 + 1query', () => { * @param [var_2] description 1 * @param [config] request config */ - export async function getApiAbc(var_2?:Type.GetApiAbcParams,config?:AxiosRequestConfig): Promise> { - return axios({ + export async function getApiAbc(var_2?:Type.GetApiAbcParams,config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/api/abc\`, params: {"var": var_2}, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(`"export type GetApiAbcParams = number;"`); @@ -219,13 +224,14 @@ it('1路径 + 1请求 + 1query with duplicate', () => { * @param [config_2] request params "config" * @param [config] request config */ - export async function getApiAbc(config_2?:Type.GetApiAbcParams,config?:AxiosRequestConfig): Promise> { - return axios({ + export async function getApiAbc(config_2?:Type.GetApiAbcParams,config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/api/abc\`, params: {"config": config_2}, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(`"export type GetApiAbcParams = string;"`); @@ -274,12 +280,13 @@ it('1路径 + 1请求 + 1path', () => { * @param var_2 request path "var" * @param [config] request config */ - export async function getApiAbc(var_2:Type.GetApiAbcPath,config?:AxiosRequestConfig): Promise> { - return axios({ + export async function getApiAbc(var_2:Type.GetApiAbcPath,config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/api/abc/\${var_2}\`, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(`"export type GetApiAbcPath = string;"`); @@ -335,12 +342,13 @@ it('1路径 + 1请求 + 2path', () => { * @param path request path * @param [config] request config */ - export async function getApiAbcDef(path:Type.GetApiAbcDefPath,config?:AxiosRequestConfig): Promise> { - return axios({ + export async function getApiAbcDef(path:Type.GetApiAbcDefPath,config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/api/abc/\${path["var"]}/def/\${path["xyz"]}\`, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(` @@ -412,13 +420,14 @@ it('1路径 + 1请求 + 2query', () => { * @param params request params * @param [config] request config */ - export async function getApiAbc(params:Type.GetApiAbcParams,config?:AxiosRequestConfig): Promise> { - return axios({ + export async function getApiAbc(params:Type.GetApiAbcParams,config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/api/abc\`, params: params, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(` @@ -503,13 +512,14 @@ it('1路径 + 1请求 + 2query + 1path', () => { * @param params request params * @param [config] request config */ - export async function getApiAbc(params:Type.GetApiAbcPath,params_2:Type.GetApiAbcParams,config?:AxiosRequestConfig): Promise> { - return axios({ + export async function getApiAbc(params:Type.GetApiAbcPath,params_2:Type.GetApiAbcParams,config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/api/abc/\${params}\`, params: params_2, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(` @@ -607,14 +617,15 @@ it('1路径 + 1请求 + 2query + 1path + 1request primitive', () => { * @param data aaa * @param [config] request config */ - export async function getApiAbc(c:Type.GetApiAbcPath,params:Type.GetApiAbcParams,data:Type.GetApiAbcData,config?:AxiosRequestConfig): Promise> { - return axios({ + export async function getApiAbc(c:Type.GetApiAbcPath,params:Type.GetApiAbcParams,data:Type.GetApiAbcData,config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/api/abc/\${c}\`, params: params, data: data, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(` @@ -717,14 +728,15 @@ it('1路径 + 1请求 + 2query + 1path + 1request object', () => { * @param data request--data--description * @param [config] request config */ - export async function getApiAbc(c:Type.GetApiAbcPath,params:Type.GetApiAbcParams,data:Type.GetApiAbcData,config?:AxiosRequestConfig): Promise> { - return axios({ + export async function getApiAbc(c:Type.GetApiAbcPath,params:Type.GetApiAbcParams,data:Type.GetApiAbcData,config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/api/abc/\${c}\`, params: params, data: data, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(` @@ -841,14 +853,15 @@ it('1路径 + 1请求 + 2query + 1path + 1request object + 1response primitive', * @param [config] request config * @returns success */ - export async function getApiAbc(c:Type.GetApiAbcPath,params:Type.GetApiAbcParams,data:Type.GetApiAbcData,config?:AxiosRequestConfig): Promise> { - return axios({ + export async function getApiAbc(c:Type.GetApiAbcPath,params:Type.GetApiAbcParams,data:Type.GetApiAbcData,config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/api/abc/\${c}\`, params: params, data: data, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(` @@ -984,14 +997,15 @@ it('1路径 + 1请求 + 2query + 1path + 1request object + 1response object', () * @param [config] request config * @returns success */ - export async function getApiAbcDef(data:Type.GetApiAbcDefPath,params:Type.GetApiAbcDefParams,data_2:Type.GetApiAbcDefData,config?:AxiosRequestConfig): Promise> { - return axios({ + export async function getApiAbcDef(data:Type.GetApiAbcDefPath,params:Type.GetApiAbcDefParams,data_2:Type.GetApiAbcDefData,config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/api/abc/\${data}/def\`, params: params, data: data_2, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(` diff --git a/test/printer/ref-parameter.test.ts b/test/printer/ref-parameter.test.ts index e844895..773e0a7 100644 --- a/test/printer/ref-parameter.test.ts +++ b/test/printer/ref-parameter.test.ts @@ -49,12 +49,13 @@ it('ref parameter', () => { * @param userId request path "userId" * @param [config] request config */ - export async function postTest(userId:Type.PostTestPath,config?:AxiosRequestConfig): Promise> { - return axios({ + export async function postTest(userId:Type.PostTestPath,config?:AxiosRequestConfig) { + const resp = await axios>({ method: "POST", url: \`/test/\${userId}\`, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(`"export type PostTestPath = number;"`); diff --git a/test/printer/ref-path.test.ts b/test/printer/ref-path.test.ts index 3287054..2476bd9 100644 --- a/test/printer/ref-path.test.ts +++ b/test/printer/ref-path.test.ts @@ -38,12 +38,13 @@ it('ref path', () => { "/** * @param [config] request config */ - export async function getTest(config?:AxiosRequestConfig): Promise> { - return axios({ + export async function getTest(config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/test\`, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(`""`); diff --git a/test/printer/ref-request.test.ts b/test/printer/ref-request.test.ts index f44071a..e7906de 100644 --- a/test/printer/ref-request.test.ts +++ b/test/printer/ref-request.test.ts @@ -64,13 +64,14 @@ it('ref request', () => { * @param data 用户列表 * @param [config] request config */ - export async function postTest(data:Type.PostTestData,config?:AxiosRequestConfig): Promise> { - return axios({ + export async function postTest(data:Type.PostTestData,config?:AxiosRequestConfig) { + const resp = await axios>({ method: "POST", url: \`/test\`, data: data, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(` diff --git a/test/printer/ref-response.test.ts b/test/printer/ref-response.test.ts index 6f98a15..137d7a9 100644 --- a/test/printer/ref-response.test.ts +++ b/test/printer/ref-response.test.ts @@ -65,12 +65,13 @@ it('ref response', () => { "/** * @param [config] request config */ - export async function postTest(config?:AxiosRequestConfig): Promise> { - return axios({ + export async function postTest(config?:AxiosRequestConfig) { + const resp = await axios>({ method: "POST", url: \`/test\`, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(` diff --git a/test/printer/unique.test.ts b/test/printer/unique.test.ts index e837f41..0fba3d1 100644 --- a/test/printer/unique.test.ts +++ b/test/printer/unique.test.ts @@ -51,12 +51,13 @@ it('unique vars', () => { * @param [config] request config * @returns success */ - export async function getTest(config?:AxiosRequestConfig): Promise> { - return axios({ + export async function getTest(config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/test\`, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(` @@ -161,13 +162,14 @@ it('unique types', () => { * @param [config] request config * @returns success */ - export async function getTest(axios_2:Type.GetTestPath,unknownObject?:Type.GetTestParams,config?:AxiosRequestConfig): Promise> { - return axios({ + export async function getTest(axios_2:Type.GetTestPath,unknownObject?:Type.GetTestParams,config?:AxiosRequestConfig) { + const resp = await axios>({ method: "GET", url: \`/test/\${axios_2}\`, params: {"UnknownObject": unknownObject}, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(` diff --git a/test/printer/upload.test.ts b/test/printer/upload.test.ts index 5495408..6655bcc 100644 --- a/test/printer/upload.test.ts +++ b/test/printer/upload.test.ts @@ -44,13 +44,14 @@ it('upload root', () => { * @param data A file * @param [config] request config */ - export async function upload(data:Type.UploadData,config?:AxiosRequestConfig): Promise> { - return axios({ + export async function upload(data:Type.UploadData,config?:AxiosRequestConfig) { + const resp = await axios>({ method: "POST", url: \`/upload\`, data: data, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(`"export type UploadData = Blob;"`); @@ -124,14 +125,15 @@ it('upload single', () => { * @param data request data * @param [config] request config */ - export async function upload(category:Type.UploadParams,data:Type.UploadData,config?:AxiosRequestConfig): Promise> { - return axios({ + export async function upload(category:Type.UploadParams,data:Type.UploadData,config?:AxiosRequestConfig) { + const resp = await axios>({ method: "POST", url: \`/upload\`, params: {"category": category}, data: data, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(` @@ -227,14 +229,15 @@ it('upload multiple', () => { * @param data request data * @param [config] request config */ - export async function upload(category:Type.UploadParams,data:Type.UploadData,config?:AxiosRequestConfig): Promise> { - return axios({ + export async function upload(category:Type.UploadParams,data:Type.UploadData,config?:AxiosRequestConfig) { + const resp = await axios>({ method: "POST", url: \`/upload\`, params: {"category": category}, data: data, ...config - }) + }); + return resp; }" `); expect(result.type.code).toMatchInlineSnapshot(`