modelfusion 0.67.0 → 0.68.0

package/browser/invokeFlow.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.invokeFlow = void 0;
-const ZodSchema_1 = require("../core/structure/ZodSchema");
+const ZodSchema_1 = require("../core/schema/ZodSchema");
 const readEventSource_1 = require("./readEventSource");
 async function invokeFlow({ url, input, schema, onEvent, onStop, }) {
     const response = await fetch(url, {

package/browser/invokeFlow.js

@@ -1,4 +1,4 @@
-import { ZodSchema } from "../core/structure/ZodSchema";
+import { ZodSchema } from "../core/schema/ZodSchema";
 import { readEventSource } from "./readEventSource";
 export async function invokeFlow({ url, input, schema, onEvent, onStop, }) {
     const response = await fetch(url, {

package/browser/readEventSource.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readEventSource = void 0;
-const parseJSON_js_1 = require("../util/parseJSON.cjs");
+const parseJSON_js_1 = require("../core/schema/parseJSON.cjs");
 function readEventSource({ url, schema, onEvent, onError = console.error, onStop, isStopEvent, }) {
     const eventSource = new EventSource(url);
     eventSource.onmessage = (event) => {
@@ -11,7 +11,7 @@ function readEventSource({ url, schema, onEvent, onError = console.error, onStop
                 onStop?.(eventSource);
                 return;
             }
-            const parseResult = (0, parseJSON_js_1.safeParseJsonWithSchema)(event.data, schema);
+            const parseResult = (0, parseJSON_js_1.safeParseJSON)({ text: event.data, schema });
             if (!parseResult.success) {
                 onError(parseResult.error, eventSource);
                 return;

package/browser/readEventSource.d.ts

@@ -1,4 +1,4 @@
-import { Schema } from "../core/structure/Schema.js";
+import { Schema } from "../core/schema/Schema.js";
 export declare function readEventSource<T>({ url, schema, onEvent, onError, onStop, isStopEvent, }: {
     url: string;
     schema: Schema<T>;

package/browser/readEventSource.js

@@ -1,4 +1,4 @@
-import { safeParseJsonWithSchema } from "../util/parseJSON.js";
+import { safeParseJSON } from "../core/schema/parseJSON.js";
 export function readEventSource({ url, schema, onEvent, onError = console.error, onStop, isStopEvent, }) {
     const eventSource = new EventSource(url);
     eventSource.onmessage = (event) => {
@@ -8,7 +8,7 @@ export function readEventSource({ url, schema, onEvent, onError = console.error,
                 onStop?.(eventSource);
                 return;
             }
-            const parseResult = safeParseJsonWithSchema(event.data, schema);
+            const parseResult = safeParseJSON({ text: event.data, schema });
             if (!parseResult.success) {
                 onError(parseResult.error, eventSource);
                 return;

package/browser/readEventSourceStream.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readEventSourceStream = void 0;
-const parseJSON_js_1 = require("../util/parseJSON.cjs");
+const parseJSON_js_1 = require("../core/schema/parseJSON.cjs");
 const AsyncQueue_js_1 = require("../util/AsyncQueue.cjs");
 const parseEventSourceStream_js_1 = require("../util/streaming/parseEventSourceStream.cjs");
 function readEventSourceStream({ stream, schema, errorHandler, }) {
@@ -11,7 +11,7 @@ function readEventSourceStream({ stream, schema, errorHandler, }) {
         .then(async (events) => {
         try {
             for await (const event of events) {
-                const validationResult = (0, parseJSON_js_1.safeParseJsonWithSchema)(event.data, schema);
+                const validationResult = (0, parseJSON_js_1.safeParseJSON)({ text: event.data, schema });
                 if (!validationResult.success) {
                     errorHandler?.(validationResult.error);
                     continue;

package/browser/readEventSourceStream.d.ts

@@ -1,4 +1,4 @@
-import { Schema } from "../core/structure/Schema.js";
+import { Schema } from "../core/schema/Schema.js";
 import { ErrorHandler } from "../util/ErrorHandler.js";
 export declare function readEventSourceStream<T>({ stream, schema, errorHandler, }: {
     stream: ReadableStream<Uint8Array>;

package/browser/readEventSourceStream.js

@@ -1,4 +1,4 @@
-import { safeParseJsonWithSchema } from "../util/parseJSON.js";
+import { safeParseJSON } from "../core/schema/parseJSON.js";
 import { AsyncQueue } from "../util/AsyncQueue.js";
 import { parseEventSourceStream } from "../util/streaming/parseEventSourceStream.js";
 export function readEventSourceStream({ stream, schema, errorHandler, }) {
@@ -8,7 +8,7 @@ export function readEventSourceStream({ stream, schema, errorHandler, }) {
         .then(async (events) => {
         try {
             for await (const event of events) {
-                const validationResult = safeParseJsonWithSchema(event.data, schema);
+                const validationResult = safeParseJSON({ text: event.data, schema });
                 if (!validationResult.success) {
                     errorHandler?.(validationResult.error);
                     continue;

package/core/index.cjs

@@ -27,4 +27,4 @@ __exportStar(require("./Vector.cjs"), exports);
 __exportStar(require("./api/index.cjs"), exports);
 __exportStar(require("./executeFunction.cjs"), exports);
 __exportStar(require("./getRun.cjs"), exports);
-__exportStar(require("./structure/index.cjs"), exports);
+__exportStar(require("./schema/index.cjs"), exports);

package/core/index.d.ts

@@ -11,4 +11,4 @@ export * from "./Vector.js";
 export * from "./api/index.js";
 export * from "./executeFunction.js";
 export * from "./getRun.js";
-export * from "./structure/index.js";
+export * from "./schema/index.js";

package/core/index.js

@@ -11,4 +11,4 @@ export * from "./Vector.js";
 export * from "./api/index.js";
 export * from "./executeFunction.js";
 export * from "./getRun.js";
-export * from "./structure/index.js";
+export * from "./schema/index.js";

package/{util → core/schema}/JSONParseError.cjs

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JSONParseError = void 0;
-const getErrorMessage_js_1 = require("./getErrorMessage.cjs");
+const getErrorMessage_js_1 = require("../../util/getErrorMessage.cjs");
 class JSONParseError extends Error {
-    constructor({ valueText, cause }) {
+    constructor({ text, cause }) {
         super(`JSON parsing failed: ` +
-            `Value: ${valueText}.\n` +
+            `Text: ${text}.\n` +
             `Error message: ${(0, getErrorMessage_js_1.getErrorMessage)(cause)}`);
         Object.defineProperty(this, "structureName", {
             enumerable: true,
@@ -19,7 +19,7 @@ class JSONParseError extends Error {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "valueText", {
+        Object.defineProperty(this, "text", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -27,14 +27,14 @@ class JSONParseError extends Error {
         });
         this.name = "JSONParseError";
         this.cause = cause;
-        this.valueText = valueText;
+        this.text = text;
     }
     toJSON() {
         return {
             name: this.name,
             message: this.message,
             cause: this.cause,
-            valueText: this.valueText,
+            valueText: this.text,
             stack: this.stack,
         };
     }

package/{util → core/schema}/JSONParseError.d.ts

@@ -1,9 +1,9 @@
 export declare class JSONParseError extends Error {
     readonly structureName: string;
     readonly cause: unknown;
-    readonly valueText: string;
-    constructor({ valueText, cause }: {
-        valueText: string;
+    readonly text: string;
+    constructor({ text, cause }: {
+        text: string;
         cause: unknown;
     });
     toJSON(): {

package/{util → core/schema}/JSONParseError.js

@@ -1,8 +1,8 @@
-import { getErrorMessage } from "./getErrorMessage.js";
+import { getErrorMessage } from "../../util/getErrorMessage.js";
 export class JSONParseError extends Error {
-    constructor({ valueText, cause }) {
+    constructor({ text, cause }) {
         super(`JSON parsing failed: ` +
-            `Value: ${valueText}.\n` +
+            `Text: ${text}.\n` +
             `Error message: ${getErrorMessage(cause)}`);
         Object.defineProperty(this, "structureName", {
             enumerable: true,
@@ -16,7 +16,7 @@ export class JSONParseError extends Error {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "valueText", {
+        Object.defineProperty(this, "text", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -24,14 +24,14 @@ export class JSONParseError extends Error {
         });
         this.name = "JSONParseError";
         this.cause = cause;
-        this.valueText = valueText;
+        this.text = text;
     }
     toJSON() {
         return {
             name: this.name,
             message: this.message,
             cause: this.cause,
-            valueText: this.valueText,
+            valueText: this.text,
             stack: this.stack,
         };
     }

package/core/{structure → schema}/ZodStructureDefinition.cjs

@@ -24,7 +24,7 @@ class ZodStructureDefinition {
         });
         this.name = name;
         this.description = description;
-        this.schema = new ZodSchema_js_1.ZodSchema(schema);
+        this.schema = schema instanceof ZodSchema_js_1.ZodSchema ? schema : new ZodSchema_js_1.ZodSchema(schema);
     }
 }
 exports.ZodStructureDefinition = ZodStructureDefinition;

package/core/{structure → schema}/ZodStructureDefinition.d.ts

@@ -8,6 +8,6 @@ export declare class ZodStructureDefinition<NAME extends string, STRUCTURE> impl
     constructor({ name, description, schema, }: {
         name: NAME;
         description?: string;
-        schema: z.Schema<STRUCTURE>;
+        schema: z.Schema<STRUCTURE> | ZodSchema<STRUCTURE>;
     });
 }

package/core/{structure → schema}/ZodStructureDefinition.js

@@ -21,6 +21,6 @@ export class ZodStructureDefinition {
         });
         this.name = name;
         this.description = description;
-        this.schema = new ZodSchema(schema);
+        this.schema = schema instanceof ZodSchema ? schema : new ZodSchema(schema);
     }
 }

package/core/{structure → schema}/index.cjs

@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./JSONParseError.cjs"), exports);
 __exportStar(require("./JsonSchemaProducer.cjs"), exports);
 __exportStar(require("./Schema.cjs"), exports);
 __exportStar(require("./StructureDefinition.cjs"), exports);
@@ -21,3 +22,4 @@ __exportStar(require("./UncheckedSchema.cjs"), exports);
 __exportStar(require("./UncheckedStructureDefinition.cjs"), exports);
 __exportStar(require("./ZodSchema.cjs"), exports);
 __exportStar(require("./ZodStructureDefinition.cjs"), exports);
+__exportStar(require("./parseJSON.cjs"), exports);

package/core/{structure → schema}/index.d.ts

@@ -1,3 +1,4 @@
+export * from "./JSONParseError.js";
 export * from "./JsonSchemaProducer.js";
 export * from "./Schema.js";
 export * from "./StructureDefinition.js";
@@ -5,3 +6,4 @@ export * from "./UncheckedSchema.js";
 export * from "./UncheckedStructureDefinition.js";
 export * from "./ZodSchema.js";
 export * from "./ZodStructureDefinition.js";
+export * from "./parseJSON.js";

package/core/{structure → schema}/index.js

@@ -1,3 +1,4 @@
+export * from "./JSONParseError.js";
 export * from "./JsonSchemaProducer.js";
 export * from "./Schema.js";
 export * from "./StructureDefinition.js";
@@ -5,3 +6,4 @@ export * from "./UncheckedSchema.js";
 export * from "./UncheckedStructureDefinition.js";
 export * from "./ZodSchema.js";
 export * from "./ZodStructureDefinition.js";
+export * from "./parseJSON.js";

package/core/schema/parseJSON.cjs

@@ -0,0 +1,56 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.safeParseJSON = exports.parseJSON = void 0;
+const secure_json_parse_1 = __importDefault(require("secure-json-parse"));
+const JSONParseError_js_1 = require("./JSONParseError.cjs");
+function parseJSON({ text, schema, }) {
+    try {
+        const json = secure_json_parse_1.default.parse(text);
+        if (schema == null) {
+            return json;
+        }
+        const validationResult = schema.validate(json);
+        if (!validationResult.success) {
+            throw new JSONParseError_js_1.JSONParseError({ text, cause: validationResult.error });
+        }
+        return validationResult.data;
+    }
+    catch (error) {
+        if (error instanceof JSONParseError_js_1.JSONParseError) {
+            throw error;
+        }
+        throw new JSONParseError_js_1.JSONParseError({ text, cause: error });
+    }
+}
+exports.parseJSON = parseJSON;
+function safeParseJSON({ text, schema, }) {
+    try {
+        const json = secure_json_parse_1.default.parse(text);
+        if (schema == null) {
+            return {
+                success: true,
+                data: json,
+            };
+        }
+        const validationResult = schema.validate(json);
+        if (validationResult.success) {
+            return validationResult;
+        }
+        return {
+            success: false,
+            error: new JSONParseError_js_1.JSONParseError({ text, cause: validationResult.error }),
+        };
+    }
+    catch (error) {
+        return {
+            success: false,
+            error: error instanceof JSONParseError_js_1.JSONParseError
+                ? error
+                : new JSONParseError_js_1.JSONParseError({ text, cause: error }),
+        };
+    }
+}
+exports.safeParseJSON = safeParseJSON;

package/core/schema/parseJSON.d.ts

@@ -0,0 +1,58 @@
+import { JSONParseError } from "./JSONParseError.js";
+import { Schema } from "./Schema.js";
+/**
+ * Parses a JSON string into an unknown object.
+ *
+ * @param text - The JSON string to parse.
+ * @returns {unknown} - The parsed JSON object.
+ */
+export declare function parseJSON({ text, schema, }: {
+    text: string;
+    schema?: undefined;
+}): unknown;
+/**
+ * Parses a JSON string into a strongly-typed object using the provided schema.
+ *
+ * @template T - The type of the object to parse the JSON into.
+ * @param {string} text - The JSON string to parse.
+ * @param {Schema<T>} schema - The schema to use for parsing the JSON.
+ * @returns {T} - The parsed object.
+ */
+export declare function parseJSON<T>({ text, schema, }: {
+    text: string;
+    schema: Schema<T>;
+}): T;
+/**
+ * Safely parses a JSON string and returns the result as an object of type `unknown`.
+ *
+ * @param text - The JSON string to parse.
+ * @returns {object} Either an object with `success: true` and the parsed data, or an object with `success: false` and the error that occurred.
+ */
+export declare function safeParseJSON({ text, schema, }: {
+    text: string;
+    schema?: undefined;
+}): {
+    success: true;
+    data: unknown;
+} | {
+    success: false;
+    error: JSONParseError;
+};
+/**
+ * Safely parses a JSON string into a strongly-typed object, using a provided schema to validate the structure.
+ *
+ * @template T - The type of the object to parse the JSON into.
+ * @param {string} text - The JSON string to parse.
+ * @param {Schema<T>} schema - The schema to use for parsing the JSON.
+ * @returns An object with either a `success` flag and the parsed and typed data, or a `success` flag and an error object.
+ */
+export declare function safeParseJSON<T>({ text, schema, }: {
+    text: string;
+    schema: Schema<T>;
+}): {
+    success: true;
+    data: T;
+} | {
+    success: false;
+    error: JSONParseError;
+};

package/core/schema/parseJSON.js

@@ -0,0 +1,48 @@
+import SecureJSON from "secure-json-parse";
+import { JSONParseError } from "./JSONParseError.js";
+export function parseJSON({ text, schema, }) {
+    try {
+        const json = SecureJSON.parse(text);
+        if (schema == null) {
+            return json;
+        }
+        const validationResult = schema.validate(json);
+        if (!validationResult.success) {
+            throw new JSONParseError({ text, cause: validationResult.error });
+        }
+        return validationResult.data;
+    }
+    catch (error) {
+        if (error instanceof JSONParseError) {
+            throw error;
+        }
+        throw new JSONParseError({ text, cause: error });
+    }
+}
+export function safeParseJSON({ text, schema, }) {
+    try {
+        const json = SecureJSON.parse(text);
+        if (schema == null) {
+            return {
+                success: true,
+                data: json,
+            };
+        }
+        const validationResult = schema.validate(json);
+        if (validationResult.success) {
+            return validationResult;
+        }
+        return {
+            success: false,
+            error: new JSONParseError({ text, cause: validationResult.error }),
+        };
+    }
+    catch (error) {
+        return {
+            success: false,
+            error: error instanceof JSONParseError
+                ? error
+                : new JSONParseError({ text, cause: error }),
+        };
+    }
+}

package/model-function/generate-structure/StructureFromTextGenerationModel.d.ts

@@ -1,5 +1,5 @@
 import { FunctionOptions } from "../../core/FunctionOptions.js";
-import { StructureDefinition } from "../../core/structure/StructureDefinition.js";
+import { StructureDefinition } from "../../core/schema/StructureDefinition.js";
 import { TextGenerationModel, TextGenerationModelSettings } from "../generate-text/TextGenerationModel.js";
 import { StructureGenerationModel } from "./StructureGenerationModel.js";
 export type StructureFromTextPromptFormat<PROMPT> = {

package/model-function/generate-structure/StructureGenerationModel.d.ts

@@ -1,5 +1,5 @@
 import { FunctionOptions } from "../../core/FunctionOptions.js";
-import { StructureDefinition } from "../../core/structure/StructureDefinition.js";
+import { StructureDefinition } from "../../core/schema/StructureDefinition.js";
 import { Delta } from "../../model-function/Delta.js";
 import { Model, ModelSettings } from "../Model.js";
 export interface StructureGenerationModelSettings extends ModelSettings {

package/model-function/generate-structure/StructureOrTextGenerationModel.d.ts

@@ -1,5 +1,5 @@
 import { FunctionOptions } from "../../core/FunctionOptions.js";
-import { StructureDefinition } from "../../core/structure/StructureDefinition.js";
+import { StructureDefinition } from "../../core/schema/StructureDefinition.js";
 import { Model, ModelSettings } from "../Model.js";
 export interface StructureOrTextGenerationModelSettings extends ModelSettings {
 }

package/model-function/generate-structure/generateStructure.d.ts

@@ -1,5 +1,5 @@
 import { FunctionOptions } from "../../core/FunctionOptions.js";
-import { StructureDefinition } from "../../core/structure/StructureDefinition.js";
+import { StructureDefinition } from "../../core/schema/StructureDefinition.js";
 import { ModelCallMetadata } from "../ModelCallMetadata.js";
 import { StructureGenerationModel, StructureGenerationModelSettings } from "./StructureGenerationModel.js";
 /**

package/model-function/generate-structure/generateStructureOrText.d.ts

@@ -1,5 +1,5 @@
 import { FunctionOptions } from "../../core/FunctionOptions.js";
-import { StructureDefinition } from "../../core/structure/StructureDefinition.js";
+import { StructureDefinition } from "../../core/schema/StructureDefinition.js";
 import { ModelCallMetadata } from "../ModelCallMetadata.js";
 import { StructureOrTextGenerationModel, StructureOrTextGenerationModelSettings } from "./StructureOrTextGenerationModel.js";
 type StructureDefinitionArray<T extends StructureDefinition<any, any>[]> = T;

package/model-function/generate-structure/streamStructure.d.ts

@@ -1,5 +1,5 @@
 import { FunctionOptions } from "../../core/FunctionOptions.js";
-import { StructureDefinition } from "../../core/structure/StructureDefinition.js";
+import { StructureDefinition } from "../../core/schema/StructureDefinition.js";
 import { ModelCallMetadata } from "../ModelCallMetadata.js";
 import { StructureStreamingModel } from "./StructureGenerationModel.js";
 export type StructureStreamPart<STRUCTURE> = {

package/model-provider/anthropic/AnthropicError.cjs

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.failedAnthropicCallResponseHandler = exports.AnthropicError = exports.anthropicErrorDataSchema = void 0;
 const zod_1 = require("zod");
 const ApiCallError_js_1 = require("../../core/api/ApiCallError.cjs");
-const parseJSON_js_1 = require("../../util/parseJSON.cjs");
-exports.anthropicErrorDataSchema = zod_1.z.object({
+const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
+const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
+exports.anthropicErrorDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
     error: zod_1.z.object({
         type: zod_1.z.string(),
         message: zod_1.z.string(),
     }),
-});
+}));
 class AnthropicError extends ApiCallError_js_1.ApiCallError {
     constructor({ data, statusCode, url, requestBodyValues, message = data.error.message, }) {
         super({ message, statusCode, requestBodyValues, url });
@@ -27,6 +28,9 @@ const failedAnthropicCallResponseHandler = async ({ response, url, requestBodyVa
     url,
     requestBodyValues,
     statusCode: response.status,
-    data: (0, parseJSON_js_1.parseJsonWithZod)(await response.text(), exports.anthropicErrorDataSchema),
+    data: (0, parseJSON_js_1.parseJSON)({
+        text: await response.text(),
+        schema: exports.anthropicErrorDataSchema,
+    }),
 });
 exports.failedAnthropicCallResponseHandler = failedAnthropicCallResponseHandler;

package/model-provider/anthropic/AnthropicError.d.ts

@@ -1,29 +1,13 @@
-import { z } from "zod";
 import { ApiCallError } from "../../core/api/ApiCallError.js";
 import { ResponseHandler } from "../../core/api/postToApi.js";
-export declare const anthropicErrorDataSchema: z.ZodObject<{
-    error: z.ZodObject<{
-        type: z.ZodString;
-        message: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        message: string;
-        type: string;
-    }, {
-        message: string;
-        type: string;
-    }>;
-}, "strip", z.ZodTypeAny, {
-    error: {
-        message: string;
-        type: string;
-    };
-}, {
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
+export declare const anthropicErrorDataSchema: ZodSchema<{
     error: {
         message: string;
         type: string;
     };
 }>;
-export type AnthropicErrorData = z.infer<typeof anthropicErrorDataSchema>;
+export type AnthropicErrorData = (typeof anthropicErrorDataSchema)["_type"];
 export declare class AnthropicError extends ApiCallError {
     readonly data: AnthropicErrorData;
     constructor({ data, statusCode, url, requestBodyValues, message, }: {

package/model-provider/anthropic/AnthropicError.js

@@ -1,12 +1,13 @@
 import { z } from "zod";
 import { ApiCallError } from "../../core/api/ApiCallError.js";
-import { parseJsonWithZod } from "../../util/parseJSON.js";
-export const anthropicErrorDataSchema = z.object({
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
+import { parseJSON } from "../../core/schema/parseJSON.js";
+export const anthropicErrorDataSchema = new ZodSchema(z.object({
     error: z.object({
         type: z.string(),
         message: z.string(),
     }),
-});
+}));
 export class AnthropicError extends ApiCallError {
     constructor({ data, statusCode, url, requestBodyValues, message = data.error.message, }) {
         super({ message, statusCode, requestBodyValues, url });
@@ -23,5 +24,8 @@ export const failedAnthropicCallResponseHandler = async ({ response, url, reques
     url,
     requestBodyValues,
     statusCode: response.status,
-    data: parseJsonWithZod(await response.text(), anthropicErrorDataSchema),
+    data: parseJSON({
+        text: await response.text(),
+        schema: anthropicErrorDataSchema,
+    }),
 });

package/model-provider/anthropic/AnthropicTextGenerationModel.cjs

@@ -8,7 +8,8 @@ const parseEventSourceStream_js_1 = require("../../util/streaming/parseEventSour
 const AbstractModel_js_1 = require("../../model-function/AbstractModel.cjs");
 const PromptFormatTextStreamingModel_js_1 = require("../../model-function/generate-text/PromptFormatTextStreamingModel.cjs");
 const AsyncQueue_js_1 = require("../../util/AsyncQueue.cjs");
-const parseJSON_js_1 = require("../../util/parseJSON.cjs");
+const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
+const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 const AnthropicApiConfiguration_js_1 = require("./AnthropicApiConfiguration.cjs");
 const AnthropicError_js_1 = require("./AnthropicError.cjs");
 const AnthropicPromptFormat_js_1 = require("./AnthropicPromptFormat.cjs");
@@ -158,11 +159,11 @@ async function callAnthropicTextGenerationAPI({ api = new AnthropicApiConfigurat
         abortSignal,
     });
 }
-const anthropicTextStreamingResponseSchema = zod_1.z.object({
+const anthropicTextStreamingResponseSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.object({
     completion: zod_1.z.string(),
     stop_reason: zod_1.z.string().nullable(),
     model: zod_1.z.string(),
-});
+}));
 async function createAnthropicFullDeltaIterableQueue(stream) {
     const queue = new AsyncQueue_js_1.AsyncQueue();
     let content = "";
@@ -180,7 +181,10 @@ async function createAnthropicFullDeltaIterableQueue(stream) {
                     continue;
                 }
                 const data = event.data;
-                const eventData = (0, parseJSON_js_1.parseJsonWithZod)(data, anthropicTextStreamingResponseSchema);
+                const eventData = (0, parseJSON_js_1.parseJSON)({
+                    text: data,
+                    schema: anthropicTextStreamingResponseSchema,
+                });
                 content += eventData.completion;
                 queue.push({
                     type: "delta",