@xsai/stream-object 0.3.0-beta.7 → 0.3.0-beta.8

package/dist/index.d.ts

@@ -701,24 +701,28 @@ interface StreamObjectResult<T extends Schema> extends StreamTextResult {
     elementStream?: ReadableStream<Infer<T>>;
     partialObjectStream?: ReadableStream<PartialDeep<Infer<T>>>;
 }
-interface StreamObjectExtraOptions<T extends Schema> {
-    onFinish?: (result: StreamObjectOnFinishResult<T>) => unknown;
-}
-declare function streamObject<T extends Schema>(options: StreamObjectExtraOptions<T> & StreamObjectOptions<T> & {
+declare function streamObject<T extends Schema>(options: StreamObjectOptions<T> & {
     output: 'array';
 }): Promise<StreamObjectResult<T> & {
     elementStream: ReadableStream<Infer<T>>;
     partialObjectStream: undefined;
 }>;
-declare function streamObject<T extends Schema>(options: StreamObjectExtraOptions<T> & StreamObjectOptions<T> & {
+declare function streamObject<T extends Schema>(options: StreamObjectOptions<T> & {
     output: 'object';
 }): Promise<StreamObjectResult<T> & {
     elementStream: undefined;
     partialObjectStream: ReadableStream<PartialDeep<Infer<T>>>;
 }>;
-declare function streamObject<T extends Schema>(options: StreamObjectExtraOptions<T> & StreamObjectOptions<T>): Promise<StreamObjectResult<T> & {
+declare function streamObject<T extends Schema>(options: StreamObjectOptions<T>): Promise<StreamObjectResult<T> & {
     elementStream: undefined;
     partialObjectStream: ReadableStream<PartialDeep<Infer<T>>>;
 }>;
 
-export { type StreamObjectOnFinishResult, type StreamObjectOptions, type StreamObjectResult, streamObject };
+declare const toElementStream: <T>(stream: ReadableStream<string>) => ReadableStream<T>;
+
+declare const toPartialObjectStream: <T>(stream: ReadableStream<string>) => ReadableStream<undefined<T, {
+    recurseIntoArrays: false;
+    allowUndefinedInNonTupleArrays: true;
+}>>;
+
+export { type StreamObjectOnFinishResult, type StreamObjectOptions, type StreamObjectResult, streamObject, toElementStream, toPartialObjectStream };

package/dist/index.js

@@ -1,5 +1,16 @@
 import { streamText } from '@xsai/stream-text';
-import { toJsonSchema } from 'xsschema';
+import { toJsonSchema, strictJsonSchema } from 'xsschema';
+
+const wrap = (items) => ({
+  properties: {
+    elements: {
+      items,
+      type: "array"
+    }
+  },
+  required: ["elements"],
+  type: "object"
+});
 
 var parse = {};
 
@@ -231,21 +242,48 @@ function requireParse () {
 
 var parseExports = requireParse();
 
-const wrap = (schema) => {
-  return {
-    properties: {
-      elements: {
-        items: schema,
-        type: "array"
-      }
+const toElementStream = (stream) => {
+  let partialObjectData = "";
+  let index = 0;
+  return stream.pipeThrough(new TransformStream({
+    flush: (controller) => {
+      const data = parseExports.parse(partialObjectData);
+      controller.enqueue(data.elements.at(-1));
     },
-    required: ["elements"],
-    type: "object"
-  };
+    transform: (chunk, controller) => {
+      partialObjectData += chunk;
+      try {
+        const data = parseExports.parse(partialObjectData);
+        if (Array.isArray(Object.getOwnPropertyDescriptor(data, "elements")?.value) && data.elements.length > index + 1) {
+          controller.enqueue(data.elements[index++]);
+        }
+      } catch {
+      }
+    }
+  }));
+};
+
+const toPartialObjectStream = (stream) => {
+  let partialObjectData = "";
+  let partialObjectSnapshot = {};
+  return stream.pipeThrough(new TransformStream({
+    transform: (chunk, controller) => {
+      partialObjectData += chunk;
+      try {
+        const data = parseExports.parse(partialObjectData);
+        if (JSON.stringify(partialObjectSnapshot) !== JSON.stringify(data)) {
+          partialObjectSnapshot = data;
+          controller.enqueue(data);
+        }
+      } catch {
+      }
+    }
+  }));
 };
+
 async function streamObject(options) {
   const { schema: schemaValidator } = options;
-  let schema = await toJsonSchema(schemaValidator);
+  let schema = await toJsonSchema(schemaValidator).then((schema2) => strictJsonSchema(schema2));
   if (options.output === "array")
     schema = wrap(schema);
   return streamText({
@@ -265,46 +303,14 @@ async function streamObject(options) {
   }).then(({ chunkStream, stepStream, textStream }) => {
     let elementStream;
     let partialObjectStream;
-    let index = 0;
     if (options.output === "array") {
       let rawElementStream;
       [rawElementStream, textStream] = textStream.tee();
-      let partialData = "";
-      elementStream = rawElementStream.pipeThrough(new TransformStream({
-        flush: (controller) => {
-          const data = parseExports.parse(partialData);
-          controller.enqueue(data.elements.at(-1));
-          options.onFinish?.({ object: data.elements });
-        },
-        transform: (chunk, controller) => {
-          partialData += chunk;
-          try {
-            const data = parseExports.parse(partialData);
-            if (Array.isArray(Object.getOwnPropertyDescriptor(data, "elements")?.value) && data.elements.length > index + 1) {
-              controller.enqueue(data.elements[index++]);
-            }
-          } catch {
-          }
-        }
-      }));
+      elementStream = toElementStream(rawElementStream);
     } else {
       let rawPartialObjectStream;
       [textStream, rawPartialObjectStream] = textStream.tee();
-      let partialObjectData = "";
-      let partialObjectSnapshot = {};
-      partialObjectStream = rawPartialObjectStream.pipeThrough(new TransformStream({
-        transform: (chunk, controller) => {
-          partialObjectData += chunk;
-          try {
-            const data = parseExports.parse(partialObjectData);
-            if (JSON.stringify(partialObjectSnapshot) !== JSON.stringify(data)) {
-              partialObjectSnapshot = data;
-              controller.enqueue(data);
-            }
-          } catch {
-          }
-        }
-      }));
+      partialObjectStream = toPartialObjectStream(rawPartialObjectStream);
     }
     return {
       chunkStream,
@@ -316,4 +322,4 @@ async function streamObject(options) {
   });
 }
 
-export { streamObject };
+export { streamObject, toElementStream, toPartialObjectStream };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xsai/stream-object",
   "type": "module",
-  "version": "0.3.0-beta.7",
+  "version": "0.3.0-beta.8",
   "description": "extra-small AI SDK.",
   "author": "Moeru AI",
   "license": "MIT",
@@ -29,8 +29,8 @@
     "dist"
   ],
   "dependencies": {
-    "@xsai/stream-text": "~0.3.0-beta.7",
-    "xsschema": "~0.3.0-beta.7"
+    "@xsai/stream-text": "~0.3.0-beta.8",
+    "xsschema": "~0.3.0-beta.8"
   },
   "devDependencies": {
     "@valibot/to-json-schema": "^1.0.0",