Skip to content

Commit 16f8956

Browse files
mrlubosmrlubos
committed
fix: rename infinite key in query key to _infinite
1 parent 34f216f commit 16f8956

File tree

19 files changed

+79
-75
lines changed

19 files changed

+79
-75
lines changed

‎.changeset/blue-carrots-juggle.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+
fix: rename infinite key in query key to \_infinite

‎packages/openapi-ts/src/plugins/@tanstack/query-core/plugin.ts

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ const createQueryKeyFunction = ({ file }: { file: Files[keyof Files] }) => {
7777
]),
7878
});
7979

80+
const infiniteIdentifier = compiler.identifier({ text: 'infinite' });
81+
8082
const fn = compiler.constVariable({
8183
expression: compiler.arrowFunction({
8284
multiLine: true,
@@ -119,16 +121,16 @@ const createQueryKeyFunction = ({ file }: { file: Files[keyof Files] }) => {
119121
typeName: returnType,
120122
}),
121123
compiler.ifStatement({
122-
expression: compiler.identifier({ text: 'infinite' }),
124+
expression: infiniteIdentifier,
123125
thenStatement: ts.factory.createBlock(
124126
[
125127
compiler.expressionToStatement({
126128
expression: compiler.binaryExpression({
127129
left: compiler.propertyAccessExpression({
128130
expression: 'params',
129-
name: 'infinite',
131+
name: '_infinite',
130132
}),
131-
right: compiler.identifier({ text: 'infinite' }),
133+
right: infiniteIdentifier,
132134
}),
133135
}),
134136
],
@@ -261,7 +263,7 @@ const createQueryKeyType = ({ file }: { file: Files[keyof Files] }) => {
261263
},
262264
{
263265
isRequired: false,
264-
name: 'infinite',
266+
name: '_infinite',
265267
type: compiler.keywordTypeNode({
266268
keyword: 'boolean',
267269
}),
@@ -795,6 +797,9 @@ export const handler: PluginDefinition['handler'] = ({
795797
{
796798
spread: 'options',
797799
},
800+
{
801+
spread: 'queryKey[0]',
802+
},
798803
{
799804
key: 'body',
800805
value: compiler.objectExpression({
@@ -853,12 +858,6 @@ export const handler: PluginDefinition['handler'] = ({
853858
],
854859
}),
855860
},
856-
{
857-
key: getClientBaseUrlKey(),
858-
value: compiler.identifier({
859-
text: `client.getConfig().${getClientBaseUrlKey()}`,
860-
}),
861-
},
862861
{
863862
key: 'throwOnError',
864863
value: true,

‎packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-react-query/@tanstack/react-query.gen.ts.snap

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import type { AxiosError } from 'axios';
99
type QueryKey<TOptions extends Options> = [
1010
Pick<TOptions, 'baseURL' | 'body' | 'headers' | 'path' | 'query'> & {
1111
_id: string;
12-
infinite?: boolean;
12+
_infinite?: boolean;
1313
}
1414
];
1515

1616
const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
1717
const params: QueryKey<TOptions>[0] = { _id: id, baseURL: client.getConfig().baseURL } as QueryKey<TOptions>[0];
1818
if (infinite) {
19-
params.infinite = infinite;
19+
params._infinite = infinite;
2020
}
2121
if (options?.body) {
2222
params.body = options.body;
@@ -237,6 +237,7 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
237237
};
238238
const { data } = await callWithParameters({
239239
...options,
240+
...queryKey[0],
240241
body: {
241242
...queryKey[0].body as any,
242243
...page.body as any
@@ -253,7 +254,6 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
253254
...queryKey[0].query,
254255
...page.query
255256
},
256-
baseURL: client.getConfig().baseURL,
257257
throwOnError: true
258258
});
259259
return data;
@@ -323,6 +323,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
323323
};
324324
const { data } = await getCallWithOptionalParam({
325325
...options,
326+
...queryKey[0],
326327
body: {
327328
...queryKey[0].body as any,
328329
...page.body as any
@@ -339,7 +340,6 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
339340
...queryKey[0].query,
340341
...page.query
341342
},
342-
baseURL: client.getConfig().baseURL,
343343
throwOnError: true
344344
});
345345
return data;
@@ -375,6 +375,7 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
375375
};
376376
const { data } = await postCallWithOptionalParam({
377377
...options,
378+
...queryKey[0],
378379
body: {
379380
...queryKey[0].body as any,
380381
...page.body as any
@@ -391,7 +392,6 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
391392
...queryKey[0].query,
392393
...page.query
393394
},
394-
baseURL: client.getConfig().baseURL,
395395
throwOnError: true
396396
});
397397
return data;

‎packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-react-query_transform/@tanstack/react-query.gen.ts.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import { client, parentModelWithDates, modelWithDates, modelWithDatesArray, arra
99
type QueryKey<TOptions extends Options> = [
1010
Pick<TOptions, 'baseURL' | 'body' | 'headers' | 'path' | 'query'> & {
1111
_id: string;
12-
infinite?: boolean;
12+
_infinite?: boolean;
1313
}
1414
];
1515

1616
const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
1717
const params: QueryKey<TOptions>[0] = { _id: id, baseURL: client.getConfig().baseURL } as QueryKey<TOptions>[0];
1818
if (infinite) {
19-
params.infinite = infinite;
19+
params._infinite = infinite;
2020
}
2121
if (options?.body) {
2222
params.body = options.body;

‎packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-solid-query/@tanstack/solid-query.gen.ts.snap

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import type { AxiosError } from 'axios';
99
type QueryKey<TOptions extends Options> = [
1010
Pick<TOptions, 'baseURL' | 'body' | 'headers' | 'path' | 'query'> & {
1111
_id: string;
12-
infinite?: boolean;
12+
_infinite?: boolean;
1313
}
1414
];
1515

1616
const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
1717
const params: QueryKey<TOptions>[0] = { _id: id, baseURL: client.getConfig().baseURL } as QueryKey<TOptions>[0];
1818
if (infinite) {
19-
params.infinite = infinite;
19+
params._infinite = infinite;
2020
}
2121
if (options?.body) {
2222
params.body = options.body;
@@ -237,6 +237,7 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
237237
};
238238
const { data } = await callWithParameters({
239239
...options,
240+
...queryKey[0],
240241
body: {
241242
...queryKey[0].body as any,
242243
...page.body as any
@@ -253,7 +254,6 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
253254
...queryKey[0].query,
254255
...page.query
255256
},
256-
baseURL: client.getConfig().baseURL,
257257
throwOnError: true
258258
});
259259
return data;
@@ -323,6 +323,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
323323
};
324324
const { data } = await getCallWithOptionalParam({
325325
...options,
326+
...queryKey[0],
326327
body: {
327328
...queryKey[0].body as any,
328329
...page.body as any
@@ -339,7 +340,6 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
339340
...queryKey[0].query,
340341
...page.query
341342
},
342-
baseURL: client.getConfig().baseURL,
343343
throwOnError: true
344344
});
345345
return data;
@@ -375,6 +375,7 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
375375
};
376376
const { data } = await postCallWithOptionalParam({
377377
...options,
378+
...queryKey[0],
378379
body: {
379380
...queryKey[0].body as any,
380381
...page.body as any
@@ -391,7 +392,6 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
391392
...queryKey[0].query,
392393
...page.query
393394
},
394-
baseURL: client.getConfig().baseURL,
395395
throwOnError: true
396396
});
397397
return data;

‎packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-solid-query_transform/@tanstack/solid-query.gen.ts.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import { client, parentModelWithDates, modelWithDates, modelWithDatesArray, arra
99
type QueryKey<TOptions extends Options> = [
1010
Pick<TOptions, 'baseURL' | 'body' | 'headers' | 'path' | 'query'> & {
1111
_id: string;
12-
infinite?: boolean;
12+
_infinite?: boolean;
1313
}
1414
];
1515

1616
const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
1717
const params: QueryKey<TOptions>[0] = { _id: id, baseURL: client.getConfig().baseURL } as QueryKey<TOptions>[0];
1818
if (infinite) {
19-
params.infinite = infinite;
19+
params._infinite = infinite;
2020
}
2121
if (options?.body) {
2222
params.body = options.body;

‎packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-svelte-query/@tanstack/svelte-query.gen.ts.snap

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import type { AxiosError } from 'axios';
99
type QueryKey<TOptions extends Options> = [
1010
Pick<TOptions, 'baseURL' | 'body' | 'headers' | 'path' | 'query'> & {
1111
_id: string;
12-
infinite?: boolean;
12+
_infinite?: boolean;
1313
}
1414
];
1515

1616
const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
1717
const params: QueryKey<TOptions>[0] = { _id: id, baseURL: client.getConfig().baseURL } as QueryKey<TOptions>[0];
1818
if (infinite) {
19-
params.infinite = infinite;
19+
params._infinite = infinite;
2020
}
2121
if (options?.body) {
2222
params.body = options.body;
@@ -237,6 +237,7 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
237237
};
238238
const { data } = await callWithParameters({
239239
...options,
240+
...queryKey[0],
240241
body: {
241242
...queryKey[0].body as any,
242243
...page.body as any
@@ -253,7 +254,6 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
253254
...queryKey[0].query,
254255
...page.query
255256
},
256-
baseURL: client.getConfig().baseURL,
257257
throwOnError: true
258258
});
259259
return data;
@@ -323,6 +323,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
323323
};
324324
const { data } = await getCallWithOptionalParam({
325325
...options,
326+
...queryKey[0],
326327
body: {
327328
...queryKey[0].body as any,
328329
...page.body as any
@@ -339,7 +340,6 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
339340
...queryKey[0].query,
340341
...page.query
341342
},
342-
baseURL: client.getConfig().baseURL,
343343
throwOnError: true
344344
});
345345
return data;
@@ -375,6 +375,7 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
375375
};
376376
const { data } = await postCallWithOptionalParam({
377377
...options,
378+
...queryKey[0],
378379
body: {
379380
...queryKey[0].body as any,
380381
...page.body as any
@@ -391,7 +392,6 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
391392
...queryKey[0].query,
392393
...page.query
393394
},
394-
baseURL: client.getConfig().baseURL,
395395
throwOnError: true
396396
});
397397
return data;

‎packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-svelte-query_transform/@tanstack/svelte-query.gen.ts.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import { client, parentModelWithDates, modelWithDates, modelWithDatesArray, arra
99
type QueryKey<TOptions extends Options> = [
1010
Pick<TOptions, 'baseURL' | 'body' | 'headers' | 'path' | 'query'> & {
1111
_id: string;
12-
infinite?: boolean;
12+
_infinite?: boolean;
1313
}
1414
];
1515

1616
const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
1717
const params: QueryKey<TOptions>[0] = { _id: id, baseURL: client.getConfig().baseURL } as QueryKey<TOptions>[0];
1818
if (infinite) {
19-
params.infinite = infinite;
19+
params._infinite = infinite;
2020
}
2121
if (options?.body) {
2222
params.body = options.body;

‎packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-vue-query/@tanstack/vue-query.gen.ts.snap

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import type { AxiosError } from 'axios';
99
type QueryKey<TOptions extends Options> = [
1010
Pick<TOptions, 'baseURL' | 'body' | 'headers' | 'path' | 'query'> & {
1111
_id: string;
12-
infinite?: boolean;
12+
_infinite?: boolean;
1313
}
1414
];
1515

1616
const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
1717
const params: QueryKey<TOptions>[0] = { _id: id, baseURL: client.getConfig().baseURL } as QueryKey<TOptions>[0];
1818
if (infinite) {
19-
params.infinite = infinite;
19+
params._infinite = infinite;
2020
}
2121
if (options?.body) {
2222
params.body = options.body;
@@ -237,6 +237,7 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
237237
};
238238
const { data } = await callWithParameters({
239239
...options,
240+
...queryKey[0],
240241
body: {
241242
...queryKey[0].body as any,
242243
...page.body as any
@@ -253,7 +254,6 @@ export const callWithParametersInfiniteOptions = (options: Options<CallWithParam
253254
...queryKey[0].query,
254255
...page.query
255256
},
256-
baseURL: client.getConfig().baseURL,
257257
throwOnError: true
258258
});
259259
return data;
@@ -323,6 +323,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
323323
};
324324
const { data } = await getCallWithOptionalParam({
325325
...options,
326+
...queryKey[0],
326327
body: {
327328
...queryKey[0].body as any,
328329
...page.body as any
@@ -339,7 +340,6 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
339340
...queryKey[0].query,
340341
...page.query
341342
},
342-
baseURL: client.getConfig().baseURL,
343343
throwOnError: true
344344
});
345345
return data;
@@ -375,6 +375,7 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
375375
};
376376
const { data } = await postCallWithOptionalParam({
377377
...options,
378+
...queryKey[0],
378379
body: {
379380
...queryKey[0].body as any,
380381
...page.body as any
@@ -391,7 +392,6 @@ export const postCallWithOptionalParamInfiniteOptions = (options: Options<PostCa
391392
...queryKey[0].query,
392393
...page.query
393394
},
394-
baseURL: client.getConfig().baseURL,
395395
throwOnError: true
396396
});
397397
return data;

‎packages/openapi-ts/test/__snapshots__/test/generated/v3-hey-api-client-axios-plugin-tanstack-vue-query_transform/@tanstack/vue-query.gen.ts.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import { client, parentModelWithDates, modelWithDates, modelWithDatesArray, arra
99
type QueryKey<TOptions extends Options> = [
1010
Pick<TOptions, 'baseURL' | 'body' | 'headers' | 'path' | 'query'> & {
1111
_id: string;
12-
infinite?: boolean;
12+
_infinite?: boolean;
1313
}
1414
];
1515

1616
const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean): QueryKey<TOptions>[0] => {
1717
const params: QueryKey<TOptions>[0] = { _id: id, baseURL: client.getConfig().baseURL } as QueryKey<TOptions>[0];
1818
if (infinite) {
19-
params.infinite = infinite;
19+
params._infinite = infinite;
2020
}
2121
if (options?.body) {
2222
params.body = options.body;

0 commit comments

Comments
 (0)