ai 4.1.15 → 4.1.17

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # ai
 
+## 4.1.17
+
+### Patch Changes
+
+- 5af8cdb: fix (ai/core): support this reference in model.supportsUrl implementations
+
+## 4.1.16
+
+### Patch Changes
+
+- 7e299a4: feat (ai/core): wrapLanguageModel can apply multiple middlewares
+
 ## 4.1.15
 
 ### Patch Changes

package/dist/index.d.mts

@@ -2468,23 +2468,23 @@ declare function extractReasoningMiddleware({ tagName, separator, }: {
  *
  * @param options - Configuration options for wrapping the language model.
  * @param options.model - The original LanguageModelV1 instance to be wrapped.
- * @param options.middleware - The middleware to be applied to the language model.
+ * @param options.middleware - The middleware to be applied to the language model. When multiple middlewares are provided, the first middleware will transform the input first, and the last middleware will be wrapped directly around the model.
  * @param options.modelId - Optional custom model ID to override the original model's ID.
  * @param options.providerId - Optional custom provider ID to override the original model's provider.
  * @returns A new LanguageModelV1 instance with middleware applied.
  */
-declare const wrapLanguageModel: ({ model, middleware: { transformParams, wrapGenerate, wrapStream }, modelId, providerId, }: {
+declare const wrapLanguageModel: ({ model, middleware: middlewareArg, modelId, providerId, }: {
     model: LanguageModelV1;
-    middleware: LanguageModelV1Middleware;
+    middleware: LanguageModelV1Middleware | LanguageModelV1Middleware[];
     modelId?: string;
     providerId?: string;
 }) => LanguageModelV1;
 /**
  * @deprecated Use `wrapLanguageModel` instead.
  */
-declare const experimental_wrapLanguageModel: ({ model, middleware: { transformParams, wrapGenerate, wrapStream }, modelId, providerId, }: {
+declare const experimental_wrapLanguageModel: ({ model, middleware: middlewareArg, modelId, providerId, }: {
     model: LanguageModelV1;
-    middleware: LanguageModelV1Middleware;
+    middleware: LanguageModelV1Middleware | LanguageModelV1Middleware[];
     modelId?: string;
     providerId?: string;
 }) => LanguageModelV1;

package/dist/index.d.ts

@@ -2468,23 +2468,23 @@ declare function extractReasoningMiddleware({ tagName, separator, }: {
  *
  * @param options - Configuration options for wrapping the language model.
  * @param options.model - The original LanguageModelV1 instance to be wrapped.
- * @param options.middleware - The middleware to be applied to the language model.
+ * @param options.middleware - The middleware to be applied to the language model. When multiple middlewares are provided, the first middleware will transform the input first, and the last middleware will be wrapped directly around the model.
  * @param options.modelId - Optional custom model ID to override the original model's ID.
  * @param options.providerId - Optional custom provider ID to override the original model's provider.
  * @returns A new LanguageModelV1 instance with middleware applied.
  */
-declare const wrapLanguageModel: ({ model, middleware: { transformParams, wrapGenerate, wrapStream }, modelId, providerId, }: {
+declare const wrapLanguageModel: ({ model, middleware: middlewareArg, modelId, providerId, }: {
     model: LanguageModelV1;
-    middleware: LanguageModelV1Middleware;
+    middleware: LanguageModelV1Middleware | LanguageModelV1Middleware[];
     modelId?: string;
     providerId?: string;
 }) => LanguageModelV1;
 /**
  * @deprecated Use `wrapLanguageModel` instead.
  */
-declare const experimental_wrapLanguageModel: ({ model, middleware: { transformParams, wrapGenerate, wrapStream }, modelId, providerId, }: {
+declare const experimental_wrapLanguageModel: ({ model, middleware: middlewareArg, modelId, providerId, }: {
     model: LanguageModelV1;
-    middleware: LanguageModelV1Middleware;
+    middleware: LanguageModelV1Middleware | LanguageModelV1Middleware[];
     modelId?: string;
     providerId?: string;
 }) => LanguageModelV1;

package/dist/index.js

@@ -2408,7 +2408,7 @@ async function generateObject({
     }),
     tracer,
     fn: async (span) => {
-      var _a15, _b;
+      var _a15, _b, _c, _d;
       if (mode === "auto" || mode == null) {
         mode = model.defaultObjectGenerationMode;
       }
@@ -2437,7 +2437,8 @@ async function generateObject({
           const promptMessages = await convertToLanguageModelPrompt({
             prompt: standardizedPrompt,
             modelSupportsImageUrls: model.supportsImageUrls,
-            modelSupportsUrl: model.supportsUrl
+            modelSupportsUrl: (_a15 = model.supportsUrl) == null ? void 0 : _a15.bind(model)
+            // support 'this' context
           });
           const generateResult = await retry(
             () => recordSpan({
@@ -2470,7 +2471,7 @@ async function generateObject({
               }),
               tracer,
               fn: async (span2) => {
-                var _a16, _b2, _c, _d, _e, _f;
+                var _a16, _b2, _c2, _d2, _e, _f;
                 const result2 = await model.doGenerate({
                   mode: {
                     type: "object-json",
@@ -2487,7 +2488,7 @@ async function generateObject({
                 });
                 const responseData = {
                   id: (_b2 = (_a16 = result2.response) == null ? void 0 : _a16.id) != null ? _b2 : generateId3(),
-                  timestamp: (_d = (_c = result2.response) == null ? void 0 : _c.timestamp) != null ? _d : currentDate(),
+                  timestamp: (_d2 = (_c2 = result2.response) == null ? void 0 : _c2.timestamp) != null ? _d2 : currentDate(),
                   modelId: (_f = (_e = result2.response) == null ? void 0 : _e.modelId) != null ? _f : model.modelId
                 };
                 if (result2.text === void 0) {
@@ -2528,7 +2529,7 @@ async function generateObject({
           rawResponse = generateResult.rawResponse;
           logprobs = generateResult.logprobs;
           resultProviderMetadata = generateResult.providerMetadata;
-          request = (_a15 = generateResult.request) != null ? _a15 : {};
+          request = (_b = generateResult.request) != null ? _b : {};
           response = generateResult.responseData;
           break;
         }
@@ -2540,7 +2541,8 @@ async function generateObject({
           const promptMessages = await convertToLanguageModelPrompt({
             prompt: standardizedPrompt,
             modelSupportsImageUrls: model.supportsImageUrls,
-            modelSupportsUrl: model.supportsUrl
+            modelSupportsUrl: (_c = model.supportsUrl) == null ? void 0 : _c.bind(model)
+            // support 'this' context,
           });
           const inputFormat = standardizedPrompt.type;
           const generateResult = await retry(
@@ -2574,7 +2576,7 @@ async function generateObject({
               }),
               tracer,
               fn: async (span2) => {
-                var _a16, _b2, _c, _d, _e, _f, _g, _h;
+                var _a16, _b2, _c2, _d2, _e, _f, _g, _h;
                 const result2 = await model.doGenerate({
                   mode: {
                     type: "object-tool",
@@ -2594,7 +2596,7 @@ async function generateObject({
                 });
                 const objectText = (_b2 = (_a16 = result2.toolCalls) == null ? void 0 : _a16[0]) == null ? void 0 : _b2.args;
                 const responseData = {
-                  id: (_d = (_c = result2.response) == null ? void 0 : _c.id) != null ? _d : generateId3(),
+                  id: (_d2 = (_c2 = result2.response) == null ? void 0 : _c2.id) != null ? _d2 : generateId3(),
                   timestamp: (_f = (_e = result2.response) == null ? void 0 : _e.timestamp) != null ? _f : currentDate(),
                   modelId: (_h = (_g = result2.response) == null ? void 0 : _g.modelId) != null ? _h : model.modelId
                 };
@@ -2636,7 +2638,7 @@ async function generateObject({
           rawResponse = generateResult.rawResponse;
           logprobs = generateResult.logprobs;
           resultProviderMetadata = generateResult.providerMetadata;
-          request = (_b = generateResult.request) != null ? _b : {};
+          request = (_d = generateResult.request) != null ? _d : {};
           response = generateResult.responseData;
           break;
         }
@@ -2994,6 +2996,7 @@ var DefaultStreamObjectResult = class {
       tracer,
       endWhenDone: false,
       fn: async (rootSpan) => {
+        var _a15, _b;
         if (mode === "auto" || mode == null) {
           mode = model.defaultObjectGenerationMode;
         }
@@ -3024,7 +3027,8 @@ var DefaultStreamObjectResult = class {
               prompt: await convertToLanguageModelPrompt({
                 prompt: standardizedPrompt,
                 modelSupportsImageUrls: model.supportsImageUrls,
-                modelSupportsUrl: model.supportsUrl
+                modelSupportsUrl: (_a15 = model.supportsUrl) == null ? void 0 : _a15.bind(model)
+                // support 'this' context
               }),
               providerMetadata: providerOptions,
               abortSignal,
@@ -3066,7 +3070,8 @@ var DefaultStreamObjectResult = class {
               prompt: await convertToLanguageModelPrompt({
                 prompt: standardizedPrompt,
                 modelSupportsImageUrls: model.supportsImageUrls,
-                modelSupportsUrl: model.supportsUrl
+                modelSupportsUrl: (_b = model.supportsUrl) == null ? void 0 : _b.bind(model)
+                // support 'this' context,
               }),
               providerMetadata: providerOptions,
               abortSignal,
@@ -3160,7 +3165,7 @@ var DefaultStreamObjectResult = class {
         const transformedStream = stream.pipeThrough(new TransformStream(transformer)).pipeThrough(
           new TransformStream({
             async transform(chunk, controller) {
-              var _a15, _b, _c;
+              var _a16, _b2, _c;
               if (isFirstChunk) {
                 const msToFirstChunk = now2() - startTimestampMs;
                 isFirstChunk = false;
@@ -3206,8 +3211,8 @@ var DefaultStreamObjectResult = class {
               switch (chunk.type) {
                 case "response-metadata": {
                   response = {
-                    id: (_a15 = chunk.id) != null ? _a15 : response.id,
-                    timestamp: (_b = chunk.timestamp) != null ? _b : response.timestamp,
+                    id: (_a16 = chunk.id) != null ? _a16 : response.id,
+                    timestamp: (_b2 = chunk.timestamp) != null ? _b2 : response.timestamp,
                     modelId: (_c = chunk.modelId) != null ? _c : response.modelId
                   };
                   break;
@@ -3804,7 +3809,7 @@ async function generateText({
     }),
     tracer,
     fn: async (span) => {
-      var _a16, _b, _c, _d, _e, _f;
+      var _a16, _b, _c, _d, _e, _f, _g;
       const mode = {
         type: "regular",
         ...prepareToolsAndToolChoice({ tools, toolChoice, activeTools })
@@ -3836,7 +3841,8 @@ async function generateText({
             messages: stepInputMessages
           },
           modelSupportsImageUrls: model.supportsImageUrls,
-          modelSupportsUrl: model.supportsUrl
+          modelSupportsUrl: (_a16 = model.supportsUrl) == null ? void 0 : _a16.bind(model)
+          // support 'this' context
         });
         currentModelResponse = await retry(
           () => recordSpan({
@@ -3923,7 +3929,7 @@ async function generateText({
           })
         );
         currentToolCalls = await Promise.all(
-          ((_a16 = currentModelResponse.toolCalls) != null ? _a16 : []).map(
+          ((_b = currentModelResponse.toolCalls) != null ? _b : []).map(
             (toolCall) => parseToolCall({
               toolCall,
               tools,
@@ -3958,7 +3964,7 @@ async function generateText({
             nextStepType = "tool-result";
           }
         }
-        const originalText = (_b = currentModelResponse.text) != null ? _b : "";
+        const originalText = (_c = currentModelResponse.text) != null ? _c : "";
         const stepTextLeadingWhitespaceTrimmed = stepType === "continue" && // only for continue steps
         text2.trimEnd() !== text2 ? originalText.trimStart() : originalText;
         const stepText = nextStepType === "continue" ? removeTextAfterLastWhitespace(stepTextLeadingWhitespaceTrimmed) : stepTextLeadingWhitespaceTrimmed;
@@ -3995,10 +4001,10 @@ async function generateText({
           usage: currentUsage,
           warnings: currentModelResponse.warnings,
           logprobs: currentModelResponse.logprobs,
-          request: (_c = currentModelResponse.request) != null ? _c : {},
+          request: (_d = currentModelResponse.request) != null ? _d : {},
           response: {
             ...currentModelResponse.response,
-            headers: (_d = currentModelResponse.rawResponse) == null ? void 0 : _d.headers,
+            headers: (_e = currentModelResponse.rawResponse) == null ? void 0 : _e.headers,
             // deep clone msgs to avoid mutating past messages in multi-step:
             messages: structuredClone(responseMessages)
           },
@@ -4042,10 +4048,10 @@ async function generateText({
         finishReason: currentModelResponse.finishReason,
         usage,
         warnings: currentModelResponse.warnings,
-        request: (_e = currentModelResponse.request) != null ? _e : {},
+        request: (_f = currentModelResponse.request) != null ? _f : {},
         response: {
           ...currentModelResponse.response,
-          headers: (_f = currentModelResponse.rawResponse) == null ? void 0 : _f.headers,
+          headers: (_g = currentModelResponse.rawResponse) == null ? void 0 : _g.headers,
           messages: responseMessages
         },
         logprobs: currentModelResponse.logprobs,
@@ -4972,6 +4978,7 @@ var DefaultStreamTextResult = class {
           hasLeadingWhitespace,
           messageId
         }) {
+          var _a16;
           const promptFormat = responseMessages.length === 0 ? initialPrompt.type : "messages";
           const stepInputMessages = [
             ...initialPrompt.messages,
@@ -4984,7 +4991,8 @@ var DefaultStreamTextResult = class {
               messages: stepInputMessages
             },
             modelSupportsImageUrls: model.supportsImageUrls,
-            modelSupportsUrl: model.supportsUrl
+            modelSupportsUrl: (_a16 = model.supportsUrl) == null ? void 0 : _a16.bind(model)
+            // support 'this' context
           });
           const mode = {
             type: "regular",
@@ -5014,8 +5022,8 @@ var DefaultStreamTextResult = class {
                   "ai.prompt.tools": {
                     // convert the language model level tools:
                     input: () => {
-                      var _a16;
-                      return (_a16 = mode.tools) == null ? void 0 : _a16.map((tool2) => JSON.stringify(tool2));
+                      var _a17;
+                      return (_a17 = mode.tools) == null ? void 0 : _a17.map((tool2) => JSON.stringify(tool2));
                     }
                   },
                   "ai.prompt.toolChoice": {
@@ -5101,7 +5109,7 @@ var DefaultStreamTextResult = class {
             transformedStream.pipeThrough(
               new TransformStream({
                 async transform(chunk, controller) {
-                  var _a16, _b, _c;
+                  var _a17, _b, _c;
                   if (stepFirstChunk) {
                     const msToFirstChunk = now2() - startTimestampMs;
                     stepFirstChunk = false;
@@ -5164,7 +5172,7 @@ var DefaultStreamTextResult = class {
                     }
                     case "response-metadata": {
                       stepResponse = {
-                        id: (_a16 = chunk.id) != null ? _a16 : stepResponse.id,
+                        id: (_a17 = chunk.id) != null ? _a17 : stepResponse.id,
                         timestamp: (_b = chunk.timestamp) != null ? _b : stepResponse.timestamp,
                         modelId: (_c = chunk.modelId) != null ? _c : stepResponse.modelId
                       };
@@ -5750,6 +5758,16 @@ function extractReasoningMiddleware({
 
 // core/middleware/wrap-language-model.ts
 var wrapLanguageModel = ({
+  model,
+  middleware: middlewareArg,
+  modelId,
+  providerId
+}) => {
+  return asArray(middlewareArg).reverse().reduce((wrappedModel, middleware) => {
+    return doWrap({ model: wrappedModel, middleware, modelId, providerId });
+  }, model);
+};
+var doWrap = ({
   model,
   middleware: { transformParams, wrapGenerate, wrapStream },
   modelId,