Merge branch 'main' into feat/784

.changeset/perfect-trees-juggle.md

@@ -0,0 +1,6 @@
+---
+"@kubb/swagger-ts": patch
+"@kubb/core": patch
+---
+
+A schema name with `pet.Pets` will be moved inside of the folder `src/gen/pet/pets/ts` instead of `src/gen/petPets.ts`

.changeset/polite-bikes-drop.md

@@ -0,0 +1,5 @@
+---
+"@kubb/swagger": patch
+---
+
+Do not create barrel files with `getGroupedByTagFiles`

.changeset/rude-clocks-care.md

@@ -0,0 +1,5 @@
+---
+"@kubb/swagger-ts": patch
+---
+
+Remove use of namespace

docs/plugins/swagger-zod/index.md

@@ -296,6 +296,8 @@ export default defineConfig({
 })
 ```
 
+:::
+
 ### typed
 
 Use TypeScript(`@kubb/swagger-ts`) to add type annotation.
@@ -400,7 +402,6 @@ export default defineConfig({
 })
 ```
 
-:::
 
 :::
 

examples/advanced/petStore.yaml

@@ -810,7 +810,7 @@ components:
           example: 1
       xml:
         name: user
-    Tag:
+    tag.Tag:
       type: object
       properties:
         id:
@@ -851,7 +851,7 @@ components:
           xml:
             wrapped: true
           items:
-            $ref: "#/components/schemas/Tag"
+            $ref: "#/components/schemas/tag.Tag"
         status:
           type: string
           description: pet status in the store
@@ -889,7 +889,7 @@ components:
           xml:
             wrapped: true
           items:
-            $ref: "#/components/schemas/Tag"
+            $ref: "#/components/schemas/tag.Tag"
         status:
           type: string
           description: pet status in the store

examples/advanced/src/gen/mocks/createAddPetRequest.ts

@@ -1,5 +1,5 @@
 import { createCategory } from './createCategory'
-import { createTag } from './createTag'
+import { createTagTag } from './tag/createTag'
 import { faker } from '@faker-js/faker'
 import type { AddPetRequest } from '../models/ts/AddPetRequest'
 
@@ -9,7 +9,7 @@ export function createAddPetRequest(): NonNullable<AddPetRequest> {
     'name': faker.string.alpha(),
     'category': createCategory(),
     'photoUrls': faker.helpers.arrayElements([faker.string.alpha()]) as any,
-    'tags': faker.helpers.arrayElements([createTag()]) as any,
+    'tags': faker.helpers.arrayElements([createTagTag()]) as any,
     'status': faker.helpers.arrayElement<any>([`available`, `pending`, `sold`]),
   }
 }

examples/advanced/src/gen/mocks/createPet.ts

@@ -1,5 +1,5 @@
 import { createCategory } from './createCategory'
-import { createTag } from './createTag'
+import { createTagTag } from './tag/createTag'
 import { faker } from '@faker-js/faker'
 import type { Pet } from '../models/ts/Pet'
 
@@ -9,7 +9,7 @@ export function createPet(): NonNullable<Pet> {
     'name': faker.string.alpha(),
     'category': createCategory(),
     'photoUrls': faker.helpers.arrayElements([faker.string.alpha()]) as any,
-    'tags': faker.helpers.arrayElements([createTag()]) as any,
+    'tags': faker.helpers.arrayElements([createTagTag()]) as any,
     'status': faker.helpers.arrayElement<any>([`available`, `pending`, `sold`]),
   }
 }

examples/advanced/src/gen/mocks/index.ts

@@ -6,9 +6,9 @@ export * from './createCustomer'
 export * from './createOrder'
 export * from './createPet'
 export * from './createPetNotFound'
-export * from './createTag'
 export * from './createUser'
 export * from './createUserArray'
+export * from './tag/index'
 export * as petsMocks from './petsController/index'
 export * as petMocks from './petController/index'
 export * as userMocks from './userController/index'

examples/advanced/src/gen/mocks/createTag.ts → examples/advanced/src/gen/mocks/tag/createTag.ts

@@ -1,6 +1,6 @@
 import { faker } from '@faker-js/faker'
-import type { Tag } from '../models/ts/Tag'
+import type { TagTag } from '../../models/ts/tag/Tag'
 
-export function createTag(): NonNullable<Tag> {
+export function createTagTag(): NonNullable<TagTag> {
   return { 'id': faker.number.float({}), 'name': faker.string.alpha() }
 }

examples/advanced/src/gen/mocks/tag/index.ts

@@ -0,0 +1 @@
+export * from './createTag'

examples/advanced/src/gen/models/ts/AddPetRequest.ts

@@ -1,5 +1,5 @@
 import type { Category } from './Category'
-import type { Tag } from './Tag'
+import type { TagTag } from './tag/Tag'
 
 export const AddPetRequestStatus = {
   'available': 'available',
@@ -26,7 +26,7 @@ export type AddPetRequest = {
   /**
    * @type array | undefined
    */
-  tags?: Tag[]
+  tags?: TagTag[]
   /**
    * @description pet status in the store
    * @type string | undefined

examples/advanced/src/gen/models/ts/Pet.ts

@@ -1,5 +1,5 @@
 import type { Category } from './Category'
-import type { Tag } from './Tag'
+import type { TagTag } from './tag/Tag'
 
 export const PetStatus = {
   'available': 'available',
@@ -26,7 +26,7 @@ export type Pet = {
   /**
    * @type array | undefined
    */
-  tags?: Tag[]
+  tags?: TagTag[]
   /**
    * @description pet status in the store
    * @type string | undefined

examples/advanced/src/gen/models/ts/index.ts

@@ -9,7 +9,7 @@ export * from './petController/index.js'
 export * from './PetNotFound.js'
 export * from './petsController/index.js'
 export * from './storeController/index.js'
-export * from './Tag.js'
+export * from './tag/index.js'
 export * from './User.js'
 export * from './UserArray.js'
 export * from './userController/index.js'

examples/advanced/src/gen/models/ts/petController/FindPetsByStatus.ts

@@ -23,8 +23,8 @@ export type FindPetsByStatusQueryParams = {
  * @description successful operation
  */
 export type FindPetsByStatusQueryResponse = Pet[]
-export namespace FindPetsByStatusQuery {
-  export type Response = FindPetsByStatusQueryResponse
-  export type QueryParams = FindPetsByStatusQueryParams
-  export type Errors = FindPetsByStatus400
+export type FindPetsByStatusQuery = {
+  Response: FindPetsByStatusQueryResponse
+  QueryParams: FindPetsByStatusQueryParams
+  Errors: FindPetsByStatus400
 }

examples/advanced/src/gen/models/ts/petController/FindPetsByTags.ts

@@ -41,9 +41,9 @@ export type FindPetsByTagsQueryParams = {
  * @description successful operation
  */
 export type FindPetsByTagsQueryResponse = Pet[]
-export namespace FindPetsByTagsQuery {
-  export type Response = FindPetsByTagsQueryResponse
-  export type QueryParams = FindPetsByTagsQueryParams
-  export type HeaderParams = FindPetsByTagsHeaderParams
-  export type Errors = FindPetsByTags400
+export type FindPetsByTagsQuery = {
+  Response: FindPetsByTagsQueryResponse
+  QueryParams: FindPetsByTagsQueryParams
+  HeaderParams: FindPetsByTagsHeaderParams
+  Errors: FindPetsByTags400
 }

examples/advanced/src/gen/models/ts/petController/GetPetById.ts

@@ -22,8 +22,8 @@ export type GetPetByIdPathParams = {
  * @description successful operation
  */
 export type GetPetByIdQueryResponse = Omit<NonNullable<Pet>, 'name'>
-export namespace GetPetByIdQuery {
-  export type Response = GetPetByIdQueryResponse
-  export type PathParams = GetPetByIdPathParams
-  export type Errors = GetPetById400 | GetPetById404
+export type GetPetByIdQuery = {
+  Response: GetPetByIdQueryResponse
+  PathParams: GetPetByIdPathParams
+  Errors: GetPetById400 | GetPetById404
 }

examples/advanced/src/gen/models/ts/storeController/GetInventory.ts

@@ -4,6 +4,6 @@
 export type GetInventoryQueryResponse = {
   [key: string]: number
 }
-export namespace GetInventoryQuery {
-  export type Response = GetInventoryQueryResponse
+export type GetInventoryQuery = {
+  Response: GetInventoryQueryResponse
 }

examples/advanced/src/gen/models/ts/storeController/GetOrderById.ts

@@ -22,8 +22,8 @@ export type GetOrderByIdPathParams = {
  * @description successful operation
  */
 export type GetOrderByIdQueryResponse = Order
-export namespace GetOrderByIdQuery {
-  export type Response = GetOrderByIdQueryResponse
-  export type PathParams = GetOrderByIdPathParams
-  export type Errors = GetOrderById400 | GetOrderById404
+export type GetOrderByIdQuery = {
+  Response: GetOrderByIdQueryResponse
+  PathParams: GetOrderByIdPathParams
+  Errors: GetOrderById400 | GetOrderById404
 }

examples/advanced/src/gen/models/ts/Tag.ts → examples/advanced/src/gen/models/ts/tag/Tag.ts

@@ -1,4 +1,4 @@
-export type Tag = {
+export type TagTag = {
   /**
    * @type integer | undefined int64
    */

examples/advanced/src/gen/models/ts/tag/index.ts

@@ -0,0 +1 @@
+export * from './Tag.js'

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

@@ -22,8 +22,8 @@ export type GetUserByNamePathParams = {
  * @description successful operation
  */
 export type GetUserByNameQueryResponse = User
-export namespace GetUserByNameQuery {
-  export type Response = GetUserByNameQueryResponse
-  export type PathParams = GetUserByNamePathParams
-  export type Errors = GetUserByName400 | GetUserByName404
+export type GetUserByNameQuery = {
+  Response: GetUserByNameQueryResponse
+  PathParams: GetUserByNamePathParams
+  Errors: GetUserByName400 | GetUserByName404
 }

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

@@ -20,8 +20,8 @@ export type LoginUserQueryParams = {
  * @description successful operation
  */
 export type LoginUserQueryResponse = string
-export namespace LoginUserQuery {
-  export type Response = LoginUserQueryResponse
-  export type QueryParams = LoginUserQueryParams
-  export type Errors = LoginUser400
+export type LoginUserQuery = {
+  Response: LoginUserQueryResponse
+  QueryParams: LoginUserQueryParams
+  Errors: LoginUser400
 }

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

@@ -4,7 +4,7 @@
 export type LogoutUserError = any | null
 
 export type LogoutUserQueryResponse = any | null
-export namespace LogoutUserQuery {
-  export type Response = LogoutUserQueryResponse
-  export type Errors = LogoutUserError
+export type LogoutUserQuery = {
+  Response: LogoutUserQueryResponse
+  Errors: LogoutUserError
 }

examples/advanced/src/gen/schemas/AddPetRequest.json

@@ -18,7 +18,7 @@
         "type": "object",
         "properties": { "id": { "type": "integer", "format": "int64" }, "name": { "type": "string" } },
         "xml": { "name": "tag" },
-        "x-readme-ref-name": "Tag"
+        "x-readme-ref-name": "tag.Tag"
       }
     },
     "status": { "type": "string", "description": "pet status in the store", "enum": ["available", "pending", "sold"] }

examples/advanced/src/gen/schemas/Pet.json

@@ -18,7 +18,7 @@
         "type": "object",
         "properties": { "id": { "type": "integer", "format": "int64" }, "name": { "type": "string" } },
         "xml": { "name": "tag" },
-        "x-readme-ref-name": "Tag"
+        "x-readme-ref-name": "tag.Tag"
       }
     },
     "status": { "type": "string", "description": "pet status in the store", "enum": ["available", "pending", "sold"] }

examples/advanced/src/gen/schemas/Tag.json → examples/advanced/src/gen/schemas/tag.Tag.json

@@ -2,5 +2,5 @@
   "type": "object",
   "properties": { "id": { "type": "integer", "format": "int64" }, "name": { "type": "string" } },
   "xml": { "name": "tag" },
-  "x-readme-ref-name": "Tag"
+  "x-readme-ref-name": "tag.Tag"
 }

examples/advanced/src/gen/schemas2/AddPetRequest.json

@@ -18,7 +18,7 @@
         "type": "object",
         "properties": { "id": { "type": "integer", "format": "int64" }, "name": { "type": "string" } },
         "xml": { "name": "tag" },
-        "x-readme-ref-name": "Tag"
+        "x-readme-ref-name": "tag.Tag"
       }
     },
     "status": { "type": "string", "description": "pet status in the store", "enum": ["available", "pending", "sold"] }

examples/advanced/src/gen/schemas2/Pet.json

@@ -18,7 +18,7 @@
         "type": "object",
         "properties": { "id": { "type": "integer", "format": "int64" }, "name": { "type": "string" } },
         "xml": { "name": "tag" },
-        "x-readme-ref-name": "Tag"
+        "x-readme-ref-name": "tag.Tag"
       }
     },
     "status": { "type": "string", "description": "pet status in the store", "enum": ["available", "pending", "sold"] }

examples/advanced/src/gen/schemas2/Tag.json → examples/advanced/src/gen/schemas2/tag.Tag.json

@@ -2,5 +2,5 @@
   "type": "object",
   "properties": { "id": { "type": "integer", "format": "int64" }, "name": { "type": "string" } },
   "xml": { "name": "tag" },
-  "x-readme-ref-name": "Tag"
+  "x-readme-ref-name": "tag.Tag"
 }

examples/advanced/src/gen/zod/addPetRequestSchema.ts

@@ -1,5 +1,5 @@
 import { categorySchema } from './categorySchema'
-import { tagSchema } from './tagSchema'
+import { tagTagSchema } from './tag/tagSchema'
 import { z } from 'zod'
 import type { AddPetRequest } from '../models/ts/AddPetRequest'
 
@@ -8,6 +8,6 @@ export const addPetRequestSchema: z.ZodType<AddPetRequest> = z.object({
   'name': z.string(),
   'category': z.lazy(() => categorySchema).optional(),
   'photoUrls': z.array(z.string()),
-  'tags': z.array(z.lazy(() => tagSchema)).optional(),
+  'tags': z.array(z.lazy(() => tagTagSchema)).optional(),
   'status': z.enum([`available`, `pending`, `sold`]).describe(`pet status in the store`).optional(),
 })

examples/advanced/src/gen/zod/index.ts

@@ -8,7 +8,7 @@ export * as petSchemas from './petController/index'
 export * from './petNotFoundSchema'
 export * from './petSchema'
 export * as petsSchemas from './petsController/index'
-export * from './tagSchema'
+export * from './tag/index'
 export * from './userArraySchema'
 export * as userSchemas from './userController/index'
 export * from './userSchema'

examples/advanced/src/gen/zod/petSchema.ts

@@ -1,5 +1,5 @@
 import { categorySchema } from './categorySchema'
-import { tagSchema } from './tagSchema'
+import { tagTagSchema } from './tag/tagSchema'
 import { z } from 'zod'
 import type { Pet } from '../models/ts/Pet'
 
@@ -8,6 +8,6 @@ export const petSchema: z.ZodType<Pet> = z.object({
   'name': z.string(),
   'category': z.lazy(() => categorySchema).optional(),
   'photoUrls': z.array(z.string()),
-  'tags': z.array(z.lazy(() => tagSchema)).optional(),
+  'tags': z.array(z.lazy(() => tagTagSchema)).optional(),
   'status': z.enum([`available`, `pending`, `sold`]).describe(`pet status in the store`).optional(),
 })

examples/advanced/src/gen/zod/tag/index.ts

@@ -0,0 +1 @@
+export * from './tagSchema'

examples/advanced/src/gen/zod/tag/tagSchema.ts

@@ -0,0 +1,4 @@
+import { z } from 'zod'
+import type { TagTag } from '../../models/ts/tag/Tag'
+
+export const tagTagSchema: z.ZodType<TagTag> = z.object({ 'id': z.number().optional(), 'name': z.string().optional() })

examples/client/src/gen/models/ts/petController/FindPetsByStatus.ts

@@ -24,8 +24,8 @@ export type FindPetsByStatusQueryParams = {
  * @description successful operation
  */
 export type FindPetsByStatusQueryResponse = Pet[]
-export namespace FindPetsByStatusQuery {
-  export type Response = FindPetsByStatusQueryResponse
-  export type QueryParams = FindPetsByStatusQueryParams
-  export type Errors = FindPetsByStatus400
+export type FindPetsByStatusQuery = {
+  Response: FindPetsByStatusQueryResponse
+  QueryParams: FindPetsByStatusQueryParams
+  Errors: FindPetsByStatus400
 }

examples/client/src/gen/models/ts/petController/FindPetsByTags.ts

@@ -41,9 +41,9 @@ export type FindPetsByTagsQueryParams = {
  * @description successful operation
  */
 export type FindPetsByTagsQueryResponse = Pet[]
-export namespace FindPetsByTagsQuery {
-  export type Response = FindPetsByTagsQueryResponse
-  export type QueryParams = FindPetsByTagsQueryParams
-  export type HeaderParams = FindPetsByTagsHeaderParams
-  export type Errors = FindPetsByTags400
+export type FindPetsByTagsQuery = {
+  Response: FindPetsByTagsQueryResponse
+  QueryParams: FindPetsByTagsQueryParams
+  HeaderParams: FindPetsByTagsHeaderParams
+  Errors: FindPetsByTags400
 }