fixes

Author: karpetrosyan

examples/parsing.ts

@@ -1,6 +1,6 @@
 import { zodResponseFormat } from 'openai/helpers/zod';
 import OpenAI from 'openai/index';
-import { z } from 'zod/v3';
+import { z } from 'zod/v3'; // Also works for 'zod/v4'
 
 const Step = z.object({
   explanation: z.string(),

src/helpers/zod.ts

@@ -25,6 +25,10 @@ function zodToJsonSchema(schema: ZodType, options: { name: string }): Record<str
   });
 }
 
+function nativeToJsonSchema(schema: ZodTypeV4): Record<string, unknown> {
+  return toJSONSchema(schema, { target: 'draft-7' }) as Record<string, unknown>;
+}
+
 function isZodV4(zodObject: ZodType | ZodTypeV4): zodObject is ZodTypeV4 {
   return '_zod' in zodObject;
 }
@@ -90,7 +94,7 @@ export function zodResponseFormat<ZodInput extends ZodType | ZodTypeV4>(
         strict: true,
         schema:
           isZodV4(zodObject) ?
-            (toStrictJsonSchema(toJSONSchema(zodObject) as JSONSchema) as Record<string, unknown>)
+            (toStrictJsonSchema(nativeToJsonSchema(zodObject)) as Record<string, unknown>)
           : zodToJsonSchema(zodObject, { name }),
       },
     },
@@ -121,7 +125,7 @@ export function zodTextFormat<ZodInput extends ZodType | ZodTypeV4>(
       strict: true,
       schema:
         isZodV4(zodObject) ?
-          (toStrictJsonSchema(toJSONSchema(zodObject) as JSONSchema) as Record<string, unknown>)
+          (toStrictJsonSchema(nativeToJsonSchema(zodObject)) as Record<string, unknown>)
         : zodToJsonSchema(zodObject, { name }),
     },
     (content) => zodObject.parse(JSON.parse(content)),
@@ -166,7 +170,7 @@ export function zodFunction<Parameters extends ZodType | ZodTypeV4>(options: {
         name: options.name,
         parameters:
           isZodV4(options.parameters) ?
-            toJSONSchema(options.parameters)
+            nativeToJsonSchema(options.parameters)
           : zodToJsonSchema(options.parameters, { name: options.name }),
         strict: true,
         ...(options.description ? { description: options.description } : undefined),

tests/helpers/zod.test.ts

@@ -1,7 +1,11 @@
 import { zodResponseFormat } from 'openai/helpers/zod';
-import { z } from 'zod/v3';
+import { z as zv3 } from 'zod/v3';
+import { z as zv4 } from 'zod';
 
-describe('zodResponseFormat', () => {
+describe.each([
+  { version: 'v3', z: zv3 as any },
+  { version: 'v4', z: zv4 as any },
+])('zodResponseFormat (Zod $version)', ({ version, z }) => {
   it('does the thing', () => {
     expect(
       zodResponseFormat(
@@ -286,7 +290,7 @@ describe('zodResponseFormat', () => {
     `);
   });
 
-  it('throws error on optional fields', () => {
+  (version === 'v4' ? it.skip : it)('throws error on optional fields', () => {
     expect(() =>
       zodResponseFormat(
         z.object({
@@ -301,7 +305,7 @@ describe('zodResponseFormat', () => {
     );
   });
 
-  it('throws error on nested optional fields', () => {
+  (version === 'v4' ? it.skip : it)('throws error on nested optional fields', () => {
     expect(() =>
       zodResponseFormat(
         z.object({