@ai-sdk/provider-utils 1.0.2 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-sdk/provider-utils",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "license": "Apache-2.0",
   "sideEffects": false,
   "main": "./dist/index.js",
@@ -25,7 +25,7 @@
     }
   },
   "dependencies": {
-    "@ai-sdk/provider": "0.0.12",
+    "@ai-sdk/provider": "0.0.13",
     "eventsource-parser": "1.1.2",
     "nanoid": "3.3.6",
     "secure-json-parse": "2.7.0"

package/test/dist/index.d.mts

@@ -9,6 +9,8 @@ declare function convertAsyncIterableToArray<T>(iterable: AsyncIterable<T>): Pro
 
 declare function convertReadableStreamToArray<T>(stream: ReadableStream<T>): Promise<T[]>;
 
+declare function convertResponseStreamToArray(response: Response): Promise<string[]>;
+
 declare class JsonTestServer {
     readonly server: SetupServer;
     responseHeaders: Record<string, string>;
@@ -18,6 +20,7 @@ declare class JsonTestServer {
     getRequestBodyJson(): Promise<any>;
     getRequestHeaders(): Promise<Record<string, string>>;
     getRequestUrlSearchParams(): Promise<URLSearchParams>;
+    getRequestUrl(): Promise<string>;
     setupTestEnvironment(): void;
 }
 
@@ -76,4 +79,4 @@ declare function describeWithTestServer(description: string, responses: Array<Te
  */
 declare const convertStreamToArray: typeof convertReadableStreamToArray;
 
-export { JsonTestServer, StreamingTestServer, type TestServerJsonBodyType, type TestServerResponse, convertArrayToAsyncIterable, convertArrayToReadableStream, convertAsyncIterableToArray, convertReadableStreamToArray, convertStreamToArray, describeWithTestServer, withTestServer };
+export { JsonTestServer, StreamingTestServer, type TestServerJsonBodyType, type TestServerResponse, convertArrayToAsyncIterable, convertArrayToReadableStream, convertAsyncIterableToArray, convertReadableStreamToArray, convertResponseStreamToArray, convertStreamToArray, describeWithTestServer, withTestServer };

package/test/dist/index.d.ts

@@ -9,6 +9,8 @@ declare function convertAsyncIterableToArray<T>(iterable: AsyncIterable<T>): Pro
 
 declare function convertReadableStreamToArray<T>(stream: ReadableStream<T>): Promise<T[]>;
 
+declare function convertResponseStreamToArray(response: Response): Promise<string[]>;
+
 declare class JsonTestServer {
     readonly server: SetupServer;
     responseHeaders: Record<string, string>;
@@ -18,6 +20,7 @@ declare class JsonTestServer {
     getRequestBodyJson(): Promise<any>;
     getRequestHeaders(): Promise<Record<string, string>>;
     getRequestUrlSearchParams(): Promise<URLSearchParams>;
+    getRequestUrl(): Promise<string>;
     setupTestEnvironment(): void;
 }
 
@@ -76,4 +79,4 @@ declare function describeWithTestServer(description: string, responses: Array<Te
  */
 declare const convertStreamToArray: typeof convertReadableStreamToArray;
 
-export { JsonTestServer, StreamingTestServer, type TestServerJsonBodyType, type TestServerResponse, convertArrayToAsyncIterable, convertArrayToReadableStream, convertAsyncIterableToArray, convertReadableStreamToArray, convertStreamToArray, describeWithTestServer, withTestServer };
+export { JsonTestServer, StreamingTestServer, type TestServerJsonBodyType, type TestServerResponse, convertArrayToAsyncIterable, convertArrayToReadableStream, convertAsyncIterableToArray, convertReadableStreamToArray, convertResponseStreamToArray, convertStreamToArray, describeWithTestServer, withTestServer };

package/test/dist/index.js

@@ -63,6 +63,7 @@ __export(test_exports, {
   convertArrayToReadableStream: () => convertArrayToReadableStream,
   convertAsyncIterableToArray: () => convertAsyncIterableToArray,
   convertReadableStreamToArray: () => convertReadableStreamToArray,
+  convertResponseStreamToArray: () => convertResponseStreamToArray,
   convertStreamToArray: () => convertStreamToArray,
   describeWithTestServer: () => describeWithTestServer,
   withTestServer: () => withTestServer
@@ -117,6 +118,13 @@ async function convertReadableStreamToArray(stream) {
   return result;
 }
 
+// src/test/convert-response-stream-to-array.ts
+async function convertResponseStreamToArray(response) {
+  return convertReadableStreamToArray(
+    response.body.pipeThrough(new TextDecoderStream())
+  );
+}
+
 // ../../node_modules/.pnpm/outvariant@1.4.2/node_modules/outvariant/lib/index.mjs
 var POSITIONALS_EXP = /(%?)(%([sdijo]))/g;
 function serializePositional(positional, flag) {
@@ -5236,6 +5244,10 @@ var JsonTestServer = class {
     expect(this.request).toBeDefined();
     return new URL(this.request.url).searchParams;
   }
+  async getRequestUrl() {
+    expect(this.request).toBeDefined();
+    return new URL(this.request.url).toString();
+  }
   setupTestEnvironment() {
     beforeAll(() => this.server.listen());
     beforeEach(() => {
@@ -5336,13 +5348,40 @@ function createServer({
   pushCall,
   pushController
 }) {
+  const responsesArray = Array.isArray(responses) ? responses : [responses];
+  const responsesByUrl = responsesArray.reduce((responsesByUrl2, response) => {
+    if (!responsesByUrl2[response.url]) {
+      responsesByUrl2[response.url] = [];
+    }
+    responsesByUrl2[response.url].push(response);
+    return responsesByUrl2;
+  }, {});
+  const streams = {};
+  responsesArray.filter(
+    (response) => response.type === "controlled-stream"
+  ).forEach((response) => {
+    var _a3, _b2;
+    let streamController;
+    const stream = new ReadableStream({
+      start(controller) {
+        streamController = controller;
+      }
+    });
+    pushController((_a3 = response.id) != null ? _a3 : "", () => streamController);
+    streams[(_b2 = response.id) != null ? _b2 : ""] = stream;
+  });
+  const urlInvocationCounts = Object.fromEntries(
+    Object.entries(responsesByUrl).map(([url]) => [url, 0])
+  );
   return setupServer(
-    ...(Array.isArray(responses) ? responses : [responses]).map((response) => {
-      var _a3;
-      switch (response.type) {
-        case "json-value": {
-          return http.post(response.url, ({ request: request2 }) => {
-            pushCall(new TestServerCall(request2));
+    ...Object.entries(responsesByUrl).map(([url, responses2]) => {
+      return http.post(url, ({ request: request2 }) => {
+        var _a3, _b2;
+        pushCall(new TestServerCall(request2));
+        const invocationCount = urlInvocationCounts[url]++;
+        const response = responses2[invocationCount > responses2.length ? responses2.length - 1 : invocationCount];
+        switch (response.type) {
+          case "json-value":
             return HttpResponse.json(response.content, {
               status: 200,
               headers: {
@@ -5350,11 +5389,7 @@ function createServer({
                 ...response.headers
               }
             });
-          });
-        }
-        case "stream-values": {
-          return http.post(response.url, ({ request: request2 }) => {
-            pushCall(new TestServerCall(request2));
+          case "stream-values":
             return new HttpResponse(
               convertArrayToReadableStream(response.content).pipeThrough(
                 new TextEncoderStream()
@@ -5369,20 +5404,9 @@ function createServer({
                 }
               }
             );
-          });
-        }
-        case "controlled-stream": {
-          let streamController;
-          const stream = new ReadableStream({
-            start(controller) {
-              streamController = controller;
-            }
-          });
-          pushController((_a3 = response.id) != null ? _a3 : "", () => streamController);
-          return http.post(response.url, ({ request: request2 }) => {
-            pushCall(new TestServerCall(request2));
+          case "controlled-stream": {
             return new HttpResponse(
-              stream.pipeThrough(new TextEncoderStream()),
+              streams[(_a3 = response.id) != null ? _a3 : ""].pipeThrough(new TextEncoderStream()),
               {
                 status: 200,
                 headers: {
@@ -5393,21 +5417,16 @@ function createServer({
                 }
               }
             );
-          });
-        }
-        case "error": {
-          return http.post(response.url, ({ request: request2 }) => {
-            var _a4;
-            pushCall(new TestServerCall(request2));
-            return HttpResponse.text((_a4 = response.content) != null ? _a4 : "Error", {
+          }
+          case "error":
+            return HttpResponse.text((_b2 = response.content) != null ? _b2 : "Error", {
               status: response.status,
               headers: {
                 ...response.headers
               }
             });
-          });
         }
-      }
+      });
     })
   );
 }
@@ -5483,6 +5502,7 @@ var convertStreamToArray = convertReadableStreamToArray;
   convertArrayToReadableStream,
   convertAsyncIterableToArray,
   convertReadableStreamToArray,
+  convertResponseStreamToArray,
   convertStreamToArray,
   describeWithTestServer,
   withTestServer