feat: Give format precendence over type property (#935)

* fix: Give format precendence over type property * chore: update examples * chore: use of bun for e2e * chore: filer regex out of enum type
kubb-labs · Apr 13, 2024 · 316d067 · 316d067
1 parent 859078d
commit 316d067
Show file tree

Hide file tree

Showing 328 changed files with 4,163 additions and 4,374 deletions.
diff --git a/.changeset/green-tips-hope.md b/.changeset/green-tips-hope.md
@@ -0,0 +1,9 @@
+---
+"@kubb/swagger-tanstack-query": minor
+"@kubb/swagger-faker": minor
+"@kubb/swagger-zod": minor
+"@kubb/swagger-ts": minor
+"@kubb/swagger": minor
+---
+
+Give format precendence over type property
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -92,5 +92,5 @@ jobs:
           env:
             NODE_OPTIONS: "--max_old_space_size=4096"
           run: |
-            ${{ matrix.installer }} generate
+            ${{ matrix.installer }} generate --bun
 
diff --git a/examples/advanced/src/gen/models/ts/AddPetRequest.ts b/examples/advanced/src/gen/models/ts/AddPetRequest.ts
@@ -9,7 +9,7 @@ export const AddPetRequestStatusEnum = {
 export type AddPetRequestStatusEnum = (typeof AddPetRequestStatusEnum)[keyof typeof AddPetRequestStatusEnum]
 export type AddPetRequest = {
   /**
-   * @type integer | undefined int64
+   * @type integer | undefined, int64
    */
   id?: number
   /**

diff --git a/examples/advanced/src/gen/models/ts/ApiResponse.ts b/examples/advanced/src/gen/models/ts/ApiResponse.ts
@@ -1,6 +1,6 @@
 export type ApiResponse = {
   /**
-   * @type integer | undefined int32
+   * @type integer | undefined, int32
    */
   code?: number
   /**

diff --git a/examples/advanced/src/gen/models/ts/Category.ts b/examples/advanced/src/gen/models/ts/Category.ts
@@ -1,6 +1,6 @@
 export type Category = {
   /**
-   * @type integer | undefined int64
+   * @type integer | undefined, int64
    */
   id?: number
   /**

diff --git a/examples/advanced/src/gen/models/ts/Customer.ts b/examples/advanced/src/gen/models/ts/Customer.ts
@@ -2,7 +2,7 @@ import type { Address } from './Address'
 
 export type Customer = {
   /**
-   * @type integer | undefined int64
+   * @type integer | undefined, int64
    */
   id?: number
   /**

diff --git a/examples/advanced/src/gen/models/ts/Order.ts b/examples/advanced/src/gen/models/ts/Order.ts
@@ -16,15 +16,15 @@ export const OrderHttpStatusEnum = {
 export type OrderHttpStatusEnum = (typeof OrderHttpStatusEnum)[keyof typeof OrderHttpStatusEnum]
 export type Order = {
   /**
-   * @type integer | undefined int64
+   * @type integer | undefined, int64
    */
   id?: number
   /**
-   * @type integer | undefined int64
+   * @type integer | undefined, int64
    */
   petId?: number
   /**
-   * @type integer | undefined int32
+   * @type integer | undefined, int32
    */
   quantity?: number
   /**
@@ -37,7 +37,7 @@ export type Order = {
    */
   type?: string
   /**
-   * @type string | undefined date-time
+   * @type string | undefined, date-time
    */
   shipDate?: Date
   /**

diff --git a/examples/advanced/src/gen/models/ts/Pet.ts b/examples/advanced/src/gen/models/ts/Pet.ts
@@ -9,7 +9,7 @@ export const PetStatusEnum = {
 export type PetStatusEnum = (typeof PetStatusEnum)[keyof typeof PetStatusEnum]
 export type Pet = {
   /**
-   * @type integer | undefined int64
+   * @type integer | undefined, int64
    */
   readonly id?: number
   /**

diff --git a/examples/advanced/src/gen/models/ts/PetNotFound.ts b/examples/advanced/src/gen/models/ts/PetNotFound.ts
@@ -1,6 +1,6 @@
 export type PetNotFound = {
   /**
-   * @type integer | undefined int32
+   * @type integer | undefined, int32
    */
   code?: number
   /**

diff --git a/examples/advanced/src/gen/models/ts/User.ts b/examples/advanced/src/gen/models/ts/User.ts
@@ -1,6 +1,6 @@
 export type User = {
   /**
-   * @type integer | undefined int64
+   * @type integer | undefined, int64
    */
   id?: number
   /**
@@ -29,7 +29,7 @@ export type User = {
   phone?: string
   /**
    * @description User Status
-   * @type integer | undefined int32
+   * @type integer | undefined, int32
    */
   userStatus?: number
 }
diff --git a/examples/advanced/src/gen/models/ts/petController/AddPet.ts b/examples/advanced/src/gen/models/ts/petController/AddPet.ts
@@ -11,7 +11,7 @@ export type AddPet200 = Pet
  */
 export type AddPet405 = {
   /**
-   * @type integer | undefined int32
+   * @type integer | undefined, int32
    */
   code?: number
   /**

diff --git a/examples/advanced/src/gen/models/ts/petController/DeletePet.ts b/examples/advanced/src/gen/models/ts/petController/DeletePet.ts
@@ -1,7 +1,7 @@
 export type DeletePetPathParams = {
   /**
    * @description Pet id to delete
-   * @type integer int64
+   * @type integer, int64
    */
   petId: number
 }

diff --git a/examples/advanced/src/gen/models/ts/petController/GetPetById.ts b/examples/advanced/src/gen/models/ts/petController/GetPetById.ts
@@ -3,7 +3,7 @@ import type { Pet } from '../Pet'
 export type GetPetByIdPathParams = {
   /**
    * @description ID of pet to return
-   * @type integer int64
+   * @type integer, int64
    */
   petId: number
 }

diff --git a/examples/advanced/src/gen/models/ts/petController/UpdatePetWithForm.ts b/examples/advanced/src/gen/models/ts/petController/UpdatePetWithForm.ts
@@ -1,7 +1,7 @@
 export type UpdatePetWithFormPathParams = {
   /**
    * @description ID of pet that needs to be updated
-   * @type integer int64
+   * @type integer, int64
    */
   petId: number
 }

diff --git a/examples/advanced/src/gen/models/ts/petController/UploadFile.ts b/examples/advanced/src/gen/models/ts/petController/UploadFile.ts
@@ -3,7 +3,7 @@ import type { ApiResponse } from '../ApiResponse'
 export type UploadFilePathParams = {
   /**
    * @description ID of pet to update
-   * @type integer int64
+   * @type integer, int64
    */
   petId: number
 }

diff --git a/examples/advanced/src/gen/models/ts/storeController/DeleteOrder.ts b/examples/advanced/src/gen/models/ts/storeController/DeleteOrder.ts
@@ -1,7 +1,7 @@
 export type DeleteOrderPathParams = {
   /**
    * @description ID of the order that needs to be deleted
-   * @type integer int64
+   * @type integer, int64
    */
   orderId: number
 }

diff --git a/examples/advanced/src/gen/models/ts/storeController/GetOrderById.ts b/examples/advanced/src/gen/models/ts/storeController/GetOrderById.ts
@@ -3,7 +3,7 @@ import type { Order } from '../Order'
 export type GetOrderByIdPathParams = {
   /**
    * @description ID of order that needs to be fetched
-   * @type integer int64
+   * @type integer, int64
    */
   orderId: number
 }

diff --git a/examples/advanced/src/gen/models/ts/tag/Tag.ts b/examples/advanced/src/gen/models/ts/tag/Tag.ts
@@ -1,6 +1,6 @@
 export type TagTag = {
   /**
-   * @type integer | undefined int64
+   * @type integer | undefined, int64
    */
   id?: number
   /**

diff --git a/examples/client/src/gen/models/ts/AddPetRequest.ts b/examples/client/src/gen/models/ts/AddPetRequest.ts
@@ -9,7 +9,7 @@ export const AddPetRequestStatus = {
 export type AddPetRequestStatus = (typeof AddPetRequestStatus)[keyof typeof AddPetRequestStatus]
 export type AddPetRequest = {
   /**
-   * @type integer | undefined int64
+   * @type integer | undefined, int64
    */
   id?: number
   /**

diff --git a/examples/client/src/gen/models/ts/ApiResponse.ts b/examples/client/src/gen/models/ts/ApiResponse.ts
@@ -1,6 +1,6 @@
 export type ApiResponse = {
   /**
-   * @type integer | undefined int32
+   * @type integer | undefined, int32
    */
   code?: number
   /**

diff --git a/examples/client/src/gen/models/ts/Category.ts b/examples/client/src/gen/models/ts/Category.ts
@@ -1,6 +1,6 @@
 export type Category = {
   /**
-   * @type integer | undefined int64
+   * @type integer | undefined, int64
    */
   id?: number
   /**

diff --git a/examples/client/src/gen/models/ts/Customer.ts b/examples/client/src/gen/models/ts/Customer.ts
@@ -2,7 +2,7 @@ import type { Address } from './Address'
 
 export type Customer = {
   /**
-   * @type integer | undefined int64
+   * @type integer | undefined, int64
    */
   id?: number
   /**

diff --git a/examples/client/src/gen/models/ts/Order.ts b/examples/client/src/gen/models/ts/Order.ts
@@ -11,19 +11,19 @@ export const OrderHttpStatus = {
 export type OrderHttpStatus = (typeof OrderHttpStatus)[keyof typeof OrderHttpStatus]
 export type Order = {
   /**
-   * @type integer | undefined int64
+   * @type integer | undefined, int64
    */
   id?: number
   /**
-   * @type integer | undefined int64
+   * @type integer | undefined, int64
    */
   petId?: number
   /**
-   * @type integer | undefined int32
+   * @type integer | undefined, int32
    */
   quantity?: number
   /**
-   * @type string | undefined date-time
+   * @type string | undefined, date-time
    */
   shipDate?: Date
   /**

diff --git a/examples/client/src/gen/models/ts/Pet.ts b/examples/client/src/gen/models/ts/Pet.ts
@@ -9,7 +9,7 @@ export const PetStatus = {
 export type PetStatus = (typeof PetStatus)[keyof typeof PetStatus]
 export type Pet = {
   /**
-   * @type integer | undefined int64
+   * @type integer | undefined, int64
    */
   id?: number
   /**

diff --git a/examples/client/src/gen/models/ts/PetNotFound.ts b/examples/client/src/gen/models/ts/PetNotFound.ts
@@ -1,6 +1,6 @@
 export type PetNotFound = {
   /**
-   * @type integer | undefined int32
+   * @type integer | undefined, int32
    */
   code?: number
   /**

diff --git a/examples/client/src/gen/models/ts/Tag.ts b/examples/client/src/gen/models/ts/Tag.ts
@@ -1,6 +1,6 @@
 export type Tag = {
   /**
-   * @type integer | undefined int64
+   * @type integer | undefined, int64
    */
   id?: number
   /**

diff --git a/examples/client/src/gen/models/ts/User.ts b/examples/client/src/gen/models/ts/User.ts
@@ -1,6 +1,6 @@
 export type User = {
   /**
-   * @type integer | undefined int64
+   * @type integer | undefined, int64
    */
   id?: number
   /**
@@ -29,7 +29,7 @@ export type User = {
   phone?: string
   /**
    * @description User Status
-   * @type integer | undefined int32
+   * @type integer | undefined, int32
    */
   userStatus?: number
 }
diff --git a/examples/client/src/gen/models/ts/petController/AddPet.ts b/examples/client/src/gen/models/ts/petController/AddPet.ts
@@ -11,7 +11,7 @@ export type AddPet200 = Pet
  */
 export type AddPet405 = {
   /**
-   * @type integer | undefined int32
+   * @type integer | undefined, int32
    */
   code?: number
   /**

diff --git a/examples/client/src/gen/models/ts/petController/DeletePet.ts b/examples/client/src/gen/models/ts/petController/DeletePet.ts
@@ -1,7 +1,7 @@
 export type DeletePetPathParams = {
   /**
    * @description Pet id to delete
-   * @type integer int64
+   * @type integer, int64
    */
   petId: number
 }

diff --git a/examples/client/src/gen/models/ts/petController/GetPetById.ts b/examples/client/src/gen/models/ts/petController/GetPetById.ts
@@ -3,7 +3,7 @@ import type { Pet } from '../Pet'
 export type GetPetByIdPathParams = {
   /**
    * @description ID of pet to return
-   * @type integer int64
+   * @type integer, int64
    */
   petId: number
 }

diff --git a/examples/client/src/gen/models/ts/petController/UpdatePetWithForm.ts b/examples/client/src/gen/models/ts/petController/UpdatePetWithForm.ts
@@ -1,7 +1,7 @@
 export type UpdatePetWithFormPathParams = {
   /**
    * @description ID of pet that needs to be updated
-   * @type integer int64
+   * @type integer, int64
    */
   petId: number
 }

diff --git a/examples/client/src/gen/models/ts/petController/UploadFile.ts b/examples/client/src/gen/models/ts/petController/UploadFile.ts
@@ -3,7 +3,7 @@ import type { ApiResponse } from '../ApiResponse'
 export type UploadFilePathParams = {
   /**
    * @description ID of pet to update
-   * @type integer int64
+   * @type integer, int64
    */
   petId: number
 }

diff --git a/examples/client/src/gen/models/ts/storeController/DeleteOrder.ts b/examples/client/src/gen/models/ts/storeController/DeleteOrder.ts
@@ -1,7 +1,7 @@
 export type DeleteOrderPathParams = {
   /**
    * @description ID of the order that needs to be deleted
-   * @type integer int64
+   * @type integer, int64
    */
   orderId: number
 }

diff --git a/examples/client/src/gen/models/ts/storeController/GetOrderById.ts b/examples/client/src/gen/models/ts/storeController/GetOrderById.ts
@@ -3,7 +3,7 @@ import type { Order } from '../Order'
 export type GetOrderByIdPathParams = {
   /**
    * @description ID of order that needs to be fetched
-   * @type integer int64
+   * @type integer, int64
    */
   orderId: number
 }

diff --git a/examples/faker/src/gen/models/Address.ts b/examples/faker/src/gen/models/Address.ts
@@ -22,5 +22,8 @@ export type Address = {
    * @type string | undefined
    */
   zip?: string
+  /**
+   * @type array | undefined
+   */
   identifier?: [number, string, AddressIdentifier]
 }
diff --git a/examples/faker/src/gen/models/ApiResponse.ts b/examples/faker/src/gen/models/ApiResponse.ts
@@ -1,6 +1,6 @@
 export type ApiResponse = {
   /**
-   * @type integer | undefined int32
+   * @type integer | undefined, int32
    */
   code?: number
   /**

diff --git a/examples/faker/src/gen/models/Category.ts b/examples/faker/src/gen/models/Category.ts
@@ -1,6 +1,6 @@
 export type Category = {
   /**
-   * @type integer | undefined int64
+   * @type integer | undefined, int64
    */
   id?: number
   /**

diff --git a/examples/faker/src/gen/models/Customer.ts b/examples/faker/src/gen/models/Customer.ts
@@ -2,7 +2,7 @@ import type { Address } from './Address'
 
 export type Customer = {
   /**
-   * @type integer | undefined int64
+   * @type integer | undefined, int64
    */
   id?: number
   /**

diff --git a/examples/faker/src/gen/models/DeleteOrder.ts b/examples/faker/src/gen/models/DeleteOrder.ts
@@ -1,7 +1,7 @@
 export type DeleteOrderPathParams = {
   /**
    * @description ID of the order that needs to be deleted
-   * @type integer int64
+   * @type integer, int64
    */
   orderId: number
 }

diff --git a/examples/faker/src/gen/models/DeletePet.ts b/examples/faker/src/gen/models/DeletePet.ts
@@ -1,7 +1,7 @@
 export type DeletePetPathParams = {
   /**
    * @description Pet id to delete
-   * @type integer int64
+   * @type integer, int64
    */
   petId: number
 }