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

Feat/1195 object style params #1358

Merged
merged 6 commits into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
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
10 changes: 10 additions & 0 deletions .changeset/quiet-parrots-cry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
"@kubb/plugin-svelte-query": minor
"@kubb/plugin-react-query": minor
"@kubb/plugin-solid-query": minor
"@kubb/plugin-vue-query": minor
"@kubb/plugin-client": minor
"@kubb/plugin-swr": minor
---

`paramsType` to change the amount of parameters when calling a query
7 changes: 7 additions & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ title: Changelog

# Changelog

## 3.0.0-beta.10
- [`plugin-react-query`](/plugins/plugin-react-query/): `paramsType` with options `'inline'` and `'object'` to have control over the amount of parameters when calling one of the generated functions.
- [`plugin-svelte-query`](/plugins/plugin-svelte-query/): `paramsType` with options `'inline'` and `'object'` to have control over the amount of parameters when calling one of the generated functions.
- [`plugin-vue-query`](/plugins/plugin-vue-query/): `paramsType` with options `'inline'` and `'object'` to have control over the amount of parameters when calling one of the generated functions.
- [`plugin-solid-query`](/plugins/plugin-solid-query/): `paramsType` with options `'inline'` and `'object'` to have control over the amount of parameters when calling one of the generated functions.
- [`plugin-client`](/plugins/plugin-client/): `paramsType` with options `'inline'` and `'object'` to have control over the amount of parameters when calling one of the generated functions.

## 3.0.0-beta.9
- [`plugin-msw`](/plugins/plugin-msw): `parser` option to disable faker generation
- `'faker'` will use `@kubb/plugin-faker` to generate the data for the response
Expand Down
3 changes: 3 additions & 0 deletions docs/migration-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ See [Filter And Sort](/knowledge-base/filter-and-sort).
- `client.importPath` becomes `importPath`
- `operations` will control the creation of a file with all operations grouped by methods.
- `parser` will make it possible to chose between using no parser(`client`) or using Zod(`zod`).
- `paramsType` will make it possible to have one object to pass your pathParams, params, headers and data.

### @kubb/plugin-ts
- `enumType` `'asPascalConst'` has been removed as an option.
Expand All @@ -349,6 +350,7 @@ See [Filter And Sort](/knowledge-base/filter-and-sort).
- `mutation.key` same as in `@kubb/plugin-react-query`
- `mutation.methods` same as in `@kubb/plugin-react-query`
- `mutation.importPath` same as in `@kubb/plugin-react-query`
- `paramsType` will make it possible to have one object to pass your pathParams, params, headers and data.

### @kubb/plugin-react-query
- `dataReturnType` becomes `client.dataReturnType`
Expand All @@ -363,6 +365,7 @@ See [Filter And Sort](/knowledge-base/filter-and-sort).
- `enabled` will be generated based on which params are required
- Support for `signal`, this makes it possible to cancel a request
- Removal of `mutate.variablesType` and use `'mutate'` as default
- `paramsType` will make it possible to have one object to pass your pathParams, params, headers and data.

### @kubb/plugin-msw
- `parser` to switch between using Faker(`'faker'`) for your data or define your own data with `'data'`.
Expand Down
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@shikijs/vitepress-twoslash": "^1.22.2",
"mermaid": "^11.3.0",
"sitemap": "^8.0.0",
"vitepress": "^1.4.1",
"vitepress": "^1.4.2",
"vitepress-plugin-group-icons": "^1.3.0",
"vue": "^3.5.12"
},
Expand All @@ -44,7 +44,7 @@
"@kubb/plugin-zod": "workspace:*",
"@kubb/react": "workspace:*",
"@mermaid-js/mermaid-cli": "^11.2.1",
"@types/node": "^20.17.1",
"@types/node": "^20.17.3",
"@types/react": "^18.3.12",
"cross-env": "^7.0.3",
"react": "^18.3.1",
Expand Down
3 changes: 3 additions & 0 deletions docs/plugins/plugin-client/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ Create `operations.ts` file with all operations grouped by methods.
### dataReturnType
<!--@include: ../plugin-client/dataReturnType.md-->

### paramsType
<!--@include: ../plugin-client/pathParamsType.md-->

### pathParamsType
<!--@include: ../plugin-client/pathParamsType.md-->

Expand Down
41 changes: 41 additions & 0 deletions docs/plugins/plugin-client/paramsType.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
How to pass your params.

| | |
|----------:|:-----------------------|
| Type: | `'object' \| 'inline'` |
| Required: | `false` |
| Default: | `'inline'` |


> [!TIP]
> When `paramsType` is set to `'object'`, `pathParams` will also be set to `'object'`.

- `'object'` will return the params and pathParams as an object.
- `'inline'` will return the params as comma separated params.

::: code-group
```typescript ['object']
export async function deletePet(
{
petId,
headers,
}: {
petId: DeletePetPathParams['petId']
headers?: DeletePetHeaderParams
},
config: Partial<RequestConfig> = {},
) {
...
}
```

```typescript ['inline']
export async function deletePet(
petId: DeletePetPathParams['petId'],
headers?: DeletePetHeaderParams,
config: Partial<RequestConfig> = {}
){
...
}
```
:::
10 changes: 5 additions & 5 deletions docs/plugins/plugin-client/pathParamsType.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ How to pass your pathParams.
|----------:|:-----------------------|
| Type: | `'object' \| 'inline'` |
| Required: | `false` |
| Default: | `'data'` |
| Default: | `'inline'` |


- `'object'` will return the pathParams as an object.
- `'inline'` will return the pathParams as comma separated params.

::: code-group
```typescript ['object']
export async function getPetById<TData>(
export async function getPetById (
{ petId }: GetPetByIdPathParams,
): Promise<ResponseConfig<TData>> {
) {
...
}
```

```typescript ['inline']
export async function getPetById<TData>(
export async function getPetById(
petId: GetPetByIdPathParams,
): Promise<ResponseConfig<TData>> {
) {
...
}
```
Expand Down
3 changes: 3 additions & 0 deletions docs/plugins/plugin-react-query/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,9 @@ Return the name of a group based on the group name, this will be used for the fi
#### client.dataReturnType
<!--@include: ../plugin-client/dataReturnType.md-->

### paramsType
<!--@include: ../plugin-client/pathParamsType.md-->

### pathParamsType
<!--@include: ../plugin-client/pathParamsType.md-->

Expand Down
3 changes: 3 additions & 0 deletions docs/plugins/plugin-solid-query/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ Return the name of a group based on the group name, this will be used for the fi
#### client.dataReturnType
<!--@include: ../plugin-client/dataReturnType.md-->

### paramsType
<!--@include: ../plugin-client/pathParamsType.md-->

### pathParamsType
<!--@include: ../plugin-client/pathParamsType.md-->

Expand Down
3 changes: 3 additions & 0 deletions docs/plugins/plugin-svelte-query/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ Return the name of a group based on the group name, this will be used for the fi
#### client.dataReturnType
<!--@include: ../plugin-client/dataReturnType.md-->

### paramsType
<!--@include: ../plugin-client/pathParamsType.md-->

### pathParamsType
<!--@include: ../plugin-client/pathParamsType.md-->

Expand Down
3 changes: 3 additions & 0 deletions docs/plugins/plugin-swr/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ Return the name of a group based on the group name, this will be used for the fi
#### client.dataReturnType
<!--@include: ../plugin-client/dataReturnType.md-->

### paramsType
<!--@include: ../plugin-client/pathParamsType.md-->

### pathParamsType
<!--@include: ../plugin-client/pathParamsType.md-->

Expand Down
3 changes: 3 additions & 0 deletions docs/plugins/plugin-vue-query/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ Return the name of a group based on the group name, this will be used for the fi
#### client.dataReturnType
<!--@include: ../plugin-client/dataReturnType.md-->

### paramsType
<!--@include: ../plugin-client/pathParamsType.md-->

### pathParamsType
<!--@include: ../plugin-client/pathParamsType.md-->

Expand Down
2 changes: 1 addition & 1 deletion e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@tanstack/svelte-query": "^5.59.16",
"@tanstack/vue-query": "^5.59.16",
"axios": "^1.7.7",
"msw": "^2.5.2",
"msw": "^2.6.0",
"react": "^18.3.1",
"solid-js": "^1.9.3",
"svelte": "^3.59.2",
Expand Down
4 changes: 3 additions & 1 deletion examples/advanced/configs/kubb.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export default defineConfig(() => {
},
infinite: false,
suspense: false,

paramsType: 'object',
parser: 'zod',
}),
pluginSwr({
Expand All @@ -111,6 +111,7 @@ export default defineConfig(() => {
importPath: '../../../../swr-client.ts',
dataReturnType: 'data',
},
paramsType: 'object',
parser: 'zod',
transformers: {
name(name, type) {
Expand All @@ -132,6 +133,7 @@ export default defineConfig(() => {
importPath: '../../../../axios-client.ts',
operations: true,
dataReturnType: 'full',
paramsType: 'object',
pathParamsType: 'object',
}),
pluginZod({
Expand Down
2 changes: 1 addition & 1 deletion examples/advanced/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"@tanstack/svelte-query": "^5.59.16",
"@tanstack/vue-query": "^5.59.16",
"axios": "^1.7.7",
"msw": "^2.5.2",
"msw": "^2.6.0",
"react": "^18.3.1",
"solid-js": "^1.9.3",
"svelte": "^3.59.2",
Expand Down
9 changes: 8 additions & 1 deletion examples/advanced/src/gen/clients/axios/petService/addPet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@ import type { AddPetMutationRequest, AddPetMutationResponse, AddPet405 } from '.
* @summary Add a new pet to the store
* @link /pet
*/
export async function addPet(data: AddPetMutationRequest, config: Partial<RequestConfig<AddPetMutationRequest>> = {}) {
export async function addPet(
{
data,
}: {
data: AddPetMutationRequest
},
config: Partial<RequestConfig<AddPetMutationRequest>> = {},
) {
const res = await client<AddPetMutationResponse, AddPet405, AddPetMutationRequest>({
method: 'POST',
url: '/pet',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ import type { DeletePetMutationResponse, DeletePetPathParams, DeletePetHeaderPar
export async function deletePet(
{
petId,
headers,
}: {
petId: DeletePetPathParams['petId']
headers?: DeletePetHeaderParams
},
headers?: DeletePetHeaderParams,
config: Partial<RequestConfig> = {},
) {
const res = await client<DeletePetMutationResponse, DeletePet400, unknown>({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@ import type { FindPetsByStatusQueryResponse, FindPetsByStatusQueryParams, FindPe
* @summary Finds Pets by status
* @link /pet/findByStatus
*/
export async function findPetsByStatus(params?: FindPetsByStatusQueryParams, config: Partial<RequestConfig> = {}) {
export async function findPetsByStatus(
{
params,
}: {
params?: FindPetsByStatusQueryParams
},
config: Partial<RequestConfig> = {},
) {
const res = await client<FindPetsByStatusQueryResponse, FindPetsByStatus400, unknown>({
method: 'GET',
url: '/pet/findByStatus',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,16 @@ import type {
* @summary Finds Pets by tags
* @link /pet/findByTags
*/
export async function findPetsByTags(headers: FindPetsByTagsHeaderParams, params?: FindPetsByTagsQueryParams, config: Partial<RequestConfig> = {}) {
export async function findPetsByTags(
{
headers,
params,
}: {
headers: FindPetsByTagsHeaderParams
params?: FindPetsByTagsQueryParams
},
config: Partial<RequestConfig> = {},
) {
const res = await client<FindPetsByTagsQueryResponse, FindPetsByTags400, unknown>({
method: 'GET',
url: '/pet/findByTags',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,14 @@ import type {
* @summary Update an existing pet
* @link /pet
*/
export async function updatePet(data: UpdatePetMutationRequest, config: Partial<RequestConfig<UpdatePetMutationRequest>> = {}) {
export async function updatePet(
{
data,
}: {
data: UpdatePetMutationRequest
},
config: Partial<RequestConfig<UpdatePetMutationRequest>> = {},
) {
const res = await client<UpdatePetMutationResponse, UpdatePet400 | UpdatePet404 | UpdatePet405, UpdatePetMutationRequest>({
method: 'PUT',
url: '/pet',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ import type {
export async function updatePetWithForm(
{
petId,
params,
}: {
petId: UpdatePetWithFormPathParams['petId']
params?: UpdatePetWithFormQueryParams
},
params?: UpdatePetWithFormQueryParams,
config: Partial<RequestConfig> = {},
) {
const res = await client<UpdatePetWithFormMutationResponse, UpdatePetWithForm405, unknown>({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@ import type {
export async function uploadFile(
{
petId,
data,
params,
}: {
petId: UploadFilePathParams['petId']
data?: UploadFileMutationRequest
params?: UploadFileQueryParams
},
data?: UploadFileMutationRequest,
params?: UploadFileQueryParams,
config: Partial<RequestConfig<UploadFileMutationRequest>> = {},
) {
const res = await client<UploadFileMutationResponse, Error, UploadFileMutationRequest>({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,15 @@ import type {
export async function createPets(
{
uuid,
data,
headers,
params,
}: {
uuid: CreatePetsPathParams['uuid']
data: CreatePetsMutationRequest
headers: CreatePetsHeaderParams
params?: CreatePetsQueryParams
},
data: CreatePetsMutationRequest,
headers: CreatePetsHeaderParams,
params?: CreatePetsQueryParams,
config: Partial<RequestConfig<CreatePetsMutationRequest>> = {},
) {
const res = await client<CreatePetsMutationResponse, Error, CreatePetsMutationRequest>({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@ import type { CreateUserMutationRequest, CreateUserMutationResponse } from '../.
* @summary Create user
* @link /user
*/
export async function createUser(data?: CreateUserMutationRequest, config: Partial<RequestConfig<CreateUserMutationRequest>> = {}) {
export async function createUser(
{
data,
}: {
data?: CreateUserMutationRequest
},
config: Partial<RequestConfig<CreateUserMutationRequest>> = {},
) {
const res = await client<CreateUserMutationResponse, Error, CreateUserMutationRequest>({
method: 'POST',
url: '/user',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ import type {
* @link /user/createWithList
*/
export async function createUsersWithListInput(
data?: CreateUsersWithListInputMutationRequest,
{
data,
}: {
data?: CreateUsersWithListInputMutationRequest
},
config: Partial<RequestConfig<CreateUsersWithListInputMutationRequest>> = {},
) {
const res = await client<CreateUsersWithListInputMutationResponse, Error, CreateUsersWithListInputMutationRequest>({
Expand Down
Loading
Loading