Skip to content
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.

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

fix: Fixing return type for response headers #36

Merged
merged 6 commits into from
Oct 29, 2024
Merged
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions examples/output/github/hooks/fetcher.ts
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ export interface FetcherOptions<TQueryParams = never, TBody = never, THeaderPara
const JSON_HEADERS = ['application/json'];

interface ResponseContainer<TResponse, TResponseHeaders> {
content: TResponse;
body: TResponse;
headers: TResponseHeaders;
}

@@ -20,7 +20,7 @@ export async function fetcher<
THeaderParams = HeadersInit,
>(
options: FetcherOptions<TQueryParams, TBody, THeaderParams>,
): Promise<ResponseContainer<TResponse, Record<string, any>>> {
): Promise<ResponseContainer<TResponse, Headers>> {
const { body, url, queryParams, headers, ...rest } = options;

const response = await fetch(url, {
@@ -39,8 +39,8 @@ export async function fetcher<

if (response.ok) {
return {
content: data,
headers: {},
body: data,
headers: response.headers,
};
}

Original file line number Diff line number Diff line change
@@ -60,8 +60,8 @@ export interface ReposListForAuthenticatedUserProps
}

export interface ReposListForAuthenticatedUserResponseContainer {
content: ReposListForAuthenticatedUserOkResponse;
headers: Record<string, any>;
body: ReposListForAuthenticatedUserOkResponse;
headers: Headers;
}

export function reposListForAuthenticatedUser(
8 changes: 4 additions & 4 deletions examples/output/petstore-openapi-v3.0/hooks/fetcher.ts
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ export interface FetcherOptions<TQueryParams = never, TBody = never, THeaderPara
const JSON_HEADERS = ['application/json'];

interface ResponseContainer<TResponse, TResponseHeaders> {
content: TResponse;
body: TResponse;
headers: TResponseHeaders;
}

@@ -20,7 +20,7 @@ export async function fetcher<
THeaderParams = HeadersInit,
>(
options: FetcherOptions<TQueryParams, TBody, THeaderParams>,
): Promise<ResponseContainer<TResponse, Record<string, any>>> {
): Promise<ResponseContainer<TResponse, Headers>> {
const { body, url, queryParams, headers, ...rest } = options;

const response = await fetch(url, {
@@ -39,8 +39,8 @@ export async function fetcher<

if (response.ok) {
return {
content: data,
headers: {},
body: data,
headers: response.headers,
};
}

Original file line number Diff line number Diff line change
@@ -17,8 +17,8 @@ export interface AddPetProps extends Omit<FetcherOptions<unknown, AddPetRequestB
}

export interface AddPetResponseContainer {
content: AddPetOkResponse;
headers: Record<string, any>;
body: AddPetOkResponse;
headers: Headers;
}

export function addPet(props: AddPetProps): Promise<AddPetResponseContainer> {
Original file line number Diff line number Diff line change
@@ -18,8 +18,8 @@ export interface CreateUserProps
}

export interface CreateUserResponseContainer {
content: CreateUserOkResponse;
headers: Record<string, any>;
body: CreateUserOkResponse;
headers: Headers;
}

export function createUser(props: CreateUserProps): Promise<CreateUserResponseContainer> {
Original file line number Diff line number Diff line change
@@ -18,8 +18,8 @@ export interface CreateUsersWithListInputProps
}

export interface CreateUsersWithListInputResponseContainer {
content: CreateUsersWithListInputOkResponse;
headers: Record<string, any>;
body: CreateUsersWithListInputOkResponse;
headers: Headers;
}

export function createUsersWithListInput(
Original file line number Diff line number Diff line change
@@ -21,8 +21,8 @@ export interface DeleteOrderProps
Omit<FetcherOptions<unknown, unknown>, 'url'> {}

export interface DeleteOrderResponseContainer {
content: DeleteOrderOkResponse;
headers: Record<string, any>;
body: DeleteOrderOkResponse;
headers: Headers;
}

export function deleteOrder(props: DeleteOrderProps): Promise<DeleteOrderResponseContainer> {
Original file line number Diff line number Diff line change
@@ -25,8 +25,8 @@ export interface DeletePetProps
Omit<FetcherOptions<unknown, unknown, DeletePetMutationHeaderParams>, 'url'> {}

export interface DeletePetResponseContainer {
content: DeletePetOkResponse;
headers: Record<string, any>;
body: DeletePetOkResponse;
headers: Headers;
}

export function deletePet(props: DeletePetProps): Promise<DeletePetResponseContainer> {
Original file line number Diff line number Diff line change
@@ -18,8 +18,8 @@ export interface DeleteUserProps
Omit<FetcherOptions<unknown, unknown>, 'url'> {}

export interface DeleteUserResponseContainer {
content: DeleteUserOkResponse;
headers: Record<string, any>;
body: DeleteUserOkResponse;
headers: Headers;
}

export function deleteUser(props: DeleteUserProps): Promise<DeleteUserResponseContainer> {
Original file line number Diff line number Diff line change
@@ -23,8 +23,8 @@ export interface FindPetsByStatusProps
}

export interface FindPetsByStatusResponseContainer {
content: FindPetsByStatusOkResponse;
headers: Record<string, any>;
body: FindPetsByStatusOkResponse;
headers: Headers;
}

export function findPetsByStatus(
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@ export interface FindPetsByTagsProps
}

export interface FindPetsByTagsResponseContainer {
content: FindPetsByTagsOkResponse;
headers: Record<string, any>;
body: FindPetsByTagsOkResponse;
headers: Headers;
}

export function findPetsByTags(
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ export type GetInventoryErrorResponse = unknown;
export interface GetInventoryProps extends Omit<FetcherOptions<unknown, unknown>, 'url'> {}

export interface GetInventoryResponseContainer {
content: GetInventoryOkResponse;
headers: Record<string, any>;
body: GetInventoryOkResponse;
headers: Headers;
}

export function getInventory(props: GetInventoryProps): Promise<GetInventoryResponseContainer> {
Original file line number Diff line number Diff line change
@@ -22,8 +22,8 @@ export interface GetOrderByIdProps
Omit<FetcherOptions<unknown, unknown>, 'url'> {}

export interface GetOrderByIdResponseContainer {
content: GetOrderByIdOkResponse;
headers: Record<string, any>;
body: GetOrderByIdOkResponse;
headers: Headers;
}

export function getOrderById(props: GetOrderByIdProps): Promise<GetOrderByIdResponseContainer> {
Original file line number Diff line number Diff line change
@@ -22,8 +22,8 @@ export interface GetPetByIdProps
Omit<FetcherOptions<unknown, unknown>, 'url'> {}

export interface GetPetByIdResponseContainer {
content: GetPetByIdOkResponse;
headers: Record<string, any>;
body: GetPetByIdOkResponse;
headers: Headers;
}

export function getPetById(props: GetPetByIdProps): Promise<GetPetByIdResponseContainer> {
Original file line number Diff line number Diff line change
@@ -19,8 +19,8 @@ export interface GetUserByNameProps
Omit<FetcherOptions<unknown, unknown>, 'url'> {}

export interface GetUserByNameResponseContainer {
content: GetUserByNameOkResponse;
headers: Record<string, any>;
body: GetUserByNameOkResponse;
headers: Headers;
}

export function getUserByName(props: GetUserByNameProps): Promise<GetUserByNameResponseContainer> {
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@ export interface LoginUserProps
}

export interface LoginUserResponseContainer {
content: LoginUserOkResponse;
headers: Record<string, any>;
body: LoginUserOkResponse;
headers: Headers;
}

export function loginUser(props: LoginUserProps): Promise<LoginUserResponseContainer> {
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ export type LogoutUserErrorResponse = unknown;
export interface LogoutUserProps extends Omit<FetcherOptions<unknown, unknown>, 'url'> {}

export interface LogoutUserResponseContainer {
content: LogoutUserOkResponse;
headers: Record<string, any>;
body: LogoutUserOkResponse;
headers: Headers;
}

export function logoutUser(props: LogoutUserProps): Promise<LogoutUserResponseContainer> {
Original file line number Diff line number Diff line change
@@ -18,8 +18,8 @@ export interface PlaceOrderProps
}

export interface PlaceOrderResponseContainer {
content: PlaceOrderOkResponse;
headers: Record<string, any>;
body: PlaceOrderOkResponse;
headers: Headers;
}

export function placeOrder(props: PlaceOrderProps): Promise<PlaceOrderResponseContainer> {
Original file line number Diff line number Diff line change
@@ -17,8 +17,8 @@ export interface UpdatePetProps extends Omit<FetcherOptions<unknown, UpdatePetRe
}

export interface UpdatePetResponseContainer {
content: UpdatePetOkResponse;
headers: Record<string, any>;
body: UpdatePetOkResponse;
headers: Headers;
}

export function updatePet(props: UpdatePetProps): Promise<UpdatePetResponseContainer> {
Original file line number Diff line number Diff line change
@@ -28,8 +28,8 @@ export interface UpdatePetWithFormProps
}

export interface UpdatePetWithFormResponseContainer {
content: UpdatePetWithFormOkResponse;
headers: Record<string, any>;
body: UpdatePetWithFormOkResponse;
headers: Headers;
}

export function updatePetWithForm(
Original file line number Diff line number Diff line change
@@ -23,8 +23,8 @@ export interface UpdateUserProps
}

export interface UpdateUserResponseContainer {
content: UpdateUserOkResponse;
headers: Record<string, any>;
body: UpdateUserOkResponse;
headers: Headers;
}

export function updateUser(props: UpdateUserProps): Promise<UpdateUserResponseContainer> {
Original file line number Diff line number Diff line change
@@ -31,8 +31,8 @@ export interface UploadFileProps
}

export interface UploadFileResponseContainer {
content: UploadFileOkResponse;
headers: Record<string, any>;
body: UploadFileOkResponse;
headers: Headers;
}

export function uploadFile(props: UploadFileProps): Promise<UploadFileResponseContainer> {
8 changes: 4 additions & 4 deletions examples/output/petstore-swagger/hooks/fetcher.ts
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ export interface FetcherOptions<TQueryParams = never, TBody = never, THeaderPara
const JSON_HEADERS = ['application/json'];

interface ResponseContainer<TResponse, TResponseHeaders> {
content: TResponse;
body: TResponse;
headers: TResponseHeaders;
}

@@ -21,7 +21,7 @@ export async function fetcher<
THeaderParams = HeadersInit,
>(
options: FetcherOptions<TQueryParams, TBody, THeaderParams>,
): Promise<ResponseContainer<TResponse, Record<string, any>>> {
): Promise<ResponseContainer<TResponse, Headers>> {
const { body, url, queryParams, headers, ...rest } = options;

const response = await fetch(url, {
@@ -40,8 +40,8 @@ export async function fetcher<

if (response.ok) {
return {
content: data,
headers: {},
body: data,
headers: response.headers,
};
}

4 changes: 2 additions & 2 deletions examples/output/petstore-swagger/hooks/useAddPetMutation.ts
Original file line number Diff line number Diff line change
@@ -18,8 +18,8 @@ export interface AddPetProps extends Omit<FetcherOptions<unknown, AddPetRequestB
}

export interface AddPetResponseContainer {
content: AddPetOkResponse;
headers: Record<string, any>;
body: AddPetOkResponse;
headers: Headers;
}

export function addPet(props: AddPetProps): Promise<AddPetResponseContainer> {
Original file line number Diff line number Diff line change
@@ -19,8 +19,8 @@ export interface CreateUserProps
}

export interface CreateUserResponseContainer {
content: CreateUserOkResponse;
headers: Record<string, any>;
body: CreateUserOkResponse;
headers: Headers;
}

export function createUser(props: CreateUserProps): Promise<CreateUserResponseContainer> {
Original file line number Diff line number Diff line change
@@ -19,8 +19,8 @@ export interface CreateUsersWithArrayInputProps
}

export interface CreateUsersWithArrayInputResponseContainer {
content: CreateUsersWithArrayInputOkResponse;
headers: Record<string, any>;
body: CreateUsersWithArrayInputOkResponse;
headers: Headers;
}

export function createUsersWithArrayInput(
Original file line number Diff line number Diff line change
@@ -19,8 +19,8 @@ export interface CreateUsersWithListInputProps
}

export interface CreateUsersWithListInputResponseContainer {
content: CreateUsersWithListInputOkResponse;
headers: Record<string, any>;
body: CreateUsersWithListInputOkResponse;
headers: Headers;
}

export function createUsersWithListInput(
Original file line number Diff line number Diff line change
@@ -22,8 +22,8 @@ export interface DeleteOrderProps
Omit<FetcherOptions<unknown, unknown>, 'url'> {}

export interface DeleteOrderResponseContainer {
content: DeleteOrderOkResponse;
headers: Record<string, any>;
body: DeleteOrderOkResponse;
headers: Headers;
}

export function deleteOrder(props: DeleteOrderProps): Promise<DeleteOrderResponseContainer> {
Original file line number Diff line number Diff line change
@@ -26,8 +26,8 @@ export interface DeletePetProps
Omit<FetcherOptions<unknown, unknown, DeletePetMutationHeaderParams>, 'url'> {}

export interface DeletePetResponseContainer {
content: DeletePetOkResponse;
headers: Record<string, any>;
body: DeletePetOkResponse;
headers: Headers;
}

export function deletePet(props: DeletePetProps): Promise<DeletePetResponseContainer> {
Original file line number Diff line number Diff line change
@@ -19,8 +19,8 @@ export interface DeleteUserProps
Omit<FetcherOptions<unknown, unknown>, 'url'> {}

export interface DeleteUserResponseContainer {
content: DeleteUserOkResponse;
headers: Record<string, any>;
body: DeleteUserOkResponse;
headers: Headers;
}

export function deleteUser(props: DeleteUserProps): Promise<DeleteUserResponseContainer> {
Original file line number Diff line number Diff line change
@@ -21,8 +21,8 @@ export interface FindPetsByStatusProps
}

export interface FindPetsByStatusResponseContainer {
content: FindPetsByStatusOkResponse;
headers: Record<string, any>;
body: FindPetsByStatusOkResponse;
headers: Headers;
}

export function findPetsByStatus(
Loading