@ai-sdk/google 2.0.90 → 2.0.93

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @ai-sdk/google
 
+## 2.0.93
+
+### Patch Changes
+
+- a3fe2a8: fix(google): convert enum values to the Gemini schema format
+
+## 2.0.92
+
+### Patch Changes
+
+- Updated dependencies [77d33c0]
+  - @ai-sdk/provider-utils@3.0.35
+
+## 2.0.91
+
+### Patch Changes
+
+- b616db6: Preserve recursive tool input schemas without aborting Google model calls.
+- Updated dependencies [2fff9f1]
+- Updated dependencies [f364ea0]
+  - @ai-sdk/provider-utils@3.0.34
+
 ## 2.0.90
 
 ### Patch Changes

package/dist/index.js

@@ -30,7 +30,7 @@ module.exports = __toCommonJS(index_exports);
 var import_provider_utils15 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "2.0.90" : "0.0.0-test";
+var VERSION = true ? "2.0.93" : "0.0.0-test";
 
 // src/google-generative-ai-embedding-model.ts
 var import_provider = require("@ai-sdk/provider");
@@ -243,6 +243,10 @@ var import_v45 = require("zod/v4");
 
 // src/convert-json-schema-to-openapi-schema.ts
 var import_provider2 = require("@ai-sdk/provider");
+var recursiveReferenceFunctionalityPrefix = "recursive JSON Schema reference:";
+function isRecursiveJSONSchemaReferenceError(error) {
+  return import_provider2.UnsupportedFunctionalityError.isInstance(error) && error.functionality.startsWith(recursiveReferenceFunctionalityPrefix);
+}
 function convertJSONSchemaToOpenAPISchema(jsonSchema, isRoot = true) {
   const rootSchema = typeof jsonSchema === "object" ? jsonSchema : void 0;
   return convertJSONSchemaDefinition(jsonSchema, isRoot, {
@@ -293,9 +297,6 @@ function convertJSONSchemaDefinition(jsonSchema, isRoot, referenceContext) {
   if (description) result.description = description;
   if (required) result.required = required;
   if (format) result.format = format;
-  if (constValue !== void 0) {
-    result.enum = [constValue];
-  }
   if (type) {
     if (Array.isArray(type)) {
       const hasNull = type.includes("null");
@@ -312,8 +313,9 @@ function convertJSONSchemaDefinition(jsonSchema, isRoot, referenceContext) {
       result.type = type;
     }
   }
-  if (enumValues !== void 0) {
-    result.enum = enumValues;
+  const values = enumValues != null ? enumValues : constValue !== void 0 ? [constValue] : void 0;
+  if (values !== void 0) {
+    addEnumToSchema({ values, type, result });
   }
   if (properties != null) {
     result.properties = Object.entries(properties).reduce(
@@ -373,6 +375,68 @@ function convertJSONSchemaDefinition(jsonSchema, isRoot, referenceContext) {
   }
   return result;
 }
+function addEnumToSchema({
+  values,
+  type,
+  result
+}) {
+  const nullable = Array.isArray(type) && type.includes("null") || type === void 0 && values.includes(null);
+  const enumValues = nullable ? values.filter((value) => value !== null) : values;
+  if (values.length > 0 && values.every((value) => value === null)) {
+    const typeAllowsNull = type === void 0 || type === "null" || Array.isArray(type) && type.includes("null");
+    if (typeAllowsNull) {
+      result.type = "null";
+      if (Array.isArray(type)) {
+        delete result.anyOf;
+      }
+      return;
+    }
+  }
+  const enumType = getEnumType({ values: enumValues, type });
+  if (enumType === void 0) {
+    throw new import_provider2.UnsupportedFunctionalityError({
+      functionality: "JSON Schema enum with mixed or unsupported values",
+      message: "Google does not support this JSON Schema enum. Enum values must share one supported primitive type and match the schema type."
+    });
+  }
+  result.type = enumType;
+  if (Array.isArray(type)) {
+    delete result.anyOf;
+  }
+  if (nullable) {
+    result.nullable = true;
+  }
+  if (enumType === "string") {
+    result.enum = enumValues;
+  } else {
+    result.format = "enum";
+    result.enum = enumValues.map(String);
+  }
+}
+function getEnumType({
+  values,
+  type
+}) {
+  if (values.length === 0) {
+    return void 0;
+  }
+  const typeAllows = (enumType) => type === void 0 || type === enumType || Array.isArray(type) && type.includes(enumType);
+  if (typeAllows("string") && values.every((value) => typeof value === "string")) {
+    return "string";
+  }
+  if ((typeAllows("number") || typeAllows("integer")) && values.every((value) => typeof value === "number" && Number.isFinite(value))) {
+    if (typeAllows("number")) {
+      return "number";
+    }
+    if (values.every((value) => Number.isInteger(value))) {
+      return "integer";
+    }
+  }
+  if (typeAllows("boolean") && values.every((value) => typeof value === "boolean")) {
+    return "boolean";
+  }
+  return void 0;
+}
 function convertJSONSchemaReference({
   jsonSchema,
   reference,
@@ -385,7 +449,7 @@ function convertJSONSchemaReference({
   );
   if (referenceContext.resolvingReferences.has(referenceKey)) {
     throw new import_provider2.UnsupportedFunctionalityError({
-      functionality: `recursive JSON Schema reference: ${reference}`,
+      functionality: `${recursiveReferenceFunctionalityPrefix} ${reference}`,
       message: "Google schema conversion does not support recursive JSON Schema references."
     });
   }
@@ -871,7 +935,6 @@ function prepareTools({
   modelId,
   isVertexProvider = false
 }) {
-  var _a, _b;
   tools = (tools == null ? void 0 : tools.length) ? tools : void 0;
   const toolWarnings = [];
   const { supportsGemini2Tools, supportsFileSearch, usesGemini3Features } = getGoogleModelCapabilities(modelId);
@@ -992,11 +1055,7 @@ function prepareTools({
       const functionDeclarations2 = [];
       for (const tool of tools) {
         if (tool.type === "function") {
-          functionDeclarations2.push({
-            name: tool.name,
-            description: (_a = tool.description) != null ? _a : "",
-            parameters: convertJSONSchemaToOpenAPISchema(tool.inputSchema)
-          });
+          functionDeclarations2.push(prepareFunctionDeclaration(tool));
         }
       }
       const combinedToolConfig = {
@@ -1040,11 +1099,7 @@ function prepareTools({
   for (const tool of tools) {
     switch (tool.type) {
       case "function":
-        functionDeclarations.push({
-          name: tool.name,
-          description: (_b = tool.description) != null ? _b : "",
-          parameters: convertJSONSchemaToOpenAPISchema(tool.inputSchema)
-        });
+        functionDeclarations.push(prepareFunctionDeclaration(tool));
         if (tool.strict === true) {
           hasStrictTools = true;
         }
@@ -1108,6 +1163,27 @@ function prepareTools({
     }
   }
 }
+function prepareFunctionDeclaration(tool) {
+  var _a;
+  const declaration = {
+    name: tool.name,
+    description: (_a = tool.description) != null ? _a : ""
+  };
+  try {
+    return {
+      ...declaration,
+      parameters: convertJSONSchemaToOpenAPISchema(tool.inputSchema)
+    };
+  } catch (error) {
+    if (!isRecursiveJSONSchemaReferenceError(error)) {
+      throw error;
+    }
+    return {
+      ...declaration,
+      parametersJsonSchema: tool.inputSchema
+    };
+  }
+}
 
 // src/map-google-generative-ai-finish-reason.ts
 function mapGoogleGenerativeAIFinishReason({