modelfusion 0.47.0 → 0.47.2

package/util/parseJSON.cjs

@@ -0,0 +1,67 @@
+"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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,58 @@
+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,
+        });
+    }
+}

package/vector-index/memory/MemoryVectorIndex.cjs

@@ -1,16 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemoryVectorIndex = void 0;
-const secure_json_parse_1 = __importDefault(require("secure-json-parse"));
-const zod_1 = __importDefault(require("zod"));
+const zod_1 = require("zod");
 const cosineSimilarity_js_1 = require("../../util/cosineSimilarity.cjs");
-const jsonDataSchema = zod_1.default.array(zod_1.default.object({
-    id: zod_1.default.string(),
-    vector: zod_1.default.array(zod_1.default.number()),
-    data: zod_1.default.unknown(),
+const parseJSON_js_1 = require("../../util/parseJSON.cjs");
+const jsonDataSchema = 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
@@ -28,7 +25,7 @@ class MemoryVectorIndex {
     }
     static async deserialize({ serializedData, schema, }) {
         // validate the outer structure:
-        const json = jsonDataSchema.parse(secure_json_parse_1.default.parse(serializedData));
+        const json = (0, parseJSON_js_1.parseJsonWithZod)(serializedData, jsonDataSchema);
         if (schema != null) {
             // when a schema is provided, validate all entries:
             for (const entry of json) {

package/vector-index/memory/MemoryVectorIndex.js

@@ -1,6 +1,6 @@
-import SecureJSON from "secure-json-parse";
-import z from "zod";
+import { z } from "zod";
 import { cosineSimilarity } from "../../util/cosineSimilarity.js";
+import { parseJsonWithZod } from "../../util/parseJSON.js";
 const jsonDataSchema = z.array(z.object({
     id: z.string(),
     vector: z.array(z.number()),
@@ -22,7 +22,7 @@ export class MemoryVectorIndex {
     }
     static async deserialize({ serializedData, schema, }) {
         // validate the outer structure:
-        const json = jsonDataSchema.parse(SecureJSON.parse(serializedData));
+        const json = parseJsonWithZod(serializedData, jsonDataSchema);
         if (schema != null) {
             // when a schema is provided, validate all entries:
             for (const entry of json) {