@ai-sdk/openai 4.0.80 → 4.0.81

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @ai-sdk/openai
 
+## 4.0.81
+
+### Patch Changes
+
+- 4e94782: fix(openai): rewrite recursive Zod schemas that use `allOf` wrappers
+
 ## 4.0.80
 
 ### Patch Changes

package/dist/index.js

@@ -926,7 +926,7 @@ import {
 function normalizeOpenAIJsonSchema(schema) {
   let removedPropertyNames = false;
   let removedLookaroundPattern = false;
-  const normalizedSchema = normalizeSchema(schema);
+  const normalizedSchema = normalizeSchema(schema, true);
   const warnings = [];
   if (removedPropertyNames) {
     warnings.push({
@@ -946,7 +946,7 @@ function normalizeOpenAIJsonSchema(schema) {
     schema: normalizedSchema,
     warnings
   };
-  function normalizeSchema(schema2) {
+  function normalizeSchema(schema2, isRoot = false) {
     const propertyNames = schema2.propertyNames;
     if (propertyNames != null) {
       if (typeof propertyNames === "boolean" || propertyNames.type !== "string") {
@@ -1026,7 +1026,45 @@ function normalizeOpenAIJsonSchema(schema) {
         normalizedSchema2[keyword] = normalizeDefinition(conditionalSchema);
       }
     }
-    return normalizedSchema2;
+    const reference = getSingletonReference(normalizedSchema2);
+    if (reference == null) {
+      return normalizedSchema2;
+    }
+    const { allOf: _allOf, ...schemaWithoutAllOf } = normalizedSchema2;
+    if (!isRoot) {
+      return {
+        ...schemaWithoutAllOf,
+        $ref: reference
+      };
+    }
+    const referencedSchema = getLocalReferenceSchema(
+      reference,
+      normalizedSchema2
+    );
+    if (referencedSchema == null) {
+      return normalizedSchema2;
+    }
+    return {
+      ...referencedSchema,
+      ...schemaWithoutAllOf
+    };
+  }
+  function getSingletonReference(schema2) {
+    if (schema2.allOf?.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(reference, schema2) {
+    const match = /^#\/(definitions|\$defs)\/(.+)$/.exec(reference);
+    if (match == null) {
+      return void 0;
+    }
+    const [, keyword, encodedName] = match;
+    const name = encodedName.replace(/~1/g, "/").replace(/~0/g, "~");
+    const definition = keyword === "definitions" ? schema2.definitions?.[name] : schema2.$defs?.[name];
+    return typeof definition === "object" && definition != null ? definition : void 0;
   }
   function normalizeSchemaRecord(schemas) {
     return Object.fromEntries(
@@ -12054,7 +12092,7 @@ var OpenAISkills = class {
 };
 
 // src/version.ts
-var VERSION = true ? "4.0.80" : "0.0.0-test";
+var VERSION = true ? "4.0.81" : "0.0.0-test";
 
 // src/openai-provider.ts
 function createOpenAI(options = {}) {