Skip to content

Commit a6eacf0

Browse files
mrlubosmrlubos
authored
Merge pull request #2218 from hey-api/feat/tanstack-query-api
feat(tanstack-query): add name and case options
2 parents 4d43c09 + e5ff024 commit a6eacf0

File tree

23 files changed

+1588
-426
lines changed

23 files changed

+1588
-426
lines changed

‎.changeset/polite-pots-watch.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
'@hey-api/openapi-ts': minor
3+
---
4+
5+
feat(tanstack-query): add name and case options
6+
7+
### Updated TanStack Query options
8+
9+
The TanStack Query plugin options have been expanded to support more naming and casing patterns. As a result, the following options have been renamed.
10+
11+
- `queryOptionsNameBuilder` renamed to `queryOptions`
12+
- `infiniteQueryOptionsNameBuilder` renamed to `infiniteQueryOptions`
13+
- `mutationOptionsNameBuilder` renamed to `mutationOptions`
14+
- `queryKeyNameBuilder` renamed to `queryKeys`
15+
- `infiniteQueryKeyNameBuilder` renamed to `infiniteQueryKeys`

‎docs/openapi-ts/migrating.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,16 @@ This config option is deprecated and will be removed.
2929

3030
## v0.75.0
3131

32+
### Updated TanStack Query options
33+
34+
The TanStack Query plugin options have been expanded to support more naming and casing patterns. As a result, the following options have been renamed.
35+
36+
- `queryOptionsNameBuilder` renamed to `queryOptions`
37+
- `infiniteQueryOptionsNameBuilder` renamed to `infiniteQueryOptions`
38+
- `mutationOptionsNameBuilder` renamed to `mutationOptions`
39+
- `queryKeyNameBuilder` renamed to `queryKeys`
40+
- `infiniteQueryKeyNameBuilder` renamed to `infiniteQueryKeys`
41+
3242
### Added `plugin.forEach()` method
3343

3444
This method replaces the `.subscribe()` method. Additionally, `.forEach()` is executed immediately, which means we don't need the `before` and `after` events – simply move your code before and after the `.forEach()` block.

‎docs/openapi-ts/plugins/tanstack-query.md

Lines changed: 54 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -37,65 +37,55 @@ In your [configuration](/openapi-ts/get-started), add TanStack Query to your plu
3737
::: code-group
3838

3939
```js [react]
40-
import { defaultPlugins } from '@hey-api/openapi-ts';
41-
4240
export default {
4341
input: 'https://get.heyapi.dev/hey-api/backend',
4442
output: 'src/client',
4543
plugins: [
46-
...defaultPlugins,
44+
// ...other plugins
4745
'@tanstack/react-query', // [!code ++]
4846
],
4947
};
5048
```
5149

5250
```js [vue]
53-
import { defaultPlugins } from '@hey-api/openapi-ts';
54-
5551
export default {
5652
input: 'https://get.heyapi.dev/hey-api/backend',
5753
output: 'src/client',
5854
plugins: [
59-
...defaultPlugins,
55+
// ...other plugins
6056
'@tanstack/vue-query', // [!code ++]
6157
],
6258
};
6359
```
6460

6561
```js [angular]
66-
import { defaultPlugins } from '@hey-api/openapi-ts';
67-
6862
export default {
6963
input: 'https://get.heyapi.dev/hey-api/backend',
7064
output: 'src/client',
7165
plugins: [
72-
...defaultPlugins,
66+
// ...other plugins
7367
'@tanstack/angular-query-experimental', // [!code ++]
7468
],
7569
};
7670
```
7771

7872
```js [svelte]
79-
import { defaultPlugins } from '@hey-api/openapi-ts';
80-
8173
export default {
8274
input: 'https://get.heyapi.dev/hey-api/backend',
8375
output: 'src/client',
8476
plugins: [
85-
...defaultPlugins,
77+
// ...other plugins
8678
'@tanstack/svelte-query', // [!code ++]
8779
],
8880
};
8981
```
9082

9183
```js [solid]
92-
import { defaultPlugins } from '@hey-api/openapi-ts';
93-
9484
export default {
9585
input: 'https://get.heyapi.dev/hey-api/backend',
9686
output: 'src/client',
9787
plugins: [
98-
...defaultPlugins,
88+
// ...other plugins
9989
'@tanstack/solid-query', // [!code ++]
10090
],
10191
};
@@ -121,7 +111,31 @@ const { data, error } = useQuery({
121111
});
122112
```
123113

124-
You can customize query function names using `queryOptionsNameBuilder`.
114+
You can customize the naming and casing pattern for query options functions using the `queryOptions.name` and `queryOptions.case` options.
115+
116+
## Query Keys
117+
118+
If you have access to the result of query options function, you can get the query key from the `queryKey` field.
119+
120+
```ts
121+
const { queryKey } = getPetByIdOptions({
122+
path: {
123+
petId: 1,
124+
},
125+
});
126+
```
127+
128+
Alternatively, you can access the same query key by calling query key functions. The generated query key functions follow the naming convention of SDK functions and by default append `QueryKey`, e.g. `getPetByIdQueryKey()`.
129+
130+
```ts
131+
const queryKey = getPetByIdQueryKey({
132+
path: {
133+
petId: 1,
134+
},
135+
});
136+
```
137+
138+
You can customize the naming and casing pattern for query key functions using the `queryKeys.name` and `queryKeys.case` options.
125139

126140
## Infinite Queries
127141

@@ -139,52 +153,52 @@ const { data, error } = useInfiniteQuery({
139153
});
140154
```
141155

142-
You can customize infinite query function names using `infiniteQueryOptionsNameBuilder`.
156+
You can customize the naming and casing pattern for infinite query options functions using the `infiniteQueryOptions.name` and `infiniteQueryOptions.case` options.
143157

144-
## Mutations
158+
## Infinite Query Keys
145159

146-
Mutations are generated from DELETE, PATCH, POST, and PUT endpoints. The generated mutation functions follow the naming convention of SDK functions and by default append `Mutation`, e.g. `addPetMutation()`.
160+
If you have access to the result of infinite query options function, you can get the query key from the `queryKey` field.
147161

148162
```ts
149-
const addPet = useMutation({
150-
...addPetMutation(),
151-
onError: (error) => {
152-
console.log(error);
153-
},
154-
});
155-
156-
addPet.mutate({
157-
body: {
158-
name: 'Kitty',
163+
const { queryKey } = getPetByIdInfiniteOptions({
164+
path: {
165+
petId: 1,
159166
},
160167
});
161168
```
162169

163-
You can customize mutation function names using `mutationOptionsNameBuilder`.
164-
165-
## Query Keys
166-
167-
Query keys are generated for both queries and infinite queries. If you have access to the result of query or infinite query options function, you can get the query key from the `queryKey` field.
170+
Alternatively, you can access the same query key by calling query key functions. The generated query key functions follow the naming convention of SDK functions and by default append `InfiniteQueryKey`, e.g. `getPetByIdInfiniteQueryKey()`.
168171

169172
```ts
170-
const { queryKey } = getPetByIdOptions({
173+
const queryKey = getPetByIdInfiniteQueryKey({
171174
path: {
172175
petId: 1,
173176
},
174177
});
175178
```
176179

177-
Alternatively, you can access the same query key by calling query key functions. The generated query key functions follow the naming convention of SDK functions and by default append `QueryKey` or `InfiniteQueryKey`, e.g. `getPetByIdQueryKey()` or `getPetByIdInfiniteQueryKey()`.
180+
You can customize the naming and casing pattern for infinite query key functions using the `infiniteQueryKeys.name` and `infiniteQueryKeys.case` options.
181+
182+
## Mutations
183+
184+
Mutations are generated from DELETE, PATCH, POST, and PUT endpoints. The generated mutation functions follow the naming convention of SDK functions and by default append `Mutation`, e.g. `addPetMutation()`.
178185

179186
```ts
180-
const queryKey = getPetByIdQueryKey({
181-
path: {
182-
petId: 1,
187+
const addPet = useMutation({
188+
...addPetMutation(),
189+
onError: (error) => {
190+
console.log(error);
191+
},
192+
});
193+
194+
addPet.mutate({
195+
body: {
196+
name: 'Kitty',
183197
},
184198
});
185199
```
186200

187-
You can customize query key function names using `queryKeyNameBuilder` and `infiniteQueryKeyNameBuilder`.
201+
You can customize the naming and casing pattern for mutation options functions using the `mutationOptions.name` and `mutationOptions.case` options.
188202

189203
<!--@include: ../../examples.md-->
190204
<!--@include: ../../sponsors.md-->

‎packages/openapi-ts-tests/test/openapi-ts.config.ts

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ export default defineConfig(() => {
6060
// 'invalid',
6161
// 'servers-entry.yaml',
6262
// ),
63-
// path: path.resolve(__dirname, 'spec', '3.1.x', 'validators.yaml'),
64-
path: path.resolve(__dirname, 'spec', 'v3-transforms.json'),
63+
path: path.resolve(__dirname, 'spec', '3.1.x', 'full.yaml'),
64+
// path: path.resolve(__dirname, 'spec', 'v3-transforms.json'),
6565
// path: 'http://localhost:4000/',
6666
// path: 'https://get.heyapi.dev/',
6767
// path: 'https://get.heyapi.dev/hey-api/backend?branch=main&version=1.0.0',
@@ -150,13 +150,25 @@ export default defineConfig(() => {
150150
// name: 'fastify',
151151
},
152152
{
153+
// case: 'SCREAMING_SNAKE_CASE',
154+
// comments: false,
153155
exportFromIndex: true,
154-
infiniteQueryKeyNameBuilder: '{{name}}IQK',
155-
infiniteQueryOptionsNameBuilder: '{{name}}InfiniteQuery',
156-
mutationOptionsNameBuilder: '{{name}}MutationOptions',
157-
// name: '@tanstack/react-query',
158-
queryKeyNameBuilder: '{{name}}QK',
159-
queryOptionsNameBuilder: '{{name}}Query',
156+
// infiniteQueryKeys: {
157+
// name: '{{name}}IQK',
158+
// },
159+
// infiniteQueryOptions: {
160+
// name: '{{name}}IQO',
161+
// },
162+
// mutationOptions: {
163+
// name: '{{name}}MO',
164+
// },
165+
name: '@tanstack/react-query',
166+
// queryKeys: {
167+
// name: '{{name}}QK',
168+
// },
169+
// queryOptions: {
170+
// name: '{{name}}QO',
171+
// },
160172
},
161173
{
162174
// comments: false,

‎packages/openapi-ts-tests/test/plugins.test.ts

Lines changed: 75 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,22 @@ for (const version of versions) {
220220
output: 'name-builder',
221221
plugins: [
222222
{
223-
infiniteQueryKeyNameBuilder: '{{name}}A',
224-
infiniteQueryOptionsNameBuilder: '{{name}}B',
225-
mutationOptionsNameBuilder: '{{name}}C',
223+
infiniteQueryKeys: {
224+
name: '{{name}}A',
225+
},
226+
infiniteQueryOptions: {
227+
name: '{{name}}B',
228+
},
229+
mutationOptions: {
230+
name: '{{name}}C',
231+
},
226232
name: '@tanstack/angular-query-experimental',
227-
queryKeyNameBuilder: '{{name}}D',
228-
queryOptionsNameBuilder: '{{name}}E',
233+
queryKeys: {
234+
name: '{{name}}D',
235+
},
236+
queryOptions: {
237+
name: '{{name}}E',
238+
},
229239
},
230240
'@hey-api/client-fetch',
231241
'@hey-api/sdk',
@@ -240,12 +250,22 @@ for (const version of versions) {
240250
output: 'name-builder',
241251
plugins: [
242252
{
243-
infiniteQueryKeyNameBuilder: '{{name}}A',
244-
infiniteQueryOptionsNameBuilder: '{{name}}B',
245-
mutationOptionsNameBuilder: '{{name}}C',
253+
infiniteQueryKeys: {
254+
name: '{{name}}A',
255+
},
256+
infiniteQueryOptions: {
257+
name: '{{name}}B',
258+
},
259+
mutationOptions: {
260+
name: '{{name}}C',
261+
},
246262
name: '@tanstack/react-query',
247-
queryKeyNameBuilder: '{{name}}D',
248-
queryOptionsNameBuilder: '{{name}}E',
263+
queryKeys: {
264+
name: '{{name}}D',
265+
},
266+
queryOptions: {
267+
name: '{{name}}E',
268+
},
249269
},
250270
'@hey-api/client-fetch',
251271
'@hey-api/sdk',
@@ -260,12 +280,22 @@ for (const version of versions) {
260280
output: 'name-builder',
261281
plugins: [
262282
{
263-
infiniteQueryKeyNameBuilder: '{{name}}A',
264-
infiniteQueryOptionsNameBuilder: '{{name}}B',
265-
mutationOptionsNameBuilder: '{{name}}C',
283+
infiniteQueryKeys: {
284+
name: '{{name}}A',
285+
},
286+
infiniteQueryOptions: {
287+
name: '{{name}}B',
288+
},
289+
mutationOptions: {
290+
name: '{{name}}C',
291+
},
266292
name: '@tanstack/solid-query',
267-
queryKeyNameBuilder: '{{name}}D',
268-
queryOptionsNameBuilder: '{{name}}E',
293+
queryKeys: {
294+
name: '{{name}}D',
295+
},
296+
queryOptions: {
297+
name: '{{name}}E',
298+
},
269299
},
270300
'@hey-api/client-fetch',
271301
'@hey-api/sdk',
@@ -280,12 +310,22 @@ for (const version of versions) {
280310
output: 'name-builder',
281311
plugins: [
282312
{
283-
infiniteQueryKeyNameBuilder: '{{name}}A',
284-
infiniteQueryOptionsNameBuilder: '{{name}}B',
285-
mutationOptionsNameBuilder: '{{name}}C',
313+
infiniteQueryKeys: {
314+
name: '{{name}}A',
315+
},
316+
infiniteQueryOptions: {
317+
name: '{{name}}B',
318+
},
319+
mutationOptions: {
320+
name: '{{name}}C',
321+
},
286322
name: '@tanstack/svelte-query',
287-
queryKeyNameBuilder: '{{name}}D',
288-
queryOptionsNameBuilder: '{{name}}E',
323+
queryKeys: {
324+
name: '{{name}}D',
325+
},
326+
queryOptions: {
327+
name: '{{name}}E',
328+
},
289329
},
290330
'@hey-api/client-fetch',
291331
'@hey-api/sdk',
@@ -300,12 +340,22 @@ for (const version of versions) {
300340
output: 'name-builder',
301341
plugins: [
302342
{
303-
infiniteQueryKeyNameBuilder: '{{name}}A',
304-
infiniteQueryOptionsNameBuilder: '{{name}}B',
305-
mutationOptionsNameBuilder: '{{name}}C',
343+
infiniteQueryKeys: {
344+
name: '{{name}}A',
345+
},
346+
infiniteQueryOptions: {
347+
name: '{{name}}B',
348+
},
349+
mutationOptions: {
350+
name: '{{name}}C',
351+
},
306352
name: '@tanstack/vue-query',
307-
queryKeyNameBuilder: '{{name}}D',
308-
queryOptionsNameBuilder: '{{name}}E',
353+
queryKeys: {
354+
name: '{{name}}D',
355+
},
356+
queryOptions: {
357+
name: '{{name}}E',
358+
},
309359
},
310360
'@hey-api/client-fetch',
311361
'@hey-api/sdk',

0 commit comments

Comments
 (0)