modelfusion 0.66.1 → 0.68.0

package/tool/WebSearchTool.js

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import { ZodSchema } from "../core/structure/ZodSchema.js";
+import { ZodSchema } from "../core/schema/ZodSchema.js";
 import { Tool } from "./Tool.js";
 const OUTPUT_SCHEMA = new ZodSchema(z.object({
     results: z.array(z.object({

package/util/index.cjs

@@ -15,9 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./AsyncQueue.cjs"), exports);
-__exportStar(require("./JSONParseError.cjs"), exports);
 __exportStar(require("./cosineSimilarity.cjs"), exports);
 __exportStar(require("./delay.cjs"), exports);
 __exportStar(require("./getAudioFileExtension.cjs"), exports);
-__exportStar(require("./parseJSON.cjs"), exports);
 __exportStar(require("./streaming/index.cjs"), exports);

package/util/index.d.ts

@@ -1,7 +1,5 @@
 export * from "./AsyncQueue.js";
-export * from "./JSONParseError.js";
 export * from "./cosineSimilarity.js";
 export * from "./delay.js";
 export * from "./getAudioFileExtension.js";
-export * from "./parseJSON.js";
 export * from "./streaming/index.js";

package/util/index.js

@@ -1,7 +1,5 @@
 export * from "./AsyncQueue.js";
-export * from "./JSONParseError.js";
 export * from "./cosineSimilarity.js";
 export * from "./delay.js";
 export * from "./getAudioFileExtension.js";
-export * from "./parseJSON.js";
 export * from "./streaming/index.js";

package/util/streaming/parseJsonStream.cjs

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseJsonStream = void 0;
-const parseJSON_js_1 = require("../parseJSON.cjs");
+const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
 function parseJsonStream({ schema, stream, process, onDone, }) {
     function processLine(line) {
-        process((0, parseJSON_js_1.parseJsonWithZod)(line, schema));
+        process((0, parseJSON_js_1.parseJSON)({ text: line, schema }));
     }
     return (async () => {
         try {
-            let unprocessedText = "";
             const reader = new ReadableStreamDefaultReader(stream);
             const utf8Decoder = new TextDecoder("utf-8");
+            let unprocessedText = "";
             // eslint-disable-next-line no-constant-condition
             while (true) {
                 const { value: chunk, done } = await reader.read();
@@ -18,8 +18,8 @@ function parseJsonStream({ schema, stream, process, onDone, }) {
                     break;
                 }
                 unprocessedText += utf8Decoder.decode(chunk, { stream: true });
-                const processableLines = unprocessedText.split(/\r\n|\n|\r/g);
-                unprocessedText = processableLines.pop() || "";
+                const processableLines = unprocessedText.split("\n");
+                unprocessedText = processableLines.pop() ?? "";
                 processableLines.forEach(processLine);
             }
             // processing remaining text:

package/util/streaming/parseJsonStream.d.ts

@@ -1,5 +1,6 @@
+import { Schema } from "../../core/schema/Schema.js";
 export declare function parseJsonStream<T>({ schema, stream, process, onDone, }: {
-    schema: Zod.Schema<T>;
+    schema: Schema<T>;
     stream: ReadableStream<Uint8Array>;
     process: (event: T) => void;
     onDone?: () => void;

package/util/streaming/parseJsonStream.js

@@ -1,13 +1,13 @@
-import { parseJsonWithZod } from "../parseJSON.js";
+import { parseJSON } from "../../core/schema/parseJSON.js";
 export function parseJsonStream({ schema, stream, process, onDone, }) {
     function processLine(line) {
-        process(parseJsonWithZod(line, schema));
+        process(parseJSON({ text: line, schema }));
     }
     return (async () => {
         try {
-            let unprocessedText = "";
             const reader = new ReadableStreamDefaultReader(stream);
             const utf8Decoder = new TextDecoder("utf-8");
+            let unprocessedText = "";
             // eslint-disable-next-line no-constant-condition
             while (true) {
                 const { value: chunk, done } = await reader.read();
@@ -15,8 +15,8 @@ export function parseJsonStream({ schema, stream, process, onDone, }) {
                     break;
                 }
                 unprocessedText += utf8Decoder.decode(chunk, { stream: true });
-                const processableLines = unprocessedText.split(/\r\n|\n|\r/g);
-                unprocessedText = processableLines.pop() || "";
+                const processableLines = unprocessedText.split("\n");
+                unprocessedText = processableLines.pop() ?? "";
                 processableLines.forEach(processLine);
             }
             // processing remaining text:

package/vector-index/memory/MemoryVectorIndex.cjs

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemoryVectorIndex = void 0;
 const zod_1 = require("zod");
+const ZodSchema_js_1 = require("../../core/schema/ZodSchema.cjs");
 const cosineSimilarity_js_1 = require("../../util/cosineSimilarity.cjs");
-const parseJSON_js_1 = require("../../util/parseJSON.cjs");
-const jsonDataSchema = zod_1.z.array(zod_1.z.object({
+const parseJSON_js_1 = require("../../core/schema/parseJSON.cjs");
+const jsonDataSchema = new ZodSchema_js_1.ZodSchema(zod_1.z.array(zod_1.z.object({
     id: zod_1.z.string(),
     vector: zod_1.z.array(zod_1.z.number()),
     data: zod_1.z.unknown(),
-}));
+})));
 /**
  * A very simple vector index that stores all entries in memory. Useful when you only have
  * a small number of entries and don't want to set up a real database, e.g. for conversational memory
@@ -25,7 +26,7 @@ class MemoryVectorIndex {
     }
     static async deserialize({ serializedData, schema, }) {
         // validate the outer structure:
-        const json = (0, parseJSON_js_1.parseJsonWithZod)(serializedData, jsonDataSchema);
+        const json = (0, parseJSON_js_1.parseJSON)({ text: serializedData, schema: jsonDataSchema });
         if (schema != null) {
             // when a schema is provided, validate all entries:
             for (const entry of json) {

package/vector-index/memory/MemoryVectorIndex.d.ts

@@ -1,5 +1,5 @@
 import { Vector } from "../../core/Vector.js";
-import { Schema } from "../../core/structure/Schema.js";
+import { Schema } from "../../core/schema/Schema.js";
 import { VectorIndex } from "../VectorIndex.js";
 /**
  * A very simple vector index that stores all entries in memory. Useful when you only have

package/vector-index/memory/MemoryVectorIndex.js

@@ -1,11 +1,12 @@
 import { z } from "zod";
+import { ZodSchema } from "../../core/schema/ZodSchema.js";
 import { cosineSimilarity } from "../../util/cosineSimilarity.js";
-import { parseJsonWithZod } from "../../util/parseJSON.js";
-const jsonDataSchema = z.array(z.object({
+import { parseJSON } from "../../core/schema/parseJSON.js";
+const jsonDataSchema = new ZodSchema(z.array(z.object({
     id: z.string(),
     vector: z.array(z.number()),
     data: z.unknown(),
-}));
+})));
 /**
  * A very simple vector index that stores all entries in memory. Useful when you only have
  * a small number of entries and don't want to set up a real database, e.g. for conversational memory
@@ -22,7 +23,7 @@ export class MemoryVectorIndex {
     }
     static async deserialize({ serializedData, schema, }) {
         // validate the outer structure:
-        const json = parseJsonWithZod(serializedData, jsonDataSchema);
+        const json = parseJSON({ text: serializedData, schema: jsonDataSchema });
         if (schema != null) {
             // when a schema is provided, validate all entries:
             for (const entry of json) {

package/util/parseJSON.cjs

@@ -1,67 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.safeParseJsonWithSchema = exports.safeParseJsonWithZod = exports.parseJsonWithZod = void 0;
-const secure_json_parse_1 = __importDefault(require("secure-json-parse"));
-const JSONParseError_js_1 = require("./JSONParseError.cjs");
-function parseJsonWithZod(json, schema) {
-    try {
-        const parsedJson = secure_json_parse_1.default.parse(json);
-        return schema.parse(parsedJson);
-    }
-    catch (error) {
-        throw new JSONParseError_js_1.JSONParseError({
-            valueText: json,
-            cause: error,
-        });
-    }
-}
-exports.parseJsonWithZod = parseJsonWithZod;
-function safeParseJsonWithZod(json, schema) {
-    try {
-        const parsedJson = secure_json_parse_1.default.parse(json);
-        const validationResult = schema.safeParse(parsedJson);
-        if (validationResult.success) {
-            return validationResult;
-        }
-        return {
-            success: false,
-            error: new JSONParseError_js_1.JSONParseError({
-                valueText: json,
-                cause: validationResult.error,
-            }),
-        };
-    }
-    catch (error) {
-        throw new JSONParseError_js_1.JSONParseError({
-            valueText: json,
-            cause: error,
-        });
-    }
-}
-exports.safeParseJsonWithZod = safeParseJsonWithZod;
-function safeParseJsonWithSchema(json, schema) {
-    try {
-        const parsedJson = secure_json_parse_1.default.parse(json);
-        const validationResult = schema.validate(parsedJson);
-        if (validationResult.success) {
-            return validationResult;
-        }
-        return {
-            success: false,
-            error: new JSONParseError_js_1.JSONParseError({
-                valueText: json,
-                cause: validationResult.error,
-            }),
-        };
-    }
-    catch (error) {
-        throw new JSONParseError_js_1.JSONParseError({
-            valueText: json,
-            cause: error,
-        });
-    }
-}
-exports.safeParseJsonWithSchema = safeParseJsonWithSchema;

package/util/parseJSON.d.ts

@@ -1,18 +0,0 @@
-import { z } from "zod";
-import { Schema } from "../core/structure/Schema.js";
-import { JSONParseError } from "./JSONParseError.js";
-export declare function parseJsonWithZod<T>(json: string, schema: z.Schema<T>): T;
-export declare function safeParseJsonWithZod<T>(json: string, schema: z.Schema<T>): {
-    success: true;
-    data: T;
-} | {
-    success: false;
-    error: JSONParseError;
-};
-export declare function safeParseJsonWithSchema<T>(json: string, schema: Schema<T>): {
-    success: true;
-    data: T;
-} | {
-    success: false;
-    error: JSONParseError;
-};

package/util/parseJSON.js

@@ -1,58 +0,0 @@
-import SecureJSON from "secure-json-parse";
-import { JSONParseError } from "./JSONParseError.js";
-export function parseJsonWithZod(json, schema) {
-    try {
-        const parsedJson = SecureJSON.parse(json);
-        return schema.parse(parsedJson);
-    }
-    catch (error) {
-        throw new JSONParseError({
-            valueText: json,
-            cause: error,
-        });
-    }
-}
-export function safeParseJsonWithZod(json, schema) {
-    try {
-        const parsedJson = SecureJSON.parse(json);
-        const validationResult = schema.safeParse(parsedJson);
-        if (validationResult.success) {
-            return validationResult;
-        }
-        return {
-            success: false,
-            error: new JSONParseError({
-                valueText: json,
-                cause: validationResult.error,
-            }),
-        };
-    }
-    catch (error) {
-        throw new JSONParseError({
-            valueText: json,
-            cause: error,
-        });
-    }
-}
-export function safeParseJsonWithSchema(json, schema) {
-    try {
-        const parsedJson = SecureJSON.parse(json);
-        const validationResult = schema.validate(parsedJson);
-        if (validationResult.success) {
-            return validationResult;
-        }
-        return {
-            success: false,
-            error: new JSONParseError({
-                valueText: json,
-                cause: validationResult.error,
-            }),
-        };
-    }
-    catch (error) {
-        throw new JSONParseError({
-            valueText: json,
-            cause: error,
-        });
-    }
-}