Merge branch 'main' into fix/817

.changeset/sharp-tables-clap.md

@@ -0,0 +1,6 @@
+---
+"@kubb/swagger-ts": patch
+"@kubb/swagger": patch
+---
+
+AllOf when used in responses

examples/advanced/src/gen/clients/hooks/petsController/useCreatePets.ts

@@ -6,15 +6,13 @@ import type {
   CreatePetsPathParams,
   CreatePetsQueryParams,
   CreatePetsHeaderParams,
-  CreatePets201,
-  CreatePetsError,
 } from '../../../models/ts/petsController/CreatePets'
 import type { UseMutationOptions, UseMutationResult } from '@tanstack/react-query'
 
-type CreatePetsClient = typeof client<CreatePetsMutationResponse, CreatePets201 | CreatePetsError, CreatePetsMutationRequest>
+type CreatePetsClient = typeof client<CreatePetsMutationResponse, never, CreatePetsMutationRequest>
 type CreatePets = {
   data: CreatePetsMutationResponse
-  error: CreatePets201 | CreatePetsError
+  error: never
   request: CreatePetsMutationRequest
   pathParams: CreatePetsPathParams
   queryParams: CreatePetsQueryParams

examples/advanced/src/gen/clients/hooks/userController/useCreateUser.ts

@@ -1,12 +1,12 @@
 import client from '../../../../tanstack-query-client.ts'
 import { useMutation } from '@tanstack/react-query'
-import type { CreateUserMutationRequest, CreateUserMutationResponse, CreateUserError } from '../../../models/ts/userController/CreateUser'
+import type { CreateUserMutationRequest, CreateUserMutationResponse } from '../../../models/ts/userController/CreateUser'
 import type { UseMutationOptions, UseMutationResult } from '@tanstack/react-query'
 
-type CreateUserClient = typeof client<CreateUserMutationResponse, CreateUserError, CreateUserMutationRequest>
+type CreateUserClient = typeof client<CreateUserMutationResponse, never, CreateUserMutationRequest>
 type CreateUser = {
   data: CreateUserMutationResponse
-  error: CreateUserError
+  error: never
   request: CreateUserMutationRequest
   pathParams: never
   queryParams: never

examples/advanced/src/gen/clients/hooks/userController/useCreateUsersWithListInput.ts

@@ -3,18 +3,13 @@ import { useMutation } from '@tanstack/react-query'
 import type {
   CreateUsersWithListInputMutationRequest,
   CreateUsersWithListInputMutationResponse,
-  CreateUsersWithListInputError,
 } from '../../../models/ts/userController/CreateUsersWithListInput'
 import type { UseMutationOptions, UseMutationResult } from '@tanstack/react-query'
 
-type CreateUsersWithListInputClient = typeof client<
-  CreateUsersWithListInputMutationResponse,
-  CreateUsersWithListInputError,
-  CreateUsersWithListInputMutationRequest
->
+type CreateUsersWithListInputClient = typeof client<CreateUsersWithListInputMutationResponse, never, CreateUsersWithListInputMutationRequest>
 type CreateUsersWithListInput = {
   data: CreateUsersWithListInputMutationResponse
-  error: CreateUsersWithListInputError
+  error: never
   request: CreateUsersWithListInputMutationRequest
   pathParams: never
   queryParams: never

examples/advanced/src/gen/clients/hooks/userController/useLogoutUser.ts

@@ -1,7 +1,7 @@
 import { logoutUserQueryResponseSchema } from '../../../zod/userController/logoutUserSchema'
 import client from '../../../../tanstack-query-client.ts'
 import { useQuery, useInfiniteQuery } from '@tanstack/react-query'
-import type { LogoutUserQueryResponse, LogoutUserError } from '../../../models/ts/userController/LogoutUser'
+import type { LogoutUserQueryResponse } from '../../../models/ts/userController/LogoutUser'
 import type {
   UseBaseQueryOptions,
   UseQueryResult,
@@ -12,10 +12,10 @@ import type {
   InfiniteData,
 } from '@tanstack/react-query'
 
-type LogoutUserClient = typeof client<LogoutUserQueryResponse, LogoutUserError, never>
+type LogoutUserClient = typeof client<LogoutUserQueryResponse, never, never>
 type LogoutUser = {
   data: LogoutUserQueryResponse
-  error: LogoutUserError
+  error: never
   request: never
   pathParams: never
   queryParams: never

examples/advanced/src/gen/clients/hooks/userController/useUpdateUser.ts

@@ -1,12 +1,12 @@
 import client from '../../../../tanstack-query-client.ts'
 import { useMutation } from '@tanstack/react-query'
-import type { UpdateUserMutationRequest, UpdateUserMutationResponse, UpdateUserPathParams, UpdateUserError } from '../../../models/ts/userController/UpdateUser'
+import type { UpdateUserMutationRequest, UpdateUserMutationResponse, UpdateUserPathParams } from '../../../models/ts/userController/UpdateUser'
 import type { UseMutationOptions, UseMutationResult } from '@tanstack/react-query'
 
-type UpdateUserClient = typeof client<UpdateUserMutationResponse, UpdateUserError, UpdateUserMutationRequest>
+type UpdateUserClient = typeof client<UpdateUserMutationResponse, never, UpdateUserMutationRequest>
 type UpdateUser = {
   data: UpdateUserMutationResponse
-  error: UpdateUserError
+  error: never
   request: UpdateUserMutationRequest
   pathParams: UpdateUserPathParams
   queryParams: never

examples/advanced/src/gen/clients/swr/petsSWRController/useCreatePets.ts

@@ -7,14 +7,12 @@ import type {
   CreatePetsPathParams,
   CreatePetsQueryParams,
   CreatePetsHeaderParams,
-  CreatePets201,
-  CreatePetsError,
 } from '../../../models/ts/petsController/CreatePets'
 
-type CreatePetsClient = typeof client<CreatePetsMutationResponse, CreatePets201 | CreatePetsError, CreatePetsMutationRequest>
+type CreatePetsClient = typeof client<CreatePetsMutationResponse, never, CreatePetsMutationRequest>
 type CreatePets = {
   data: CreatePetsMutationResponse
-  error: CreatePets201 | CreatePetsError
+  error: never
   request: CreatePetsMutationRequest
   pathParams: CreatePetsPathParams
   queryParams: CreatePetsQueryParams

examples/advanced/src/gen/clients/swr/userSWRController/useCreateUser.ts

@@ -1,12 +1,12 @@
 import useSWRMutation from 'swr/mutation'
 import client from '../../../../swr-client.ts'
 import type { SWRMutationConfiguration, SWRMutationResponse } from 'swr/mutation'
-import type { CreateUserMutationRequest, CreateUserMutationResponse, CreateUserError } from '../../../models/ts/userController/CreateUser'
+import type { CreateUserMutationRequest, CreateUserMutationResponse } from '../../../models/ts/userController/CreateUser'
 
-type CreateUserClient = typeof client<CreateUserMutationResponse, CreateUserError, CreateUserMutationRequest>
+type CreateUserClient = typeof client<CreateUserMutationResponse, never, CreateUserMutationRequest>
 type CreateUser = {
   data: CreateUserMutationResponse
-  error: CreateUserError
+  error: never
   request: CreateUserMutationRequest
   pathParams: never
   queryParams: never

examples/advanced/src/gen/clients/swr/userSWRController/useCreateUsersWithListInput.ts

@@ -4,17 +4,12 @@ import type { SWRMutationConfiguration, SWRMutationResponse } from 'swr/mutation
 import type {
   CreateUsersWithListInputMutationRequest,
   CreateUsersWithListInputMutationResponse,
-  CreateUsersWithListInputError,
 } from '../../../models/ts/userController/CreateUsersWithListInput'
 
-type CreateUsersWithListInputClient = typeof client<
-  CreateUsersWithListInputMutationResponse,
-  CreateUsersWithListInputError,
-  CreateUsersWithListInputMutationRequest
->
+type CreateUsersWithListInputClient = typeof client<CreateUsersWithListInputMutationResponse, never, CreateUsersWithListInputMutationRequest>
 type CreateUsersWithListInput = {
   data: CreateUsersWithListInputMutationResponse
-  error: CreateUsersWithListInputError
+  error: never
   request: CreateUsersWithListInputMutationRequest
   pathParams: never
   queryParams: never

examples/advanced/src/gen/clients/swr/userSWRController/useLogoutUser.ts

@@ -1,12 +1,12 @@
 import useSWR from 'swr'
 import client from '../../../../swr-client.ts'
 import type { SWRConfiguration, SWRResponse } from 'swr'
-import type { LogoutUserQueryResponse, LogoutUserError } from '../../../models/ts/userController/LogoutUser'
+import type { LogoutUserQueryResponse } from '../../../models/ts/userController/LogoutUser'
 
-type LogoutUserClient = typeof client<LogoutUserQueryResponse, LogoutUserError, never>
+type LogoutUserClient = typeof client<LogoutUserQueryResponse, never, never>
 type LogoutUser = {
   data: LogoutUserQueryResponse
-  error: LogoutUserError
+  error: never
   request: never
   pathParams: never
   queryParams: never

examples/advanced/src/gen/clients/swr/userSWRController/useUpdateUser.ts

@@ -1,12 +1,12 @@
 import useSWRMutation from 'swr/mutation'
 import client from '../../../../swr-client.ts'
 import type { SWRMutationConfiguration, SWRMutationResponse } from 'swr/mutation'
-import type { UpdateUserMutationRequest, UpdateUserMutationResponse, UpdateUserPathParams, UpdateUserError } from '../../../models/ts/userController/UpdateUser'
+import type { UpdateUserMutationRequest, UpdateUserMutationResponse, UpdateUserPathParams } from '../../../models/ts/userController/UpdateUser'
 
-type UpdateUserClient = typeof client<UpdateUserMutationResponse, UpdateUserError, UpdateUserMutationRequest>
+type UpdateUserClient = typeof client<UpdateUserMutationResponse, never, UpdateUserMutationRequest>
 type UpdateUser = {
   data: UpdateUserMutationResponse
-  error: UpdateUserError
+  error: never
   request: UpdateUserMutationRequest
   pathParams: UpdateUserPathParams
   queryParams: never

examples/advanced/src/gen/mocks/petsController/createCreatePets.ts

@@ -1,23 +1,12 @@
 import { faker } from '@faker-js/faker'
-import { createPetNotFound } from '../createPetNotFound'
 import type {
-  CreatePets201,
-  CreatePetsError,
   CreatePetsHeaderParams,
   CreatePetsMutationRequest,
   CreatePetsMutationResponse,
   CreatePetsPathParams,
   CreatePetsQueryParams,
 } from '../../models/ts/petsController/CreatePets'
 
-/**
- * @description Null response
- */
-
-export function createCreatePets201(override?: NonNullable<Partial<CreatePets201>>): NonNullable<CreatePets201> {
-  return undefined
-}
-
 export function createCreatePetsHeaderParams(override: NonNullable<Partial<CreatePetsHeaderParams>> = {}): NonNullable<CreatePetsHeaderParams> {
   return {
     ...{ 'X-EXAMPLE': faker.helpers.arrayElement<any>([`ONE`, `TWO`, `THREE`]) },
@@ -49,10 +38,3 @@ export function createCreatePetsQueryParams(override: NonNullable<Partial<Create
     ...override,
   }
 }
-/**
- * @description unexpected error
- */
-
-export function createCreatePetsError(override?: NonNullable<Partial<CreatePetsError>>): NonNullable<CreatePetsError> {
-  return createPetNotFound(override)
-}

examples/advanced/src/gen/mocks/userController/createCreateUser.ts

@@ -1,16 +1,9 @@
 import { createUser } from '../createUser'
-import type { CreateUserError, CreateUserMutationRequest, CreateUserMutationResponse } from '../../models/ts/userController/CreateUser'
+import type { CreateUserMutationRequest, CreateUserMutationResponse } from '../../models/ts/userController/CreateUser'
 
 export function createCreateUserMutationResponse(override?: NonNullable<Partial<CreateUserMutationResponse>>): NonNullable<CreateUserMutationResponse> {
   return undefined
 }
-/**
- * @description successful operation
- */
-
-export function createCreateUserError(override?: NonNullable<Partial<CreateUserError>>): NonNullable<CreateUserError> {
-  return createUser(override)
-}
 /**
  * @description Created user object
  */

examples/advanced/src/gen/mocks/userController/createCreateUsersWithListInput.ts

@@ -1,20 +1,6 @@
 import { faker } from '@faker-js/faker'
 import { createUser } from '../createUser'
-import type {
-  CreateUsersWithListInputError,
-  CreateUsersWithListInputMutationRequest,
-  CreateUsersWithListInputMutationResponse,
-} from '../../models/ts/userController/CreateUsersWithListInput'
-
-/**
- * @description successful operation
- */
-
-export function createCreateUsersWithListInputError(
-  override?: NonNullable<Partial<CreateUsersWithListInputError>>,
-): NonNullable<CreateUsersWithListInputError> {
-  return undefined
-}
+import type { CreateUsersWithListInputMutationRequest, CreateUsersWithListInputMutationResponse } from '../../models/ts/userController/CreateUsersWithListInput'
 
 export function createCreateUsersWithListInputMutationRequest(
   override: NonNullable<Partial<CreateUsersWithListInputMutationRequest>> = [],

examples/advanced/src/gen/mocks/userController/createLogoutUser.ts

@@ -1,12 +1,4 @@
-import type { LogoutUserError, LogoutUserQueryResponse } from '../../models/ts/userController/LogoutUser'
-
-/**
- * @description successful operation
- */
-
-export function createLogoutUserError(override?: NonNullable<Partial<LogoutUserError>>): NonNullable<LogoutUserError> {
-  return undefined
-}
+import type { LogoutUserQueryResponse } from '../../models/ts/userController/LogoutUser'
 
 export function createLogoutUserQueryResponse(override?: NonNullable<Partial<LogoutUserQueryResponse>>): NonNullable<LogoutUserQueryResponse> {
   return undefined

examples/advanced/src/gen/mocks/userController/createUpdateUser.ts

@@ -1,14 +1,6 @@
 import { faker } from '@faker-js/faker'
 import { createUser } from '../createUser'
-import type { UpdateUserError, UpdateUserMutationRequest, UpdateUserMutationResponse, UpdateUserPathParams } from '../../models/ts/userController/UpdateUser'
-
-/**
- * @description successful operation
- */
-
-export function createUpdateUserError(override?: NonNullable<Partial<UpdateUserError>>): NonNullable<UpdateUserError> {
-  return undefined
-}
+import type { UpdateUserMutationRequest, UpdateUserMutationResponse, UpdateUserPathParams } from '../../models/ts/userController/UpdateUser'
 
 export function createUpdateUserMutationResponse(override?: NonNullable<Partial<UpdateUserMutationResponse>>): NonNullable<UpdateUserMutationResponse> {
   return undefined

examples/advanced/src/gen/models/ts/petsController/CreatePets.ts

@@ -1,10 +1,3 @@
-import type { PetNotFound } from '../PetNotFound'
-
-/**
- * @description Null response
- */
-export type CreatePets201 = any | null
-
 export const CreatePetsHeaderParamsXExample = {
   'ONE': 'ONE',
   'TWO': 'TWO',
@@ -47,16 +40,10 @@ export type CreatePetsQueryParams = {
    */
   offset?: number
 } | undefined
-
-/**
- * @description unexpected error
- */
-export type CreatePetsError = PetNotFound
 export type CreatePetsMutation = {
   Response: CreatePetsMutationResponse
   Request: CreatePetsMutationRequest
   PathParams: CreatePetsPathParams
   QueryParams: CreatePetsQueryParams
   HeaderParams: CreatePetsHeaderParams
-  Errors: CreatePets201 | CreatePetsError
 }

examples/advanced/src/gen/models/ts/userController/CreateUser.ts

@@ -2,17 +2,11 @@ import type { User } from '../User'
 
 export type CreateUserMutationResponse = any | null
 
-/**
- * @description successful operation
- */
-export type CreateUserError = User
-
 /**
  * @description Created user object
  */
 export type CreateUserMutationRequest = User
 export type CreateUserMutation = {
   Response: CreateUserMutationResponse
   Request: CreateUserMutationRequest
-  Errors: CreateUserError
 }

examples/advanced/src/gen/models/ts/userController/CreateUsersWithListInput.ts

@@ -1,10 +1,5 @@
 import type { User } from '../User'
 
-/**
- * @description successful operation
- */
-export type CreateUsersWithListInputError = any | null
-
 export type CreateUsersWithListInputMutationRequest = User[]
 
 /**
@@ -14,5 +9,4 @@ export type CreateUsersWithListInputMutationResponse = User
 export type CreateUsersWithListInputMutation = {
   Response: CreateUsersWithListInputMutationResponse
   Request: CreateUsersWithListInputMutationRequest
-  Errors: CreateUsersWithListInputError
 }

examples/advanced/src/gen/models/ts/userController/LogoutUser.ts

@@ -1,10 +1,4 @@
-/**
- * @description successful operation
- */
-export type LogoutUserError = any | null
-
 export type LogoutUserQueryResponse = any | null
 export type LogoutUserQuery = {
   Response: LogoutUserQueryResponse
-  Errors: LogoutUserError
 }

examples/advanced/src/gen/models/ts/userController/UpdateUser.ts

@@ -1,10 +1,5 @@
 import type { User } from '../User'
 
-/**
- * @description successful operation
- */
-export type UpdateUserError = any | null
-
 export type UpdateUserMutationResponse = any | null
 
 export type UpdateUserPathParams = {
@@ -23,5 +18,4 @@ export type UpdateUserMutation = {
   Response: UpdateUserMutationResponse
   Request: UpdateUserMutationRequest
   PathParams: UpdateUserPathParams
-  Errors: UpdateUserError
 }

examples/advanced/src/gen/zod/petsController/createPetsSchema.ts

@@ -1,17 +1,7 @@
 import { z } from 'zod'
-import { petNotFoundSchema } from '../petNotFoundSchema'
 
-/**
- * @description Null response
- */
-export const createPets201Schema = z.any()
 export const createPetsHeaderParamsSchema = z.object({ 'X-EXAMPLE': z.enum([`ONE`, `TWO`, `THREE`]).describe(`Header parameters`) })
 export const createPetsMutationRequestSchema = z.object({ 'name': z.string(), 'tag': z.string() })
 export const createPetsMutationResponseSchema = z.any()
 export const createPetsPathParamsSchema = z.object({ 'uuid': z.string().describe(`UUID`) })
 export const createPetsQueryParamsSchema = z.object({ 'offset': z.number().describe(`Offset`).optional() }).optional()
-
-/**
- * @description unexpected error
- */
-export const createPetsErrorSchema = z.lazy(() => petNotFoundSchema)