@ai-sdk/google 3.0.110 → 3.0.112

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @ai-sdk/google
 
+## 3.0.112
+
+### Patch Changes
+
+- Updated dependencies [2d172fb]
+  - @ai-sdk/provider-utils@4.0.47
+
+## 3.0.111
+
+### Patch Changes
+
+- c715588: Inline local JSON Schema references in Google tool and structured-output schemas.
+
 ## 3.0.110
 
 ### Patch Changes

package/dist/index.js

@@ -30,7 +30,7 @@ module.exports = __toCommonJS(index_exports);
 var import_provider_utils23 = require("@ai-sdk/provider-utils");
 
 // src/version.ts
-var VERSION = true ? "3.0.110" : "0.0.0-test";
+var VERSION = true ? "3.0.112" : "0.0.0-test";
 
 // src/google-generative-ai-embedding-model.ts
 var import_provider = require("@ai-sdk/provider");
@@ -289,22 +289,39 @@ function convertGoogleGenerativeAIUsage(usage) {
 }
 
 // src/convert-json-schema-to-openapi-schema.ts
+var import_provider2 = require("@ai-sdk/provider");
 function convertJSONSchemaToOpenAPISchema(jsonSchema, isRoot = true) {
+  const rootSchema = typeof jsonSchema === "object" ? jsonSchema : void 0;
+  return convertJSONSchemaDefinition(jsonSchema, isRoot, {
+    definitions: rootSchema == null ? void 0 : rootSchema.definitions,
+    dollarDefinitions: rootSchema == null ? void 0 : rootSchema.$defs,
+    resolvingReferences: /* @__PURE__ */ new Set()
+  });
+}
+function convertJSONSchemaDefinition(jsonSchema, isRoot, referenceContext) {
   if (jsonSchema == null) {
     return void 0;
   }
+  if (typeof jsonSchema === "boolean") {
+    return { type: "boolean", properties: {} };
+  }
+  if (jsonSchema.$ref != null) {
+    return convertJSONSchemaReference({
+      jsonSchema,
+      reference: jsonSchema.$ref,
+      isRoot,
+      referenceContext
+    });
+  }
   if (isEmptyObjectSchema(jsonSchema)) {
     if (isRoot) {
       return void 0;
     }
-    if (typeof jsonSchema === "object" && jsonSchema.description) {
+    if (jsonSchema.description) {
       return { type: "object", description: jsonSchema.description };
     }
     return { type: "object" };
   }
-  if (typeof jsonSchema === "boolean") {
-    return { type: "boolean", properties: {} };
-  }
   const {
     type,
     description,
@@ -348,18 +365,20 @@ function convertJSONSchemaToOpenAPISchema(jsonSchema, isRoot = true) {
   if (properties != null) {
     result.properties = Object.entries(properties).reduce(
       (acc, [key, value]) => {
-        acc[key] = convertJSONSchemaToOpenAPISchema(value, false);
+        acc[key] = convertJSONSchemaDefinition(value, false, referenceContext);
         return acc;
       },
       {}
     );
   }
   if (items) {
-    result.items = Array.isArray(items) ? items.map((item) => convertJSONSchemaToOpenAPISchema(item, false)) : convertJSONSchemaToOpenAPISchema(items, false);
+    result.items = Array.isArray(items) ? items.map(
+      (item) => convertJSONSchemaDefinition(item, false, referenceContext)
+    ) : convertJSONSchemaDefinition(items, false, referenceContext);
   }
   if (allOf) {
     result.allOf = allOf.map(
-      (item) => convertJSONSchemaToOpenAPISchema(item, false)
+      (item) => convertJSONSchemaDefinition(item, false, referenceContext)
     );
   }
   if (anyOf) {
@@ -370,9 +389,10 @@ function convertJSONSchemaToOpenAPISchema(jsonSchema, isRoot = true) {
         (schema) => !(typeof schema === "object" && (schema == null ? void 0 : schema.type) === "null")
       );
       if (nonNullSchemas.length === 1) {
-        const converted = convertJSONSchemaToOpenAPISchema(
+        const converted = convertJSONSchemaDefinition(
           nonNullSchemas[0],
-          false
+          false,
+          referenceContext
         );
         if (typeof converted === "object") {
           result.nullable = true;
@@ -380,19 +400,19 @@ function convertJSONSchemaToOpenAPISchema(jsonSchema, isRoot = true) {
         }
       } else {
         result.anyOf = nonNullSchemas.map(
-          (item) => convertJSONSchemaToOpenAPISchema(item, false)
+          (item) => convertJSONSchemaDefinition(item, false, referenceContext)
         );
         result.nullable = true;
       }
     } else {
       result.anyOf = anyOf.map(
-        (item) => convertJSONSchemaToOpenAPISchema(item, false)
+        (item) => convertJSONSchemaDefinition(item, false, referenceContext)
       );
     }
   }
   if (oneOf) {
     result.oneOf = oneOf.map(
-      (item) => convertJSONSchemaToOpenAPISchema(item, false)
+      (item) => convertJSONSchemaDefinition(item, false, referenceContext)
     );
   }
   if (minLength !== void 0) {
@@ -400,12 +420,82 @@ function convertJSONSchemaToOpenAPISchema(jsonSchema, isRoot = true) {
   }
   return result;
 }
+function convertJSONSchemaReference({
+  jsonSchema,
+  reference,
+  isRoot,
+  referenceContext
+}) {
+  const { definition, referenceKey } = getReferencedDefinition(
+    reference,
+    referenceContext
+  );
+  if (referenceContext.resolvingReferences.has(referenceKey)) {
+    throw new import_provider2.UnsupportedFunctionalityError({
+      functionality: `recursive JSON Schema reference: ${reference}`,
+      message: "Google schema conversion does not support recursive JSON Schema references."
+    });
+  }
+  const resolvingReferences = new Set(referenceContext.resolvingReferences);
+  resolvingReferences.add(referenceKey);
+  const { $ref: _reference, ...siblingSchema } = jsonSchema;
+  const resolvedSchema = typeof definition === "boolean" ? definition ? siblingSchema : false : { ...definition, ...siblingSchema };
+  return convertJSONSchemaDefinition(resolvedSchema, isRoot, {
+    ...referenceContext,
+    resolvingReferences
+  });
+}
+function getReferencedDefinition(reference, referenceContext) {
+  const definitionSources = [
+    {
+      prefix: "#/$defs/",
+      definitions: referenceContext.dollarDefinitions
+    },
+    {
+      prefix: "#/definitions/",
+      definitions: referenceContext.definitions
+    }
+  ];
+  const source = definitionSources.find(
+    ({ prefix }) => reference.startsWith(prefix)
+  );
+  const encodedDefinitionName = source ? reference.slice(source.prefix.length) : void 0;
+  if (source == null || encodedDefinitionName == null || encodedDefinitionName.length === 0 || encodedDefinitionName.includes("/")) {
+    throwUnsupportedReference(reference);
+  }
+  let decodedDefinitionName;
+  try {
+    decodedDefinitionName = decodeURIComponent(encodedDefinitionName);
+  } catch (e) {
+    throwUnsupportedReference(reference);
+  }
+  if (decodedDefinitionName.includes("/") || /~(?![01])/u.test(decodedDefinitionName) || source.definitions == null) {
+    throwUnsupportedReference(reference);
+  }
+  const definitionName = decodedDefinitionName.replace(
+    /~[01]/g,
+    (match) => match === "~1" ? "/" : "~"
+  );
+  if (!Object.prototype.hasOwnProperty.call(source.definitions, definitionName)) {
+    throwUnsupportedReference(reference);
+  }
+  return {
+    definition: source.definitions[definitionName],
+    referenceKey: `${source.prefix}${definitionName}`
+  };
+}
+function throwUnsupportedReference(reference) {
+  throw new import_provider2.UnsupportedFunctionalityError({
+    functionality: `JSON Schema reference: ${reference}`,
+    message: "Google schema conversion only supports references to direct children of root-level $defs or definitions."
+  });
+}
 function isEmptyObjectSchema(jsonSchema) {
   return jsonSchema != null && typeof jsonSchema === "object" && jsonSchema.type === "object" && (jsonSchema.properties == null || Object.keys(jsonSchema.properties).length === 0) && !jsonSchema.additionalProperties;
 }
 
 // src/convert-to-google-generative-ai-messages.ts
-var import_provider2 = require("@ai-sdk/provider");
+var import_provider3 = require("@ai-sdk/provider");
 var import_provider_utils4 = require("@ai-sdk/provider-utils");
 var SKIP_THOUGHT_SIGNATURE_VALIDATOR = "skip_thought_signature_validator";
 function getGoogleProviderOptions(providerOptions, providerOptionsName) {
@@ -555,7 +645,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
     switch (role) {
       case "system": {
         if (!systemMessagesAllowed) {
-          throw new import_provider2.UnsupportedFunctionalityError({
+          throw new import_provider3.UnsupportedFunctionalityError({
             functionality: "system messages are only supported at the beginning of the conversation"
           });
         }
@@ -620,7 +710,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
               }
               case "file": {
                 if (part.data instanceof URL) {
-                  throw new import_provider2.UnsupportedFunctionalityError({
+                  throw new import_provider3.UnsupportedFunctionalityError({
                     functionality: "File data URLs in assistant messages are not supported"
                   });
                 }
@@ -989,7 +1079,7 @@ function getGoogleModelCapabilities(modelId) {
 }
 
 // src/google-prepare-tools.ts
-var import_provider3 = require("@ai-sdk/provider");
+var import_provider4 = require("@ai-sdk/provider");
 function prepareTools({
   tools,
   toolChoice,
@@ -1227,7 +1317,7 @@ function prepareTools({
       };
     default: {
       const _exhaustiveCheck = type;
-      throw new import_provider3.UnsupportedFunctionalityError({
+      throw new import_provider4.UnsupportedFunctionalityError({
         functionality: `tool choice type: ${_exhaustiveCheck}`
       });
     }
@@ -3022,7 +3112,7 @@ var googleImageModelOptionsSchema = (0, import_provider_utils14.lazySchema)(
 );
 
 // src/google-generative-ai-video-model.ts
-var import_provider4 = require("@ai-sdk/provider");
+var import_provider5 = require("@ai-sdk/provider");
 var import_provider_utils15 = require("@ai-sdk/provider-utils");
 var import_v414 = require("zod/v4");
 function getFirstFrameImage(options) {
@@ -3197,7 +3287,7 @@ var GoogleGenerativeAIVideoModel = class {
     });
     const operationName = operation.name;
     if (!operationName) {
-      throw new import_provider4.AISDKError({
+      throw new import_provider5.AISDKError({
         name: "GOOGLE_VIDEO_GENERATION_ERROR",
         message: "No operation name returned from API"
       });
@@ -3209,14 +3299,14 @@ var GoogleGenerativeAIVideoModel = class {
     let responseHeaders;
     while (!finalOperation.done) {
       if (Date.now() - startTime > pollTimeoutMs) {
-        throw new import_provider4.AISDKError({
+        throw new import_provider5.AISDKError({
           name: "GOOGLE_VIDEO_GENERATION_TIMEOUT",
           message: `Video generation timed out after ${pollTimeoutMs}ms`
         });
       }
       await (0, import_provider_utils15.delay)(pollIntervalMs);
       if ((_f = options.abortSignal) == null ? void 0 : _f.aborted) {
-        throw new import_provider4.AISDKError({
+        throw new import_provider5.AISDKError({
           name: "GOOGLE_VIDEO_GENERATION_ABORTED",
           message: "Video generation request was aborted"
         });
@@ -3238,14 +3328,14 @@ var GoogleGenerativeAIVideoModel = class {
       responseHeaders = pollHeaders;
     }
     if (finalOperation.error) {
-      throw new import_provider4.AISDKError({
+      throw new import_provider5.AISDKError({
         name: "GOOGLE_VIDEO_GENERATION_FAILED",
         message: `Video generation failed: ${finalOperation.error.message}`
       });
     }
     const response = finalOperation.response;
     if (!((_g = response == null ? void 0 : response.generateVideoResponse) == null ? void 0 : _g.generatedSamples) || response.generateVideoResponse.generatedSamples.length === 0) {
-      throw new import_provider4.AISDKError({
+      throw new import_provider5.AISDKError({
         name: "GOOGLE_VIDEO_GENERATION_ERROR",
         message: `No videos in response. Response: ${JSON.stringify(finalOperation)}`
       });
@@ -3268,7 +3358,7 @@ var GoogleGenerativeAIVideoModel = class {
       }
     }
     if (videos.length === 0) {
-      throw new import_provider4.AISDKError({
+      throw new import_provider5.AISDKError({
         name: "GOOGLE_VIDEO_GENERATION_ERROR",
         message: "No valid videos in response"
       });