@ai-sdk/openai 3.0.123 → 3.0.124

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @ai-sdk/openai
 
+## 3.0.124
+
+### Patch Changes
+
+- d131a3b: fix(openai): rewrite recursive Zod schemas that use `allOf` wrappers
+
 ## 3.0.123
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1125,7 +1125,7 @@ declare const openaiLanguageModelResponsesOptionsSchema: _ai_sdk_provider_utils.
     forceReasoning?: boolean | undefined;
     allowedTools?: {
         toolNames: string[];
-        mode?: "auto" | "required" | undefined;
+        mode?: "required" | "auto" | undefined;
     } | undefined;
 }>;
 type OpenAILanguageModelResponsesOptions = InferSchema<typeof openaiLanguageModelResponsesOptionsSchema>;

package/dist/index.d.ts

@@ -1125,7 +1125,7 @@ declare const openaiLanguageModelResponsesOptionsSchema: _ai_sdk_provider_utils.
     forceReasoning?: boolean | undefined;
     allowedTools?: {
         toolNames: string[];
-        mode?: "auto" | "required" | undefined;
+        mode?: "required" | "auto" | undefined;
     } | undefined;
 }>;
 type OpenAILanguageModelResponsesOptions = InferSchema<typeof openaiLanguageModelResponsesOptionsSchema>;

package/dist/index.js

@@ -93,6 +93,98 @@ function getGptVersion(modelId) {
   };
 }
 
+// src/normalize-openai-json-schema.ts
+function normalizeOpenAIJsonSchema(schema) {
+  const normalizedSchema = normalizeSchema(schema, true);
+  const reference = getSingletonReference(normalizedSchema);
+  if (reference == null) {
+    return normalizedSchema;
+  }
+  const { allOf: _allOf, ...schemaWithoutAllOf } = normalizedSchema;
+  const referencedSchema = getLocalReferenceSchema(reference, normalizedSchema);
+  return typeof referencedSchema !== "object" || referencedSchema == null ? normalizedSchema : { ...referencedSchema, ...schemaWithoutAllOf };
+  function normalizeSchema(schema2, isRoot = false) {
+    if (typeof schema2 !== "object" || schema2 == null) {
+      return schema2;
+    }
+    const normalizedSchema2 = { ...schema2 };
+    if (normalizedSchema2.properties != null) {
+      normalizedSchema2.properties = normalizeSchemaRecord(
+        normalizedSchema2.properties
+      );
+    }
+    if (normalizedSchema2.patternProperties != null) {
+      normalizedSchema2.patternProperties = normalizeSchemaRecord(
+        normalizedSchema2.patternProperties
+      );
+    }
+    if (normalizedSchema2.definitions != null) {
+      normalizedSchema2.definitions = normalizeSchemaRecord(
+        normalizedSchema2.definitions
+      );
+    }
+    if (normalizedSchema2.$defs != null) {
+      normalizedSchema2.$defs = normalizeSchemaRecord(normalizedSchema2.$defs);
+    }
+    if (normalizedSchema2.items != null) {
+      normalizedSchema2.items = Array.isArray(normalizedSchema2.items) ? normalizedSchema2.items.map((item) => normalizeSchema(item)) : normalizeSchema(normalizedSchema2.items);
+    }
+    if (normalizedSchema2.allOf != null) {
+      normalizedSchema2.allOf = normalizedSchema2.allOf.map(
+        (item) => normalizeSchema(item)
+      );
+    }
+    if (normalizedSchema2.anyOf != null) {
+      normalizedSchema2.anyOf = normalizedSchema2.anyOf.map(
+        (item) => normalizeSchema(item)
+      );
+    }
+    if (normalizedSchema2.oneOf != null) {
+      normalizedSchema2.oneOf = normalizedSchema2.oneOf.map(
+        (item) => normalizeSchema(item)
+      );
+    }
+    if (typeof normalizedSchema2.additionalProperties === "object" && normalizedSchema2.additionalProperties != null) {
+      normalizedSchema2.additionalProperties = normalizeSchema(
+        normalizedSchema2.additionalProperties
+      );
+    }
+    const reference2 = getSingletonReference(normalizedSchema2);
+    if (reference2 == null || isRoot) {
+      return normalizedSchema2;
+    }
+    const { allOf: _allOf2, ...schemaWithoutAllOf2 } = normalizedSchema2;
+    return { ...schemaWithoutAllOf2, $ref: reference2 };
+  }
+  function normalizeSchemaRecord(record) {
+    return Object.fromEntries(
+      Object.entries(record).map(([key, value]) => [
+        key,
+        normalizeSchema(value)
+      ])
+    );
+  }
+  function getSingletonReference(schema2) {
+    var _a2;
+    if (((_a2 = schema2.allOf) == null ? void 0 : _a2.length) !== 1) {
+      return void 0;
+    }
+    const [allOfSchema] = schema2.allOf;
+    return typeof allOfSchema === "object" && allOfSchema != null && Object.keys(allOfSchema).length === 1 && typeof allOfSchema.$ref === "string" ? allOfSchema.$ref : void 0;
+  }
+  function getLocalReferenceSchema(reference2, schema2) {
+    var _a2, _b;
+    const match = /^#\/(definitions|\$defs)\/(.+)$/.exec(reference2);
+    if (match == null) {
+      return void 0;
+    }
+    const [, keyword, encodedName] = match;
+    const name = encodedName.replace(/~1/g, "/").replace(/~0/g, "~");
+    const definition = keyword === "definitions" ? (_a2 = schema2.definitions) == null ? void 0 : _a2[name] : (_b = schema2.$defs) == null ? void 0 : _b[name];
+    return definition;
+  }
+}
+
 // src/openai-stream-error.ts
 var import_provider = require("@ai-sdk/provider");
 function createOpenAIProviderStreamError(frame) {
@@ -987,7 +1079,7 @@ var OpenAIChatLanguageModel = class {
       response_format: (responseFormat == null ? void 0 : responseFormat.type) === "json" ? responseFormat.schema != null ? {
         type: "json_schema",
         json_schema: {
-          schema: responseFormat.schema,
+          schema: normalizeOpenAIJsonSchema(responseFormat.schema),
           strict: strictJsonSchema,
           name: (_e = responseFormat.name) != null ? _e : "response",
           description: responseFormat.description
@@ -6000,7 +6092,7 @@ var OpenAIResponsesLanguageModel = class {
               strict: strictJsonSchema,
               name: (_h = responseFormat.name) != null ? _h : "response",
               description: responseFormat.description,
-              schema: responseFormat.schema
+              schema: normalizeOpenAIJsonSchema(responseFormat.schema)
             } : { type: "json_object" }
           },
           ...(openaiOptions == null ? void 0 : openaiOptions.textVerbosity) && {
@@ -8140,7 +8232,7 @@ var OpenAITranscriptionModel = class {
 };
 
 // src/version.ts
-var VERSION = true ? "3.0.123" : "0.0.0-test";
+var VERSION = true ? "3.0.124" : "0.0.0-test";
 
 // src/openai-provider.ts
 function createOpenAI(options = {}) {