@orval/core 8.13.0 → 8.15.0

package/dist/index.mjs

@@ -48,6 +48,7 @@ const OutputClient = {
 	VUE_QUERY: "vue-query",
 	SWR: "swr",
 	ZOD: "zod",
+	EFFECT: "effect",
 	HONO: "hono",
 	FETCH: "fetch",
 	MCP: "mcp"
@@ -136,9 +137,12 @@ const TEMPLATE_TAG_REGEX = /\${(.+?)}/g;
 //#endregion
 //#region src/utils/assertion.ts
 /**
-* Discriminator helper for `ReferenceObject`
+* Type guard for an OpenAPI {@link OpenApiReferenceObject}.
 *
-* @param property
+* Returns `true` when `obj` has a `$ref` property, indicating a static
+* JSON Pointer reference rather than an inline schema.
+*
+* @param obj - Value to test.
 */
 function isReference(obj) {
 	return !isNullish$1(obj) && Object.hasOwn(obj, "$ref");
@@ -149,27 +153,71 @@ function isReference(obj) {
 * Returns `true` when `obj` has a `$dynamicRef` string property,
 * indicating it is an OpenAPI 3.1 dynamic reference rather than a
 * static `$ref`.
+*
+* @param obj - Value to test.
+*
+* @see https://json-schema.org/draft/2020-12/json-schema-core#section-8.2.4
 */
 function isDynamicReference(obj) {
 	return !isNullish$1(obj) && Object.hasOwn(obj, "$dynamicRef") && typeof obj.$dynamicRef === "string";
 }
+/**
+* Returns `true` when `pathValue` has no file extension and is treated as a
+* directory path.
+*
+* @param pathValue - Path string to inspect.
+*/
 function isDirectory(pathValue) {
 	return !nodePath.extname(pathValue);
 }
+/**
+* Type guard for plain objects created with `{}` or `new Object()`.
+*
+* Excludes `null`, arrays, dates, and other non-plain object values.
+*
+* @param x - Value to test.
+*/
 function isObject(x) {
 	return Object.prototype.toString.call(x) === "[object Object]";
 }
+/**
+* Type guard for string primitives and `String` wrapper objects.
+*
+* @param val - Value to test.
+*/
 function isStringLike(val) {
 	if (isString$1(val)) return true;
 	return Object.prototype.toString.call(val) === "[object String]";
 }
+/**
+* Type guard for ES module namespace objects.
+*
+* @param x - Value to test.
+*/
 function isModule(x) {
 	return Object.prototype.toString.call(x) === "[object Module]";
 }
+/**
+* Type guard for integer numbers and numeric strings.
+*
+* Accepts finite integers (`42`) and strings that match `/^-?\d+$/`
+* (`"-1"`, `"0"`). Rejects floats, empty strings, and non-numeric values.
+*
+* @param x - Value to test.
+*/
 function isNumeric(x) {
 	if (typeof x === "number") return Number.isInteger(x);
 	return isString$1(x) && /^-?\d+$/.test(x);
 }
+/**
+* Type guard for an inline OpenAPI {@link OpenApiSchemaObject}.
+*
+* Returns `true` when `x` looks like a schema definition: it has a known
+* `type`, composition keywords (`allOf`, `anyOf`, `oneOf`), or `properties`.
+* Does not match reference objects; use {@link isReference} for those.
+*
+* @param x - Value to test.
+*/
 function isSchema(x) {
 	if (!isObject(x)) return false;
 	if (isString$1(x.type) && Object.values(SchemaType).includes(x.type)) return true;
@@ -178,9 +226,22 @@ function isSchema(x) {
 	if (isObject(x.properties)) return true;
 	return false;
 }
+/**
+* Type guard for HTTP methods defined in {@link Verbs}.
+*
+* @param verb - Method name to test (for example, `"get"`, `"post"`).
+*/
 function isVerb(verb) {
 	return Object.values(Verbs).includes(verb);
 }
+/**
+* Returns `true` when `str` is a valid absolute URL with an `http:` or
+* `https:` protocol.
+*
+* Empty or whitespace-only strings are rejected.
+*
+* @param str - URL string to validate.
+*/
 function isUrl(str) {
 	if (!str.trim()) return false;
 	try {
@@ -193,6 +254,8 @@ function isUrl(str) {
 /**
 * Type guard for the MSW mock generator. Use to narrow a
 * `GlobalMockOptions | ClientMockBuilder` value to `MswMockOptions`.
+*
+* @param mock - Mock configuration or builder to test.
 */
 function isMswMock(mock) {
 	return !isFunction$1(mock) && mock.type === OutputMockType.MSW;
@@ -200,6 +263,8 @@ function isMswMock(mock) {
 /**
 * Type guard for the Faker mock generator. Use to narrow a
 * `GlobalMockOptions | ClientMockBuilder` value to `FakerMockOptions`.
+*
+* @param mock - Mock configuration or builder to test.
 */
 function isFakerMock(mock) {
 	return !isFunction$1(mock) && mock.type === OutputMockType.FAKER;
@@ -266,10 +331,11 @@ const pascalMemory = {};
 function pascal(s = "") {
 	if (pascalMemory[s]) return pascalMemory[s];
 	const isStartWithUnderscore = s.startsWith("_");
+	const cacheKey = s;
 	if (regexps.upper.test(s)) s = low(s);
 	const pascalString = (s.match(/[a-zA-Z0-9\u00C0-\u017F]+/g) ?? []).map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join("");
 	const pascalWithUnderscore = isStartWithUnderscore ? `_${pascalString}` : pascalString;
-	pascalMemory[s] = pascalWithUnderscore;
+	pascalMemory[cacheKey] = pascalWithUnderscore;
 	return pascalWithUnderscore;
 }
 function camel(s = "") {
@@ -393,6 +459,20 @@ function createDebugger(ns, options = {}) {
 const search = String.raw`\*/`;
 const replacement = String.raw`*\/`;
 const regex = new RegExp(search, "g");
+function trimTrailingEmptyLines(lines) {
+	let lastLineIndex = lines.length - 1;
+	while (lastLineIndex >= 0 && lines[lastLineIndex]?.trim() === "") lastLineIndex--;
+	return lines.slice(0, lastLineIndex + 1);
+}
+function escapeJsDoc(value) {
+	return value.replaceAll(regex, replacement);
+}
+function getDescriptionLines(description) {
+	return trimTrailingEmptyLines((Array.isArray(description) ? description.filter((line) => !line.includes("eslint-disable")) : [description ?? ""]).flatMap((block) => block.split(/\r?\n/).map((line) => escapeJsDoc(line))));
+}
+function getEslintDisable(description) {
+	return Array.isArray(description) ? description.find((line) => line.includes("eslint-disable")) : void 0;
+}
 const itemValidationKeys = [
 	"minLength",
 	"maxLength",
@@ -416,93 +496,56 @@ function getItemValidationDocEntries(schema, prefix = "items", visited = /* @__P
 		}];
 	}), ...getItemValidationDocEntries(schema.items, `${prefix}.items`, visited)];
 }
+function toJsDocEntry(key, value) {
+	if (value === void 0 || value === false || value === "") return [];
+	return [{
+		key,
+		value
+	}];
+}
+function getSchemaDocEntries(schema, itemValidationDocEntries, isNullable) {
+	const { deprecated, summary, minLength, maxLength, minimum, maximum, exclusiveMinimum, exclusiveMaximum, minItems, maxItems, pattern } = schema;
+	return [
+		...toJsDocEntry("deprecated", deprecated),
+		...toJsDocEntry("summary", summary),
+		...toJsDocEntry("minLength", minLength),
+		...toJsDocEntry("maxLength", maxLength),
+		...toJsDocEntry("minimum", minimum),
+		...toJsDocEntry("maximum", maximum),
+		...toJsDocEntry("exclusiveMinimum", exclusiveMinimum),
+		...toJsDocEntry("exclusiveMaximum", exclusiveMaximum),
+		...toJsDocEntry("minItems", minItems),
+		...toJsDocEntry("maxItems", maxItems),
+		...toJsDocEntry("nullable", isNullable),
+		...toJsDocEntry("pattern", pattern),
+		...itemValidationDocEntries.flatMap(({ key, value }) => toJsDocEntry(key, value))
+	];
+}
+function formatJsDocEntry({ key, value }) {
+	if (value === true) return `@${key}`;
+	return `@${key} ${escapeJsDoc(value.toString())}`;
+}
+function renderJsDocBlock(lines, tryOneLine = false) {
+	if (lines.length === 0) return "";
+	if (lines.length === 1 && tryOneLine) return `/** ${lines[0]} */\n`;
+	const linePrefix = `${tryOneLine ? "  " : ""} *`;
+	const closingPrefix = ` ${tryOneLine ? "  " : ""}`;
+	return `/**\n${lines.map((line) => `${linePrefix}${line ? ` ${line}` : ""}`).join("\n")}\n${closingPrefix}*/\n`;
+}
 function jsDoc(schema, tryOneLine = false, context) {
 	if (context?.output.override.jsDoc) {
 		const { filter } = context.output.override.jsDoc;
 		if (filter) return keyValuePairsToJsDoc(filter(schema));
 	}
-	const { description, deprecated, summary, minLength, maxLength, minimum, maximum, exclusiveMinimum, exclusiveMaximum, minItems, maxItems, pattern } = schema;
 	const isNullable = schema.type === "null" || Array.isArray(schema.type) && schema.type.includes("null");
 	const itemValidationDocEntries = getItemValidationDocEntries(schema.items);
-	const lines = (Array.isArray(description) ? description.filter((d) => !d.includes("eslint-disable")) : [description ?? ""]).flatMap((line) => line.split(/\r?\n/)).map((line) => line.replaceAll(regex, replacement));
-	const count = [
-		description,
-		deprecated,
-		summary,
-		minLength?.toString(),
-		maxLength?.toString(),
-		minimum?.toString(),
-		maximum?.toString(),
-		exclusiveMinimum?.toString(),
-		exclusiveMaximum?.toString(),
-		minItems?.toString(),
-		maxItems?.toString(),
-		isNullable ? "null" : "",
-		pattern,
-		...itemValidationDocEntries.map(({ value }) => value.toString())
-	].filter(Boolean).length;
-	if (!count) return "";
-	const oneLine = count === 1 && tryOneLine;
-	const eslintDisable = Array.isArray(description) ? description.find((d) => d.includes("eslint-disable"))?.replaceAll(regex, replacement) : void 0;
-	let doc = `${eslintDisable ? `/* ${eslintDisable} */\n` : ""}/**`;
-	if (description) {
-		if (!oneLine) doc += `\n${tryOneLine ? "  " : ""} *`;
-		doc += ` ${lines.join("\n * ")}`;
-	}
-	function appendPrefix() {
-		if (!oneLine) doc += `\n${tryOneLine ? "  " : ""} *`;
-	}
-	function tryAppendStringDocLine(key, value) {
-		if (value) {
-			appendPrefix();
-			doc += ` @${key} ${value.replaceAll(regex, replacement)}`;
-		}
-	}
-	function tryAppendBooleanDocLine(key, value) {
-		if (value === true) {
-			appendPrefix();
-			doc += ` @${key}`;
-		}
-	}
-	function tryAppendNumberDocLine(key, value) {
-		if (value !== void 0) {
-			appendPrefix();
-			doc += ` @${key} ${value}`;
-		}
-	}
-	tryAppendBooleanDocLine("deprecated", deprecated);
-	tryAppendStringDocLine("summary", summary?.replaceAll(regex, replacement));
-	tryAppendNumberDocLine("minLength", minLength);
-	tryAppendNumberDocLine("maxLength", maxLength);
-	tryAppendNumberDocLine("minimum", minimum);
-	tryAppendNumberDocLine("maximum", maximum);
-	tryAppendNumberDocLine("exclusiveMinimum", exclusiveMinimum);
-	tryAppendNumberDocLine("exclusiveMaximum", exclusiveMaximum);
-	tryAppendNumberDocLine("minItems", minItems);
-	tryAppendNumberDocLine("maxItems", maxItems);
-	tryAppendBooleanDocLine("nullable", isNullable);
-	tryAppendStringDocLine("pattern", pattern);
-	for (const { key, value } of itemValidationDocEntries) {
-		if (typeof value === "string") {
-			tryAppendStringDocLine(key, value);
-			continue;
-		}
-		if (typeof value === "number") {
-			tryAppendNumberDocLine(key, value);
-			continue;
-		}
-		tryAppendBooleanDocLine(key, value);
-	}
-	doc += oneLine ? " " : `\n ${tryOneLine ? "  " : ""}`;
-	doc += "*/\n";
-	return doc;
+	const lines = [...getDescriptionLines(schema.description), ...getSchemaDocEntries(schema, itemValidationDocEntries, isNullable).map((entry) => formatJsDocEntry(entry))];
+	const eslintDisable = getEslintDisable(schema.description);
+	const doc = renderJsDocBlock(lines, tryOneLine);
+	return `${eslintDisable ? `/* ${escapeJsDoc(eslintDisable)} */\n` : ""}${doc}`;
 }
 function keyValuePairsToJsDoc(keyValues) {
-	if (keyValues.length === 0) return "";
-	let doc = "/**\n";
-	for (const { key, value } of keyValues) doc += ` * @${key} ${value}\n`;
-	doc += " */\n";
-	return doc;
+	return renderJsDocBlock(keyValues.map(({ key, value }) => `@${key} ${value}`));
 }
 //#endregion
 //#region src/utils/dynamic-import.ts
@@ -665,9 +708,6 @@ const LogLevels = {
 	warn: 2,
 	info: 3
 };
-let lastType;
-let lastMsg;
-let sameCount = 0;
 function clearScreen() {
 	const repeatCount = process.stdout.rows - 2;
 	const blank = repeatCount > 0 ? "\n".repeat(repeatCount) : "";
@@ -677,6 +717,9 @@ function clearScreen() {
 }
 function createLogger(level = "info", options = {}) {
 	const { prefix = "[vite]", allowClearScreen = true } = options;
+	let lastType;
+	let lastMsg;
+	let sameCount = 0;
 	const thresh = LogLevels[level];
 	const clear = allowClearScreen && process.stdout.isTTY && !process.env.CI ? clearScreen : () => {};
 	function output(type, msg, options = {}) {
@@ -1239,7 +1282,7 @@ const getUnion = (value, enumName) => {
 };
 function getEnumUnionFromSchema(schema) {
 	if (!schema?.enum) return "";
-	return schema.enum.filter((val) => val !== null).map((val) => isString(val) ? `'${escape(val)}'` : String(val)).join(" | ");
+	return schema.enum.filter((val) => val !== null).map((val) => isString(val) ? `'${jsStringEscape(val)}'` : String(val)).join(" | ");
 }
 const stripNullUnion = (value) => value.replaceAll(/\s*\|\s*null/g, "").trim();
 const isSpreadableEnumRef = (schema, refName) => {
@@ -1626,13 +1669,13 @@ function getPropertyNamesEnumKeyType(item) {
 	if (Array.isArray(propertyNames.enum)) {
 		const enumValues = propertyNames.enum.filter((val) => isString(val));
 		if (enumValues.length > 0) return {
-			value: enumValues.map((val) => `'${escape(val)}'`).join(" | "),
+			value: enumValues.map((val) => `'${jsStringEscape(val)}'`).join(" | "),
 			imports: [],
 			dependencies: []
 		};
 	}
 	if (isString(propertyNames.const)) return {
-		value: `'${escape(propertyNames.const)}'`,
+		value: `'${jsStringEscape(propertyNames.const)}'`,
 		imports: [],
 		dependencies: []
 	};
@@ -1771,7 +1814,7 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 			const hasConst = constValue !== void 0;
 			let constLiteral;
 			if (!hasConst) constLiteral = void 0;
-			else if (isString(constValue)) constLiteral = `'${escape(constValue)}'`;
+			else if (isString(constValue)) constLiteral = `'${jsStringEscape(constValue)}'`;
 			else constLiteral = JSON.stringify(constValue);
 			const needsValueImport = hasConst && (resolvedValue.isEnum || resolvedValue.type === "enum");
 			const usedResolvedValue = !hasConst || needsValueImport;
@@ -1904,7 +1947,7 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 		else if (typeof constValue === "boolean") type = "boolean";
 		else type = "object";
 		return {
-			value: typeof constValue === "string" ? `'${escape(constValue)}'` : JSON.stringify(constValue),
+			value: typeof constValue === "string" ? `'${jsStringEscape(constValue)}'` : JSON.stringify(constValue),
 			imports: [],
 			schemas: [],
 			isEnum: false,
@@ -2045,7 +2088,7 @@ function getScalar({ item, name, context, formDataContext }) {
 			let value = "string";
 			let isEnum = false;
 			if (enumItems) {
-				value = enumItems.map((enumItem) => isString(enumItem) ? `'${escape(enumItem)}'` : `${enumItem}`).filter(Boolean).join(` | `);
+				value = enumItems.map((enumItem) => isString(enumItem) ? `'${jsStringEscape(enumItem)}'` : `${enumItem}`).filter(Boolean).join(` | `);
 				isEnum = true;
 			}
 			if (!formDataContext?.urlEncoded) {
@@ -2107,7 +2150,7 @@ function getScalar({ item, name, context, formDataContext }) {
 				nullable
 			});
 			if (enumItems) return {
-				value: enumItems.map((enumItem) => isString(enumItem) ? `'${escape(enumItem)}'` : String(enumItem)).filter(Boolean).join(` | `) + nullable,
+				value: enumItems.map((enumItem) => isString(enumItem) ? `'${jsStringEscape(enumItem)}'` : String(enumItem)).filter(Boolean).join(` | `) + nullable,
 				isEnum: true,
 				type: "string",
 				imports: [],
@@ -2385,27 +2428,33 @@ function resolveDynamicRef(anchorName, context, imports = []) {
 	let scopeEntry = (context.dynamicScope ?? {})[anchorName];
 	if (!scopeEntry) {
 		const schemas = context.spec.components?.schemas;
-		if (schemas && typeof schemas === "object") for (const [schemaName, schemaObj] of Object.entries(schemas)) {
-			if (!schemaObj || typeof schemaObj !== "object") continue;
-			if (schemaObj.$dynamicAnchor === anchorName) {
-				const refInfo = getRefInfo(`#/components/schemas/${encodeJsonPointerSegment(schemaName)}`, context);
+		if (schemas && typeof schemas === "object") {
+			const matches = [];
+			for (const [schemaName, schemaObj] of Object.entries(schemas)) {
+				if (!schemaObj || typeof schemaObj !== "object") continue;
+				if (schemaObj.$dynamicAnchor === anchorName) matches.push(schemaName);
+			}
+			const match = matches.length === 1 ? matches[0] : matches.find((m) => m === anchorName);
+			if (match) {
+				const refInfo = getRefInfo(`#/components/schemas/${encodeJsonPointerSegment(match)}`, context);
 				scopeEntry = {
 					name: refInfo.name,
 					schemaName: refInfo.originalName
 				};
-				break;
 			}
 		}
 	}
 	if (!scopeEntry) return {
 		schema: {},
 		imports,
-		resolvedTypeName: "unknown"
+		resolvedTypeName: "unknown",
+		schemaName: void 0
 	};
 	if (scopeEntry.isParameter) return {
 		schema: {},
 		imports,
-		resolvedTypeName: scopeEntry.name
+		resolvedTypeName: scopeEntry.name,
+		schemaName: void 0
 	};
 	const resolvedTypeName = scopeEntry.name;
 	const schemaRef = `#/components/schemas/${encodeJsonPointerSegment(scopeEntry.schemaName)}`;
@@ -2414,13 +2463,15 @@ function resolveDynamicRef(anchorName, context, imports = []) {
 		return {
 			schema: resolvedSchema,
 			imports: resolvedImports,
-			resolvedTypeName
+			resolvedTypeName,
+			schemaName: scopeEntry.schemaName
 		};
 	} catch {
 		return {
 			schema: {},
 			imports,
-			resolvedTypeName: "unknown"
+			resolvedTypeName: "unknown",
+			schemaName: void 0
 		};
 	}
 }
@@ -2595,25 +2646,44 @@ function resolveValue({ schema, name, context, formDataContext }) {
 		const resolvedImport = imports[0];
 		let hasReadonlyProps = false;
 		const refName = resolvedImport.name;
-		if (!context.parents?.includes(refName) && hasScopeAffectedDynamicRef(schemaObject, context, refName)) return {
+		let effectiveContext = context;
+		const refAnchor = schemaObject.$dynamicAnchor;
+		if (typeof refAnchor === "string" && context.dynamicScope?.[refAnchor] && context.dynamicScope[refAnchor].name !== refName && !context.dynamicScope[refAnchor].isParameter) {
+			const scopeEntry = context.dynamicScope[refAnchor];
+			const allOf = ((context.spec.components?.schemas)?.[scopeEntry.schemaName])?.allOf;
+			if (!(Array.isArray(allOf) && allOf.some((el) => {
+				if (!el || typeof el !== "object") return false;
+				const rec = el;
+				if (typeof rec.$ref !== "string" || !isComponentRef(rec.$ref)) return false;
+				const { name } = getRefInfo(rec.$ref, context);
+				return name === refName;
+			}))) {
+				const filteredScope = Object.fromEntries(Object.entries(context.dynamicScope).filter(([key]) => key !== refAnchor));
+				effectiveContext = {
+					...context,
+					dynamicScope: filteredScope
+				};
+			}
+		}
+		if (!effectiveContext.parents?.includes(refName) && hasScopeAffectedDynamicRef(schemaObject, effectiveContext, refName)) return {
 			...getScalar({
 				item: schemaObject,
 				name: name ?? refName,
 				context: {
-					...context,
-					parents: [...context.parents ?? [], refName]
+					...effectiveContext,
+					parents: [...effectiveContext.parents ?? [], refName]
 				},
 				formDataContext
 			}),
 			originalSchema: schemaObject,
 			isRef: false
 		};
-		if (!context.parents?.includes(refName)) hasReadonlyProps = getScalar({
+		if (!effectiveContext.parents?.includes(refName)) hasReadonlyProps = getScalar({
 			item: schemaObject,
 			name: refName,
 			context: {
-				...context,
-				parents: [...context.parents ?? [], refName]
+				...effectiveContext,
+				parents: [...effectiveContext.parents ?? [], refName]
 			}
 		}).hasReadonlyProps;
 		const isAnyOfNullable = schemaObject.anyOf?.some((anyOfItem) => !isReference(anyOfItem) && (anyOfItem.type === "null" || Array.isArray(anyOfItem.type) && anyOfItem.type.includes("null")));
@@ -3416,9 +3486,13 @@ function resolveDiscriminators(schemas, context) {
 	}
 	for (const [parentName, parentSchema] of Object.entries(transformedSchemas)) {
 		if (isBoolean$1(parentSchema)) continue;
-		if (!parentSchema.oneOf || !parentSchema.discriminator?.mapping) continue;
-		const { mapping, propertyName } = parentSchema.discriminator;
+		const variants = parentSchema.oneOf ?? parentSchema.anyOf;
+		if (!variants || !parentSchema.discriminator) continue;
+		const { propertyName, mapping } = parentSchema.discriminator;
 		if (!propertyName) continue;
+		const mappedRefs = mapping ? Object.values(mapping) : [];
+		const variantArrayRefs = variants.filter((item) => isReference(item) && typeof item.$ref === "string").map((item) => item.$ref);
+		const variantRefs = [...new Set([...mappedRefs, ...variantArrayRefs])];
 		const parentProperties = parentSchema.properties;
 		const parentRequired = parentSchema.required;
 		const inheritableProps = {};
@@ -3427,7 +3501,7 @@ function resolveDiscriminators(schemas, context) {
 		}
 		const inheritableRequired = parentRequired?.filter((key) => key !== propertyName);
 		const hasInheritableProps = Object.keys(inheritableProps).length > 0;
-		for (const mappingValue of Object.values(mapping)) {
+		for (const mappingValue of variantRefs) {
 			let variantSchema;
 			try {
 				const { originalName } = getRefInfo(mappingValue, context);
@@ -4017,14 +4091,17 @@ function hasCircularReference(target, sourceName, context, visited = /* @__PURE_
 function buildPayload(target, context, parents, imports) {
 	if (isReference$1(target)) return buildRefPayload(target, context, parents, imports);
 	const schema = target;
-	if (schema.allOf) return buildAllOfPayload(getSchemas(schema.allOf) ?? [], context, parents, imports);
-	if (schema.oneOf) return buildFirstOfPayload(getSchemas(schema.oneOf) ?? [], context, parents, imports);
-	if (schema.anyOf) return buildFirstOfPayload(getSchemas(schema.anyOf) ?? [], context, parents, imports);
+	const payloads = [];
+	if (schema.allOf) payloads.push(buildAllOfPayload(getSchemas(schema.allOf) ?? [], context, parents, imports));
+	else if (schema.oneOf) payloads.push(buildFirstOfPayload(getSchemas(schema.oneOf) ?? [], context, parents, imports));
+	else if (schema.anyOf) payloads.push(buildFirstOfPayload(getSchemas(schema.anyOf) ?? [], context, parents, imports));
+	if (Object.keys(getProperties(schema)).length > 0) payloads.push(buildObjectPayload(schema, context, parents, imports));
+	if (payloads.length > 0) return payloads.length === 1 ? payloads[0] : `Object.assign({}, ${payloads.join(", ")})`;
 	const { constValue } = getExtendedProps(schema);
 	if (constValue !== void 0) return formatValue(constValue);
 	if (schema.default !== void 0) return buildDefaultPayload(schema, context);
 	const schemaType = inferSchemaType(schema);
-	if (schemaType === "object" || schema.properties) return buildObjectPayload(schema, context, parents, imports);
+	if (schemaType === "object") return "{}";
 	if (schemaType === "array") return buildArrayPayload(schema, context, parents, imports);
 	return buildPrimitivePayload(schema, schemaType, context);
 }
@@ -4399,6 +4476,9 @@ function parseFile(file, name) {
 		return;
 	}
 }
+function standardMutatorInfo() {
+	return { numberOfParams: 1 };
+}
 function parseFunction(ast, funcName) {
 	const node = ast.body.find((childNode) => {
 		if (childNode.type === "VariableDeclaration") return childNode.declarations.find((d) => d.id.type === "Identifier" && d.id.name === funcName);
@@ -4423,6 +4503,7 @@ function parseFunction(ast, funcName) {
 	const declaration = "declarations" in node ? node.declarations.find((d) => d.id.type === "Identifier" && d.id.name === funcName) : void 0;
 	if (declaration?.init) {
 		if ("name" in declaration.init) return parseFunction(ast, declaration.init.name);
+		if (declaration.init.type === "CallExpression") return standardMutatorInfo();
 		if ("body" in declaration.init && "params" in declaration.init && declaration.init.body.type === "ArrowFunctionExpression") return {
 			numberOfParams: declaration.init.params.length,
 			returnNumberOfParams: declaration.init.body.params.length