chore: update examples

kubb-labs · Nov 26, 2023 · 17daeec · 17daeec
1 parent 58235db
commit 17daeec
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 25 deletions.
diff --git a/examples/advanced/src/gen/zod/petController/findPetsByStatusSchema.ts b/examples/advanced/src/gen/zod/petController/findPetsByStatusSchema.ts
@@ -6,7 +6,7 @@ import { petSchema } from '../petSchema'
  */
 export const findPetsByStatus400Schema = z.any()
 export const findPetsByStatusQueryParamsSchema = z.object({
-  'status': z.enum([`available`, `pending`, `sold`]).describe(`Status values that need to be considered for filter`).default('available').optional(),
+  'status': z.enum([`available`, `pending`, `sold`]).default('available').describe(`Status values that need to be considered for filter`).optional(),
 })
 
 /**

diff --git a/examples/advanced/src/gen/zod/userSchema.ts b/examples/advanced/src/gen/zod/userSchema.ts
@@ -5,7 +5,7 @@ export const userSchema = z.object({
   'username': z.string().optional(),
   'firstName': z.string().optional(),
   'lastName': z.string().optional(),
-  'email': z.string().optional(),
+  'email': z.string().email().optional(),
   'password': z.string().optional(),
   'phone': z.string().optional(),
   'userStatus': z.number().describe(`User Status`).optional(),

diff --git a/examples/zod/src/gen/zod/findPetsByStatusSchema.ts b/examples/zod/src/gen/zod/findPetsByStatusSchema.ts
@@ -6,7 +6,7 @@ import { petSchema } from './petSchema'
  */
 export const findPetsByStatus400Schema = z.any()
 export const findPetsByStatusQueryParamsSchema = z.object({
-  status: z.enum([`available`, `pending`, `sold`]).describe(`Status values that need to be considered for filter`).default('available').optional(),
+  status: z.enum([`available`, `pending`, `sold`]).default('available').describe(`Status values that need to be considered for filter`).optional(),
 })
 
 /**

diff --git a/examples/zod/src/gen/zod/getInventorySchema.ts b/examples/zod/src/gen/zod/getInventorySchema.ts
@@ -3,4 +3,4 @@ import { z } from 'zod'
 /**
  * @description successful operation
  */
-export const getInventoryQueryResponseSchema = z.object({}).catchall(z.number())
+export const getInventoryQueryResponseSchema = z.object({}).catchall(z.number().min(-2147483648).max(2147483647))
diff --git a/examples/zod/src/gen/zod/userSchema.ts b/examples/zod/src/gen/zod/userSchema.ts
@@ -5,7 +5,7 @@ export const userSchema = z.object({
   username: z.string().optional(),
   firstName: z.string().optional(),
   lastName: z.string().optional(),
-  email: z.string().optional(),
+  email: z.string().email().optional(),
   password: z.string().optional(),
   phone: z.string().optional(),
   userStatus: z.number().describe(`User Status`).optional(),

diff --git a/examples/zodios/src/gen/zod/findPetsByStatusSchema.ts b/examples/zodios/src/gen/zod/findPetsByStatusSchema.ts
@@ -6,7 +6,7 @@ import { petSchema } from './petSchema'
  */
 export const findPetsByStatus400Schema = z.any()
 export const findPetsByStatusQueryParamsSchema = z.object({
-  status: z.enum([`available`, `pending`, `sold`]).describe(`Status values that need to be considered for filter`).default('available').optional(),
+  status: z.enum([`available`, `pending`, `sold`]).default('available').describe(`Status values that need to be considered for filter`).optional(),
 })
 
 /**

diff --git a/examples/zodios/src/gen/zod/getInventorySchema.ts b/examples/zodios/src/gen/zod/getInventorySchema.ts
@@ -3,4 +3,4 @@ import { z } from 'zod'
 /**
  * @description successful operation
  */
-export const getInventoryQueryResponseSchema = z.object({}).catchall(z.number())
+export const getInventoryQueryResponseSchema = z.object({}).catchall(z.number().min(-2147483648).max(2147483647))
diff --git a/examples/zodios/src/gen/zod/userSchema.ts b/examples/zodios/src/gen/zod/userSchema.ts
@@ -5,7 +5,7 @@ export const userSchema = z.object({
   username: z.string().optional(),
   firstName: z.string().optional(),
   lastName: z.string().optional(),
-  email: z.string().optional(),
+  email: z.string().email().optional(),
   password: z.string().optional(),
   phone: z.string().optional(),
   userStatus: z.number().describe(`User Status`).optional(),

diff --git a/packages/swagger-zod/src/ZodGenerator.ts b/packages/swagger-zod/src/ZodGenerator.ts
@@ -162,6 +162,21 @@ export class ZodGenerator extends Generator<PluginOptions['resolvedOptions'], Co
       return this.#getRefAlias(schema, baseName)
     }
 
+    const baseItems: ZodMeta[] = []
+
+    if (schema.default !== undefined && !Array.isArray(schema.default)) {
+      if (typeof schema.default === 'string') {
+        baseItems.push({ keyword: zodKeywords.default, args: `"${schema.default}"` })
+      }
+      if (typeof schema.default === 'boolean') {
+        baseItems.push({ keyword: zodKeywords.default, args: schema.default ?? false })
+      }
+    }
+
+    if (schema.description) {
+      baseItems.push({ keyword: zodKeywords.describe, args: `\`${schema.description.replaceAll('\n', ' ').replaceAll('`', "'")}\`` })
+    }
+
     if (schema.oneOf) {
       // union
       const schemaWithoutOneOf = { ...schema, oneOf: undefined }
@@ -240,6 +255,7 @@ export class ZodGenerator extends Generator<PluginOptions['resolvedOptions'], Co
             keyword: zodKeywords.enum,
             args: [...new Set(schema['x-enumNames'] as string[])].map((value: string) => `\`${value}\``),
           },
+          ...baseItems,
         ]
       }
 
@@ -255,6 +271,7 @@ export class ZodGenerator extends Generator<PluginOptions['resolvedOptions'], Co
               }
             }),
           },
+          ...baseItems,
         ]
       }
 
@@ -263,12 +280,13 @@ export class ZodGenerator extends Generator<PluginOptions['resolvedOptions'], Co
           keyword: zodKeywords.enum,
           args: [...new Set(schema.enum)].map((value: string) => `\`${value}\``),
         },
+        ...baseItems,
       ]
     }
 
     if ('items' in schema) {
       // items -> array
-      return [{ keyword: zodKeywords.array, args: this.getTypeFromSchema(schema.items as OasTypes.SchemaObject, baseName) }]
+      return [{ keyword: zodKeywords.array, args: this.getTypeFromSchema(schema.items as OasTypes.SchemaObject, baseName) }, ...baseItems]
     }
 
     if ('prefixItems' in schema) {
@@ -322,20 +340,6 @@ export class ZodGenerator extends Generator<PluginOptions['resolvedOptions'], Co
           nullable ? { keyword: zodKeywords.nullable } : undefined,
         ].filter(Boolean)
       }
-      const baseItems: ZodMeta[] = []
-
-      if (schema.default !== undefined && !Array.isArray(schema.default)) {
-        if (typeof schema.default === 'string') {
-          baseItems.push({ keyword: zodKeywords.default, args: `"${schema.default}"` })
-        }
-        if (typeof schema.default === 'boolean') {
-          baseItems.push({ keyword: zodKeywords.default, args: schema.default ?? false })
-        }
-      }
-
-      if (schema.description) {
-        baseItems.push({ keyword: zodKeywords.describe, args: `\`${schema.description.replaceAll('\n', ' ').replaceAll('`', "'")}\`` })
-      }
 
       if (schema.type === zodKeywords.number || schema.type === zodKeywords.integer) {
         const min = schema.minimum ?? schema.minLength ?? schema.minItems ?? undefined

diff --git a/packages/swagger-zod/src/zodParser.test.ts b/packages/swagger-zod/src/zodParser.test.ts
@@ -153,10 +153,10 @@ const input = [
       keyword: 'object',
       args: {
         firstName: [{ keyword: 'string' }, { keyword: 'min', args: 2 }],
-        address: [{ keyword: 'string' }, { keyword: 'null' }, { keyword: 'describe', args: '"Your address"' }],
+        address: [{ keyword: 'string' }, { keyword: 'nullable' }, { keyword: 'describe', args: '"Your address"' }],
       },
     }),
-    expected: 'z.object({"firstName": z.string().min(2),"address": z.string().describe("Your address").nullable()})',
+    expected: 'z.object({"firstName": z.string().min(2),"address": z.string().nullable().describe("Your address")})',
   },
   {
     input: parseZodMeta({