@mastra/schema-compat 1.3.6 → 1.3.7-alpha.0

package/dist/index.js

@@ -5187,36 +5187,48 @@ var OpenAISchemaCompatLayer = class extends SchemaCompatLayer {
 				if (!schema.required?.includes(key)) {
 					schema["x-optional"] = [...schema["x-optional"] || [], key];
 					schema.required?.push(key);
-					if (prop.type) {
-						if (Array.isArray(prop.type)) {
-							const types = [...prop.type];
-							if (!types.includes("null")) types.push("null");
-							const propSchema = { ...prop };
-							delete propSchema.anyOf;
-							delete propSchema.type;
-							delete prop.type;
-							prop.anyOf = types.map((type) => type === "null" ? { type: "null" } : {
-								...propSchema,
-								type
-							});
-						} else if (prop.type !== "null") {
-							const originalType = prop.type;
-							const propSchema = { ...prop };
-							delete propSchema.anyOf;
-							delete propSchema.type;
-							delete prop.type;
-							prop.anyOf = [{
-								...propSchema,
-								type: originalType
-							}, { type: "null" }];
-						}
+					if (Array.isArray(prop.type)) {
+						const types = [...prop.type];
+						if (!types.includes("null")) types.push("null");
+						delete prop.anyOf;
+						delete prop.type;
+						if ("const" in prop) {
+							const constValue = prop.const;
+							prop.enum = !prop.enum || prop.enum.some((value) => JSON.stringify(value) === JSON.stringify(constValue)) ? [constValue, null] : [null];
+							delete prop.const;
+						} else if (prop.enum && !prop.enum.includes(null)) prop.enum = [...prop.enum, null];
+						const objectKeywords = [
+							"properties",
+							"required",
+							"additionalProperties",
+							"x-optional"
+						];
+						const arrayKeywords = ["items"];
+						prop.anyOf = types.map((type) => {
+							if (type === "null") return { type: "null" };
+							const branch = { type };
+							const keywords = type === "object" ? objectKeywords : type === "array" ? arrayKeywords : [];
+							for (const keyword of keywords) if (keyword in prop) branch[keyword] = prop[keyword];
+							return branch;
+						});
+						for (const keyword of [...objectKeywords, ...arrayKeywords]) delete prop[keyword];
+					} else if (prop.type && prop.type !== "null") {
+						const originalType = prop.type;
+						const propSchema = { ...prop };
+						delete propSchema.anyOf;
+						delete propSchema.type;
+						delete prop.type;
+						prop.anyOf = [{
+							...propSchema,
+							type: originalType
+						}, { type: "null" }];
 					}
 				}
 			}
 		}
 	}
 	#traverse(value, schema) {
-		const resolved = this.#resolveAnyOf(schema);
+		const resolved = this.#resolveAnyOf(schema, value);
 		if ((isDateFormat(resolved) || resolved["x-date"] === true) && typeof value === "string") return new Date(value);
 		if (resolved.type === "array" || Array.isArray(resolved.type) && resolved.type.includes("array")) {
 			if (!Array.isArray(value)) return value;
@@ -5232,13 +5244,33 @@ var OpenAISchemaCompatLayer = class extends SchemaCompatLayer {
 		return obj;
 	}
 	/**
-	* If schema has anyOf, return the first non-null variant for traversal.
+	* If schema has anyOf, return the variant whose type matches the value's shape
+	* (branches are type-specific), falling back to the first non-null variant.
 	* Otherwise return the schema itself.
 	*/
-	#resolveAnyOf(schema) {
+	#resolveAnyOf(schema, value) {
 		if (Array.isArray(schema.anyOf)) {
-			const nonNull = schema.anyOf.find((s) => s.type !== "null");
-			if (nonNull) return nonNull;
+			const nonNullVariants = schema.anyOf.filter((s) => s && s.type !== "null");
+			const valueType = Array.isArray(value) ? "array" : value !== null && typeof value === "object" ? "object" : typeof value === "number" ? Number.isInteger(value) ? "integer" : "number" : typeof value === "string" || typeof value === "boolean" ? typeof value : void 0;
+			if (valueType) {
+				const hasType = (variant, type) => (Array.isArray(variant.type) ? variant.type : [variant.type]).includes(type);
+				const exactMatch = nonNullVariants.find((variant) => hasType(variant, valueType));
+				if (exactMatch) return {
+					...schema,
+					...exactMatch
+				};
+				if (valueType === "integer") {
+					const numberMatch = nonNullVariants.find((variant) => hasType(variant, "number"));
+					if (numberMatch) return {
+						...schema,
+						...numberMatch
+					};
+				}
+			}
+			if (nonNullVariants[0]) return {
+				...schema,
+				...nonNullVariants[0]
+			};
 		}
 		return schema;
 	}