Skip to content

Commit 37ff4ab

Browse files
mrlubosmrlubos
committed
fix(@tanstack/query): prettier infinite query options
1 parent 20ae597 commit 37ff4ab

File tree

62 files changed

+1165
-1176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1165
-1176
lines changed

‎.changeset/large-rings-lick.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@hey-api/openapi-ts': patch
3+
---
4+
5+
**@tanstack/query**: prettier infinite query options

‎dev/openapi-ts.config.ts‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ export default defineConfig(() => {
4141
// 'dutchie.json',
4242
// 'invalid',
4343
// 'full.yaml',
44-
// 'openai.yaml',
44+
'openai.yaml',
4545
// 'opencode.yaml',
4646
// 'sdk-instance.yaml',
4747
// 'string-with-format.yaml',
4848
// 'transformers.json',
4949
// 'type-format.yaml',
50-
'validators.yaml',
50+
// 'validators.yaml',
5151
// 'validators-circular-ref.json',
5252
// 'validators-circular-ref-2.yaml',
5353
// 'zoom-video-sdk.json',
@@ -268,7 +268,7 @@ export default defineConfig(() => {
268268
// signature: 'client',
269269
// signature: 'object',
270270
// transformer: '@hey-api/transformers',
271-
transformer: true,
271+
// transformer: true,
272272
validator: 'valibot',
273273
// validator: {
274274
// request: 'zod',
@@ -291,7 +291,7 @@ export default defineConfig(() => {
291291
{
292292
// bigInt: true,
293293
dates: true,
294-
name: '@hey-api/transformers',
294+
// name: '@hey-api/transformers',
295295
},
296296
{
297297
// name: 'fastify',
@@ -306,16 +306,21 @@ export default defineConfig(() => {
306306
// infiniteQueryKeys: {
307307
// name: '{{name}}IQK',
308308
// },
309-
// infiniteQueryOptions: {
310-
// name: '{{name}}IQO',
311-
// },
309+
infiniteQueryOptions: {
310+
meta() {
311+
return {
312+
custom: 'value',
313+
};
314+
},
315+
// name: '{{name}}IQO',
316+
},
312317
mutationOptions: {
313-
// name: '{{name}}MO',
314318
meta() {
315319
return {
316320
custom: 'value',
317321
};
318322
},
323+
// name: '{{name}}MO',
319324
},
320325
name: '@tanstack/react-query',
321326
queryKeys: {

‎packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/axios/@tanstack/angular-query-experimental.gen.ts‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,7 @@ export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOpti
289289
});
290290

291291
const createInfiniteParams = <K extends Pick<QueryKey<Options>[0], 'body' | 'headers' | 'path' | 'query'>>(queryKey: QueryKey<Options>, page: K) => {
292-
const params = {
293-
...queryKey[0]
294-
};
292+
const params = { ...queryKey[0] };
295293
if (page.body) {
296294
params.body = {
297295
...queryKey[0].body as any,
@@ -321,29 +319,27 @@ const createInfiniteParams = <K extends Pick<QueryKey<Options>[0], 'body' | 'hea
321319

322320
export const getCallWithOptionalParamInfiniteQueryKey = (options: Options<GetCallWithOptionalParamData>): QueryKey<Options<GetCallWithOptionalParamData>> => createQueryKey("getCallWithOptionalParam", options, true);
323321

324-
export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCallWithOptionalParamData>) => {
325-
return infiniteQueryOptions<unknown, AxiosError<DefaultError>, InfiniteData<unknown>, QueryKey<Options<GetCallWithOptionalParamData>>, number | Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
326-
// @ts-ignore
327-
{
328-
queryFn: async ({ pageParam, queryKey, signal }) => {
329-
// @ts-ignore
330-
const page: Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === 'object' ? pageParam : {
331-
query: {
332-
page: pageParam
333-
}
334-
};
335-
const params = createInfiniteParams(queryKey, page);
336-
const { data } = await getCallWithOptionalParam({
337-
...options,
338-
...params,
339-
signal,
340-
throwOnError: true
341-
});
342-
return data;
343-
},
344-
queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
345-
});
346-
};
322+
export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCallWithOptionalParamData>) => infiniteQueryOptions<unknown, AxiosError<DefaultError>, InfiniteData<unknown>, QueryKey<Options<GetCallWithOptionalParamData>>, number | Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
323+
// @ts-ignore
324+
{
325+
queryFn: async ({ pageParam, queryKey, signal }) => {
326+
// @ts-ignore
327+
const page: Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === "object" ? pageParam : {
328+
query: {
329+
page: pageParam
330+
}
331+
};
332+
const params = createInfiniteParams(queryKey, page);
333+
const { data } = await getCallWithOptionalParam({
334+
...options,
335+
...params,
336+
signal,
337+
throwOnError: true
338+
});
339+
return data;
340+
},
341+
queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
342+
});
347343

348344
export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
349345
const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {

‎packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/fetch/@tanstack/angular-query-experimental.gen.ts‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,7 @@ export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOpti
288288
});
289289

290290
const createInfiniteParams = <K extends Pick<QueryKey<Options>[0], 'body' | 'headers' | 'path' | 'query'>>(queryKey: QueryKey<Options>, page: K) => {
291-
const params = {
292-
...queryKey[0]
293-
};
291+
const params = { ...queryKey[0] };
294292
if (page.body) {
295293
params.body = {
296294
...queryKey[0].body as any,
@@ -320,29 +318,27 @@ const createInfiniteParams = <K extends Pick<QueryKey<Options>[0], 'body' | 'hea
320318

321319
export const getCallWithOptionalParamInfiniteQueryKey = (options: Options<GetCallWithOptionalParamData>): QueryKey<Options<GetCallWithOptionalParamData>> => createQueryKey("getCallWithOptionalParam", options, true);
322320

323-
export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCallWithOptionalParamData>) => {
324-
return infiniteQueryOptions<unknown, DefaultError, InfiniteData<unknown>, QueryKey<Options<GetCallWithOptionalParamData>>, number | Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
325-
// @ts-ignore
326-
{
327-
queryFn: async ({ pageParam, queryKey, signal }) => {
328-
// @ts-ignore
329-
const page: Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === 'object' ? pageParam : {
330-
query: {
331-
page: pageParam
332-
}
333-
};
334-
const params = createInfiniteParams(queryKey, page);
335-
const { data } = await getCallWithOptionalParam({
336-
...options,
337-
...params,
338-
signal,
339-
throwOnError: true
340-
});
341-
return data;
342-
},
343-
queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
344-
});
345-
};
321+
export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCallWithOptionalParamData>) => infiniteQueryOptions<unknown, DefaultError, InfiniteData<unknown>, QueryKey<Options<GetCallWithOptionalParamData>>, number | Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
322+
// @ts-ignore
323+
{
324+
queryFn: async ({ pageParam, queryKey, signal }) => {
325+
// @ts-ignore
326+
const page: Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === "object" ? pageParam : {
327+
query: {
328+
page: pageParam
329+
}
330+
};
331+
const params = createInfiniteParams(queryKey, page);
332+
const { data } = await getCallWithOptionalParam({
333+
...options,
334+
...params,
335+
signal,
336+
throwOnError: true
337+
});
338+
return data;
339+
},
340+
queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
341+
});
346342

347343
export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
348344
const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {

‎packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/axios/@tanstack/react-query.gen.ts‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,7 @@ export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOpti
289289
});
290290

291291
const createInfiniteParams = <K extends Pick<QueryKey<Options>[0], 'body' | 'headers' | 'path' | 'query'>>(queryKey: QueryKey<Options>, page: K) => {
292-
const params = {
293-
...queryKey[0]
294-
};
292+
const params = { ...queryKey[0] };
295293
if (page.body) {
296294
params.body = {
297295
...queryKey[0].body as any,
@@ -321,29 +319,27 @@ const createInfiniteParams = <K extends Pick<QueryKey<Options>[0], 'body' | 'hea
321319

322320
export const getCallWithOptionalParamInfiniteQueryKey = (options: Options<GetCallWithOptionalParamData>): QueryKey<Options<GetCallWithOptionalParamData>> => createQueryKey("getCallWithOptionalParam", options, true);
323321

324-
export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCallWithOptionalParamData>) => {
325-
return infiniteQueryOptions<unknown, AxiosError<DefaultError>, InfiniteData<unknown>, QueryKey<Options<GetCallWithOptionalParamData>>, number | Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
326-
// @ts-ignore
327-
{
328-
queryFn: async ({ pageParam, queryKey, signal }) => {
329-
// @ts-ignore
330-
const page: Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === 'object' ? pageParam : {
331-
query: {
332-
page: pageParam
333-
}
334-
};
335-
const params = createInfiniteParams(queryKey, page);
336-
const { data } = await getCallWithOptionalParam({
337-
...options,
338-
...params,
339-
signal,
340-
throwOnError: true
341-
});
342-
return data;
343-
},
344-
queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
345-
});
346-
};
322+
export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCallWithOptionalParamData>) => infiniteQueryOptions<unknown, AxiosError<DefaultError>, InfiniteData<unknown>, QueryKey<Options<GetCallWithOptionalParamData>>, number | Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
323+
// @ts-ignore
324+
{
325+
queryFn: async ({ pageParam, queryKey, signal }) => {
326+
// @ts-ignore
327+
const page: Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === "object" ? pageParam : {
328+
query: {
329+
page: pageParam
330+
}
331+
};
332+
const params = createInfiniteParams(queryKey, page);
333+
const { data } = await getCallWithOptionalParam({
334+
...options,
335+
...params,
336+
signal,
337+
throwOnError: true
338+
});
339+
return data;
340+
},
341+
queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
342+
});
347343

348344
export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
349345
const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {

‎packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch/@tanstack/react-query.gen.ts‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,7 @@ export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOpti
288288
});
289289

290290
const createInfiniteParams = <K extends Pick<QueryKey<Options>[0], 'body' | 'headers' | 'path' | 'query'>>(queryKey: QueryKey<Options>, page: K) => {
291-
const params = {
292-
...queryKey[0]
293-
};
291+
const params = { ...queryKey[0] };
294292
if (page.body) {
295293
params.body = {
296294
...queryKey[0].body as any,
@@ -320,29 +318,27 @@ const createInfiniteParams = <K extends Pick<QueryKey<Options>[0], 'body' | 'hea
320318

321319
export const getCallWithOptionalParamInfiniteQueryKey = (options: Options<GetCallWithOptionalParamData>): QueryKey<Options<GetCallWithOptionalParamData>> => createQueryKey("getCallWithOptionalParam", options, true);
322320

323-
export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCallWithOptionalParamData>) => {
324-
return infiniteQueryOptions<unknown, DefaultError, InfiniteData<unknown>, QueryKey<Options<GetCallWithOptionalParamData>>, number | Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
325-
// @ts-ignore
326-
{
327-
queryFn: async ({ pageParam, queryKey, signal }) => {
328-
// @ts-ignore
329-
const page: Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === 'object' ? pageParam : {
330-
query: {
331-
page: pageParam
332-
}
333-
};
334-
const params = createInfiniteParams(queryKey, page);
335-
const { data } = await getCallWithOptionalParam({
336-
...options,
337-
...params,
338-
signal,
339-
throwOnError: true
340-
});
341-
return data;
342-
},
343-
queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
344-
});
345-
};
321+
export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCallWithOptionalParamData>) => infiniteQueryOptions<unknown, DefaultError, InfiniteData<unknown>, QueryKey<Options<GetCallWithOptionalParamData>>, number | Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
322+
// @ts-ignore
323+
{
324+
queryFn: async ({ pageParam, queryKey, signal }) => {
325+
// @ts-ignore
326+
const page: Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === "object" ? pageParam : {
327+
query: {
328+
page: pageParam
329+
}
330+
};
331+
const params = createInfiniteParams(queryKey, page);
332+
const { data } = await getCallWithOptionalParam({
333+
...options,
334+
...params,
335+
signal,
336+
throwOnError: true
337+
});
338+
return data;
339+
},
340+
queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
341+
});
346342

347343
export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
348344
const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {

‎packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/axios/@tanstack/solid-query.gen.ts‎

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,7 @@ export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOpti
289289
});
290290

291291
const createInfiniteParams = <K extends Pick<QueryKey<Options>[0], 'body' | 'headers' | 'path' | 'query'>>(queryKey: QueryKey<Options>, page: K) => {
292-
const params = {
293-
...queryKey[0]
294-
};
292+
const params = { ...queryKey[0] };
295293
if (page.body) {
296294
params.body = {
297295
...queryKey[0].body as any,
@@ -321,29 +319,27 @@ const createInfiniteParams = <K extends Pick<QueryKey<Options>[0], 'body' | 'hea
321319

322320
export const getCallWithOptionalParamInfiniteQueryKey = (options: Options<GetCallWithOptionalParamData>): QueryKey<Options<GetCallWithOptionalParamData>> => createQueryKey("getCallWithOptionalParam", options, true);
323321

324-
export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCallWithOptionalParamData>) => {
325-
return infiniteQueryOptions<unknown, AxiosError<DefaultError>, InfiniteData<unknown>, QueryKey<Options<GetCallWithOptionalParamData>>, number | Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
326-
// @ts-ignore
327-
{
328-
queryFn: async ({ pageParam, queryKey, signal }) => {
329-
// @ts-ignore
330-
const page: Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === 'object' ? pageParam : {
331-
query: {
332-
page: pageParam
333-
}
334-
};
335-
const params = createInfiniteParams(queryKey, page);
336-
const { data } = await getCallWithOptionalParam({
337-
...options,
338-
...params,
339-
signal,
340-
throwOnError: true
341-
});
342-
return data;
343-
},
344-
queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
345-
});
346-
};
322+
export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCallWithOptionalParamData>) => infiniteQueryOptions<unknown, AxiosError<DefaultError>, InfiniteData<unknown>, QueryKey<Options<GetCallWithOptionalParamData>>, number | Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
323+
// @ts-ignore
324+
{
325+
queryFn: async ({ pageParam, queryKey, signal }) => {
326+
// @ts-ignore
327+
const page: Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === "object" ? pageParam : {
328+
query: {
329+
page: pageParam
330+
}
331+
};
332+
const params = createInfiniteParams(queryKey, page);
333+
const { data } = await getCallWithOptionalParam({
334+
...options,
335+
...params,
336+
signal,
337+
throwOnError: true
338+
});
339+
return data;
340+
},
341+
queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
342+
});
347343

348344
export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
349345
const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {

0 commit comments

Comments
 (0)