@xsai/generate-object 0.1.0-beta.6 → 0.1.0-beta.8

package/dist/index.d.ts

@@ -6,10 +6,15 @@ interface GenerateObjectOptions<T extends Schema> extends GenerateTextOptions {
     schemaDescription?: string;
     schemaName?: string;
 }
-interface GenerateObjectResult<T extends Schema> extends Omit<GenerateTextResult, 'text'> {
-    object: Infer<T>;
-}
-/** @experimental WIP */
-declare const generateObject: <T extends Schema>(options: GenerateObjectOptions<T>) => Promise<GenerateObjectResult<T>>;
+type GenerateObjectResult<O> = GenerateTextResult & {
+    object: O;
+};
+declare function generateObject<T extends Schema>(options: GenerateObjectOptions<T> & {
+    output: 'array';
+}): Promise<GenerateObjectResult<Array<Infer<T>>>>;
+declare function generateObject<T extends Schema>(options: GenerateObjectOptions<T> & {
+    output: 'object';
+}): Promise<GenerateObjectResult<Infer<T>>>;
+declare function generateObject<T extends Schema>(options: GenerateObjectOptions<T>): Promise<GenerateObjectResult<Infer<T>>>;
 
 export { type GenerateObjectOptions, type GenerateObjectResult, generateObject };

package/dist/index.js

@@ -1,32 +1,69 @@
 // src/index.ts
 import { generateText } from "@xsai/generate-text";
 import { toJSONSchema, validate } from "xsschema";
-var generateObject = async (options) => generateText({
-  ...options,
-  response_format: {
-    json_schema: {
-      description: options.schemaDescription,
-      name: options.schemaName ?? "json_schema",
-      schema: await toJSONSchema(options.schema),
-      strict: true
-    },
-    type: "json_schema"
+
+// src/wrap.ts
+var wrap = ({ $schema, ...schema }) => ({
+  properties: {
+    elements: {
+      items: schema,
+      type: "array"
+    }
   },
-  schema: void 0,
-  schemaDescription: void 0,
-  schemaName: void 0
-}).then(async ({ finishReason, messages, steps, text, toolCalls, toolResults, usage }) => {
-  const object = await validate(options.schema, JSON.parse(text));
-  return {
-    finishReason,
-    messages,
-    object,
-    steps,
-    toolCalls,
-    toolResults,
-    usage
-  };
+  required: ["elements"],
+  type: "object"
 });
+
+// src/index.ts
+async function generateObject(options) {
+  const { schema: schemaValidator } = options;
+  let schema = await toJSONSchema(schemaValidator);
+  if (options.output === "array")
+    schema = wrap(schema);
+  return generateText({
+    ...options,
+    response_format: {
+      json_schema: {
+        description: options.schemaDescription,
+        name: options.schemaName ?? "json_schema",
+        schema,
+        strict: true
+      },
+      type: "json_schema"
+    },
+    schema: void 0,
+    // Remove schema from options
+    schemaDescription: void 0,
+    // Remove schemaDescription from options
+    schemaName: void 0
+    // Remove schemaName from options
+  }).then(async ({ finishReason, messages, steps, text, toolCalls, toolResults, usage }) => {
+    const json = JSON.parse(text);
+    if (options.output === "array") {
+      return {
+        finishReason,
+        messages,
+        object: await Promise.all(json.elements.map(async (element) => validate(schemaValidator, element))),
+        steps,
+        text,
+        toolCalls,
+        toolResults,
+        usage
+      };
+    } else {
+      return {
+        finishReason,
+        messages,
+        object: await validate(options.schema, json),
+        steps,
+        text,
+        toolCalls,
+        toolResults,
+        usage
+      };
+    }
+  });
+}
 export {
   generateObject
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xsai/generate-object",
   "type": "module",
-  "version": "0.1.0-beta.6",
+  "version": "0.1.0-beta.8",
   "description": "extra-small AI SDK for Browser, Node.js, Deno, Bun or Edge Runtime.",
   "author": "Moeru AI",
   "license": "MIT",