@orval/core 8.11.0 → 8.12.1

package/dist/index.mjs

@@ -1,14 +1,14 @@
 import { t as __exportAll } from "./chunk-BpYLSNr0.mjs";
 import { createRequire } from "node:module";
-import { entries, groupBy, isArray, isBoolean, isBoolean as isBoolean$1, isEmptyish, isFunction, isNullish, isNullish as isNullish$1, isNumber, isString, isString as isString$1, prop, unique, uniqueBy, uniqueWith } from "remeda";
+import { entries, groupBy, isArray, isBoolean, isBoolean as isBoolean$1, isEmptyish, isFunction, isFunction as isFunction$1, isNullish, isNullish as isNullish$1, isNumber, isString, isString as isString$1, prop, unique, uniqueBy, uniqueWith } from "remeda";
 import { keyword } from "esutils";
-import nodePath from "node:path";
+import path from "node:path";
 import { compare } from "compare-versions";
 import debug from "debug";
 import { pathToFileURL } from "node:url";
 import { createJiti } from "jiti";
 import fs, { existsSync, readFileSync } from "node:fs";
-import { globby } from "globby";
+import { glob } from "tinyglobby";
 import readline from "node:readline";
 import { styleText } from "node:util";
 import { isDereferenced } from "@scalar/openapi-types/helpers";
@@ -63,7 +63,10 @@ const OutputMode = {
 	TAGS: "tags",
 	TAGS_SPLIT: "tags-split"
 };
-const OutputMockType = { MSW: "msw" };
+const OutputMockType = {
+	MSW: "msw",
+	FAKER: "faker"
+};
 const FormDataArrayHandling = {
 	SERIALIZE: "serialize",
 	EXPLODE: "explode",
@@ -141,7 +144,7 @@ function isReference(obj) {
 	return !isNullish$1(obj) && Object.hasOwn(obj, "$ref");
 }
 function isDirectory(pathValue) {
-	return !nodePath.extname(pathValue);
+	return !path.extname(pathValue);
 }
 function isObject(x) {
 	return Object.prototype.toString.call(x) === "[object Object]";
@@ -177,6 +180,20 @@ function isUrl(str) {
 		return false;
 	}
 }
+/**
+* Type guard for the MSW mock generator. Use to narrow a
+* `GlobalMockOptions | ClientMockBuilder` value to `MswMockOptions`.
+*/
+function isMswMock(mock) {
+	return !isFunction$1(mock) && mock.type === OutputMockType.MSW;
+}
+/**
+* Type guard for the Faker mock generator. Use to narrow a
+* `GlobalMockOptions | ClientMockBuilder` value to `FakerMockOptions`.
+*/
+function isFakerMock(mock) {
+	return !isFunction$1(mock) && mock.type === OutputMockType.FAKER;
+}
 //#endregion
 //#region src/utils/async-reduce.ts
 async function asyncReduce(array, reducer, initValue) {
@@ -365,7 +382,7 @@ function createDebugger(ns, options = {}) {
 //#region src/utils/doc.ts
 const search = String.raw`\*/`;
 const replacement = String.raw`*\/`;
-const regex$1 = new RegExp(search, "g");
+const regex = new RegExp(search, "g");
 const itemValidationKeys = [
 	"minLength",
 	"maxLength",
@@ -397,7 +414,7 @@ function jsDoc(schema, tryOneLine = false, context) {
 	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 ?? ""]).map((line) => line.replaceAll(regex$1, replacement));
+	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,
@@ -416,7 +433,7 @@ function jsDoc(schema, tryOneLine = false, context) {
 	].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$1, replacement) : void 0;
+	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 ? "  " : ""} *`;
@@ -428,7 +445,7 @@ function jsDoc(schema, tryOneLine = false, context) {
 	function tryAppendStringDocLine(key, value) {
 		if (value) {
 			appendPrefix();
-			doc += ` @${key} ${value.replaceAll(regex$1, replacement)}`;
+			doc += ` @${key} ${value.replaceAll(regex, replacement)}`;
 		}
 	}
 	function tryAppendBooleanDocLine(key, value) {
@@ -444,7 +461,7 @@ function jsDoc(schema, tryOneLine = false, context) {
 		}
 	}
 	tryAppendBooleanDocLine("deprecated", deprecated);
-	tryAppendStringDocLine("summary", summary?.replaceAll(regex$1, replacement));
+	tryAppendStringDocLine("summary", summary?.replaceAll(regex, replacement));
 	tryAppendNumberDocLine("minLength", minLength);
 	tryAppendNumberDocLine("maxLength", maxLength);
 	tryAppendNumberDocLine("minimum", minimum);
@@ -490,8 +507,8 @@ async function dynamicImport(toImport, from = process.cwd(), takeDefault = true)
 	if (!toImport) return toImport;
 	try {
 		if (isString(toImport)) {
-			const filePath = nodePath.resolve(from, toImport);
-			const extension = nodePath.extname(filePath);
+			const filePath = path.resolve(from, toImport);
+			const extension = path.extname(filePath);
 			if (TS_MODULE_EXTENSIONS.has(extension)) {
 				const data = await createJiti(from, { interopDefault: true }).import(filePath);
 				if (takeDefault && (isObject(data) || isModule(data)) && data.default) return data.default;
@@ -516,23 +533,23 @@ function getExtension(path) {
 //#region src/utils/file.ts
 function getFileInfo(target = "", { backupFilename = "filename", extension = ".ts" } = {}) {
 	const isDir = isDirectory(target);
-	const filePath = isDir ? nodePath.join(target, backupFilename + extension) : target;
+	const filePath = isDir ? path.join(target, backupFilename + extension) : target;
 	return {
 		path: filePath,
 		pathWithoutExtension: filePath.replace(/\.[^/.]+$/, ""),
 		extension,
 		isDirectory: isDir,
-		dirname: nodePath.dirname(filePath),
-		filename: nodePath.basename(filePath, extension.startsWith(".") ? extension : `.${extension}`)
+		dirname: path.dirname(filePath),
+		filename: path.basename(filePath, extension.startsWith(".") ? extension : `.${extension}`)
 	};
 }
 async function removeFilesAndEmptyFolders(patterns, dir) {
-	const files = await globby(patterns, {
+	const files = await glob(patterns, {
 		cwd: dir,
 		absolute: true
 	});
 	await Promise.all(files.map((file) => fs.promises.unlink(file)));
-	const sortedDirectories = (await globby(["**/*"], {
+	const sortedDirectories = (await glob(["**/*"], {
 		cwd: dir,
 		absolute: true,
 		onlyDirectories: true
@@ -546,11 +563,17 @@ async function removeFilesAndEmptyFolders(patterns, dir) {
 }
 //#endregion
 //#region src/utils/file-extensions.ts
+/**
+* Returns the filename suffix for a given mock entry's output file. For
+* example a `{ type: OutputMockType.MSW }` entry produces `<file>.msw.ts` and
+* a `{ type: OutputMockType.FAKER }` entry produces `<file>.faker.ts`.
+*
+* Custom `ClientMockBuilder` functions default to the `msw` suffix to preserve
+* the historical behavior.
+*/
 function getMockFileExtensionByTypeName(mock) {
-	if (isFunction(mock)) return "msw";
-	switch (mock.type) {
-		default: return "msw";
-	}
+	if (isFunction(mock)) return OutputMockType.MSW;
+	return mock.type;
 }
 //#endregion
 //#region src/utils/get-property-safe.ts
@@ -731,13 +754,13 @@ function toUnix(value) {
 	return value;
 }
 function join(...args) {
-	return toUnix(nodePath.join(...args.map((a) => toUnix(a))));
+	return toUnix(path.join(...args.map((a) => toUnix(a))));
 }
 /**
 * Behaves exactly like `path.relative(from, to)`, but keeps the first meaningful "./"
 */
 function relativeSafe(from, to) {
-	return normalizeSafe(`./${toUnix(nodePath.relative(toUnix(from), toUnix(to)))}`);
+	return normalizeSafe(`./${toUnix(path.relative(toUnix(from), toUnix(to)))}`);
 }
 function getSchemaFileName(path) {
 	return path.replace(`.${getExtension(path)}`, "").slice(path.lastIndexOf("/") + 1);
@@ -745,13 +768,13 @@ function getSchemaFileName(path) {
 function normalizeSafe(value) {
 	let result;
 	value = toUnix(value);
-	result = toUnix(nodePath.normalize(value));
+	result = toUnix(path.normalize(value));
 	if (value.startsWith("./") && !result.startsWith("./") && !result.startsWith("..")) result = "./" + result;
 	else if (value.startsWith("//") && !result.startsWith("//")) result = value.startsWith("//./") ? "//." + result : "/" + result;
 	return result;
 }
 function joinSafe(...values) {
-	let result = toUnix(nodePath.join(...values.map((v) => toUnix(v))));
+	let result = toUnix(path.join(...values.map((v) => toUnix(v))));
 	if (values.length > 0) {
 		const firstValue = toUnix(values[0]);
 		if (firstValue.startsWith("./") && !result.startsWith("./") && !result.startsWith("..")) result = "./" + result;
@@ -782,14 +805,14 @@ function joinSafe(...values) {
 * @returns The relative import path string.
 */
 function getRelativeImportPath(importerFilePath, exporterFilePath, includeFileExtension = false) {
-	if (!nodePath.isAbsolute(importerFilePath)) throw new Error(`'importerFilePath' is not an absolute path. "${importerFilePath}"`);
-	if (!nodePath.isAbsolute(exporterFilePath)) throw new Error(`'exporterFilePath' is not an absolute path. "${exporterFilePath}"`);
-	const importerDir = nodePath.dirname(importerFilePath);
-	const relativePath = nodePath.relative(importerDir, exporterFilePath);
-	let posixPath = nodePath.posix.join(...relativePath.split(nodePath.sep));
+	if (!path.isAbsolute(importerFilePath)) throw new Error(`'importerFilePath' is not an absolute path. "${importerFilePath}"`);
+	if (!path.isAbsolute(exporterFilePath)) throw new Error(`'exporterFilePath' is not an absolute path. "${exporterFilePath}"`);
+	const importerDir = path.dirname(importerFilePath);
+	const relativePath = path.relative(importerDir, exporterFilePath);
+	let posixPath = path.posix.join(...relativePath.split(path.sep));
 	if (!posixPath.startsWith("./") && !posixPath.startsWith("../")) posixPath = `./${posixPath}`;
 	if (!includeFileExtension) {
-		const ext = nodePath.extname(posixPath);
+		const ext = path.extname(posixPath);
 		if (ext && posixPath.endsWith(ext)) posixPath = posixPath.slice(0, -ext.length);
 	}
 	return posixPath;
@@ -798,20 +821,20 @@ function getRelativeImportPath(importerFilePath, exporterFilePath, includeFileEx
 //#region src/utils/resolve-version.ts
 function resolveInstalledVersion(packageName, fromDir) {
 	try {
-		const require = createRequire(nodePath.join(fromDir, "noop.js"));
+		const require = createRequire(path.join(fromDir, "noop.js"));
 		try {
 			return require(`${packageName}/package.json`).version;
 		} catch (directError) {
 			if (directError instanceof Error && "code" in directError && directError.code === "ERR_PACKAGE_PATH_NOT_EXPORTED") {
 				const entryPath = require.resolve(packageName);
-				let dir = nodePath.dirname(entryPath);
-				while (dir !== nodePath.parse(dir).root) {
-					const pkgPath = nodePath.join(dir, "package.json");
+				let dir = path.dirname(entryPath);
+				while (dir !== path.parse(dir).root) {
+					const pkgPath = path.join(dir, "package.json");
 					if (existsSync(pkgPath)) {
 						const pkgData = JSON.parse(readFileSync(pkgPath, "utf8"));
 						if (pkgData.name === packageName) return pkgData.version;
 					}
-					dir = nodePath.dirname(dir);
+					dir = path.dirname(dir);
 				}
 				return;
 			}
@@ -1296,7 +1319,8 @@ const COMPONENT_REF_PATTERN = new RegExp(String.raw`^#\/components\/(${NAMED_COM
 function isComponentRef(ref) {
 	return COMPONENT_REF_PATTERN.test(ref);
 }
-const regex = /* @__PURE__ */ new RegExp("~1", "g");
+const TILDE_1 = /~1/g;
+const TILDE_0 = /~0/g;
 /**
 * Return the output type from the $ref
 *
@@ -1304,7 +1328,7 @@ const regex = /* @__PURE__ */ new RegExp("~1", "g");
 */
 function getRefInfo($ref, context) {
 	const [pathname, ref] = $ref.split("#");
-	const refPaths = ref.slice(1).split("/").map((part) => decodeURIComponent(part.replaceAll(regex, "/")));
+	const refPaths = ref.slice(1).split("/").map((part) => decodeURIComponent(part).replaceAll(TILDE_1, "/").replaceAll(TILDE_0, "~"));
 	const getOverrideSuffix = (override, paths) => {
 		const firstLevel = override[paths[0]];
 		if (!firstLevel) return "";
@@ -1688,9 +1712,14 @@ const formDataContentTypes = new Set(["multipart/form-data"]);
 const formUrlEncodedContentTypes = new Set(["application/x-www-form-urlencoded"]);
 function getResReqContentTypes({ mediaType, propName, context, isFormData, contentType }) {
 	if (!mediaType.schema) return;
+	const isFormUrlEncoded = formUrlEncodedContentTypes.has(contentType);
 	const formDataContext = isFormData ? {
 		atPart: false,
 		encoding: mediaType.encoding ?? {}
+	} : isFormUrlEncoded ? {
+		atPart: false,
+		encoding: mediaType.encoding ?? {},
+		urlEncoded: true
 	} : void 0;
 	const resolvedObject = resolveObject({
 		schema: mediaType.schema,
@@ -1956,25 +1985,37 @@ function getSchemaFormDataAndUrlEncoded({ name, schemaObject, context, isRequest
 			form += `Object.entries(${propName} ?? {}).forEach(([key, value]) => {\n`;
 			form += skipLine;
 			form += `  if (value !== undefined && value !== null) {\n`;
-			form += `    if ((typeof File !== 'undefined' && value instanceof File) || value instanceof Blob) {\n`;
-			form += `      ${variableName}.append(key, value);\n`;
-			form += `    } else if (typeof Buffer !== 'undefined' && Buffer.isBuffer(value)) {\n`;
-			form += `      ${variableName}.append(key, new Blob([Uint8Array.from(value)]));\n`;
-			form += `    } else if (Array.isArray(value)) {\n`;
-			form += `      value.forEach(v => {\n`;
-			form += `        if ((typeof File !== 'undefined' && v instanceof File) || v instanceof Blob) {\n`;
-			form += `          ${variableName}.append(key, v);\n`;
-			form += `        } else if (typeof Buffer !== 'undefined' && Buffer.isBuffer(v)) {\n`;
-			form += `          ${variableName}.append(key, new Blob([Uint8Array.from(v)]));\n`;
-			form += `        } else {\n`;
-			form += `          ${variableName}.append(key, typeof v === 'object' ? JSON.stringify(v) : String(v));\n`;
-			form += `        }\n`;
-			form += `      });\n`;
-			form += `    } else if (typeof value === 'object') {\n`;
-			form += `      ${variableName}.append(key, JSON.stringify(value));\n`;
-			form += `    } else {\n`;
-			form += `      ${variableName}.append(key, String(value));\n`;
-			form += `    }\n`;
+			if (isUrlEncoded) {
+				form += `    if (Array.isArray(value)) {\n`;
+				form += `      value.forEach(v => {\n`;
+				form += `        ${variableName}.append(key, typeof v === 'object' ? JSON.stringify(v) : String(v));\n`;
+				form += `      });\n`;
+				form += `    } else if (typeof value === 'object') {\n`;
+				form += `      ${variableName}.append(key, JSON.stringify(value));\n`;
+				form += `    } else {\n`;
+				form += `      ${variableName}.append(key, String(value));\n`;
+				form += `    }\n`;
+			} else {
+				form += `    if ((typeof File !== 'undefined' && value instanceof File) || value instanceof Blob) {\n`;
+				form += `      ${variableName}.append(key, value);\n`;
+				form += `    } else if (typeof Buffer !== 'undefined' && Buffer.isBuffer(value)) {\n`;
+				form += `      ${variableName}.append(key, new Blob([Uint8Array.from(value)]));\n`;
+				form += `    } else if (Array.isArray(value)) {\n`;
+				form += `      value.forEach(v => {\n`;
+				form += `        if ((typeof File !== 'undefined' && v instanceof File) || v instanceof Blob) {\n`;
+				form += `          ${variableName}.append(key, v);\n`;
+				form += `        } else if (typeof Buffer !== 'undefined' && Buffer.isBuffer(v)) {\n`;
+				form += `          ${variableName}.append(key, new Blob([Uint8Array.from(v)]));\n`;
+				form += `        } else {\n`;
+				form += `          ${variableName}.append(key, typeof v === 'object' ? JSON.stringify(v) : String(v));\n`;
+				form += `        }\n`;
+				form += `      });\n`;
+				form += `    } else if (typeof value === 'object') {\n`;
+				form += `      ${variableName}.append(key, JSON.stringify(value));\n`;
+				form += `    } else {\n`;
+				form += `      ${variableName}.append(key, String(value));\n`;
+				form += `    }\n`;
+			}
 			form += `  }\n`;
 			form += `});\n`;
 		} else {
@@ -2019,6 +2060,7 @@ function getSchemaFormDataAndUrlEncoded({ name, schemaObject, context, isRequest
 }
 function resolveSchemaPropertiesToFormData({ schema, variableName, propName, context, isRequestBodyOptional, keyPrefix = "", depth = 0, encoding }) {
 	let formDataValues = "";
+	const isUrlEncoded = variableName === "formUrlEncoded";
 	const schemaProps = getSchemaProperties(schema) ?? {};
 	for (const [key, value] of Object.entries(schemaProps)) {
 		const { schema: property } = resolveSchemaRef(value, context);
@@ -2031,7 +2073,8 @@ function resolveSchemaPropertiesToFormData({ schema, variableName, propName, con
 		const nonOptionalValueKey = `${propName}${formattedKey}`;
 		const fileType = getFormDataFieldFileType(property, partContentType);
 		const effectiveContentType = partContentType ?? property.contentMediaType;
-		if (fileType === "binary" || property.format === "binary") formDataValue = `${variableName}.append(\`${keyPrefix}${key}\`, ${nonOptionalValueKey});\n`;
+		if (isUrlEncoded && (fileType || property.format === "binary")) formDataValue = `${variableName}.append(\`${keyPrefix}${key}\`, ${nonOptionalValueKey});\n`;
+		else if (fileType === "binary" || property.format === "binary") formDataValue = `${variableName}.append(\`${keyPrefix}${key}\`, ${nonOptionalValueKey});\n`;
 		else if (fileType === "text") formDataValue = `${variableName}.append(\`${keyPrefix}${key}\`, ${nonOptionalValueKey} instanceof Blob ? ${nonOptionalValueKey} : new Blob([${nonOptionalValueKey}], { type: '${effectiveContentType}' }));\n`;
 		else if (property.type === "object") formDataValue = context.output.override.formData.arrayHandling === FormDataArrayHandling.EXPLODE ? resolveSchemaPropertiesToFormData({
 			schema: property,
@@ -2348,7 +2391,8 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 			if (Object.keys(allSpecSchemas).some((schemaName) => pascal(schemaName) === propName)) propName = propName + "Property";
 			const propertyFormDataContext = formDataContext && !formDataContext.atPart ? {
 				atPart: true,
-				partContentType: formDataContext.encoding[key]?.contentType
+				partContentType: formDataContext.encoding[key]?.contentType,
+				urlEncoded: formDataContext.urlEncoded
 			} : void 0;
 			const resolvedValue = resolveObject({
 				schema,
@@ -2625,11 +2669,13 @@ function getScalar({ item, name, context, formDataContext }) {
 				value = enumItems.map((enumItem) => isString(enumItem) ? `'${escape(enumItem)}'` : `${enumItem}`).filter(Boolean).join(` | `);
 				isEnum = true;
 			}
-			if (schemaFormat === "binary") value = "Blob";
-			else if (formDataContext?.atPart) {
-				const fileType = getFormDataFieldFileType(item, formDataContext.partContentType);
-				if (fileType) value = fileType === "binary" ? "Blob" : "Blob | string";
-			} else if (schemaContentMediaType === "application/octet-stream" && !schemaContentEncoding) value = "Blob";
+			if (!formDataContext?.urlEncoded) {
+				if (schemaFormat === "binary") value = "Blob";
+				else if (formDataContext?.atPart) {
+					const fileType = getFormDataFieldFileType(item, formDataContext.partContentType);
+					if (fileType) value = fileType === "binary" ? "Blob" : "Blob | string";
+				} else if (schemaContentMediaType === "application/octet-stream" && !schemaContentEncoding) value = "Blob";
+			}
 			if (context.output.override.useDates && (schemaFormat === "date" || schemaFormat === "date-time")) value = "Date";
 			value += nullable;
 			if (schemaConst) value = `'${schemaConst}'`;
@@ -2970,10 +3016,13 @@ function getParameters({ parameters, context }) {
 		const { schema, imports } = resolveRef(p, context);
 		const parameter = schema;
 		const location = parameter.in;
-		if (location === "path" || location === "query" || location === "header") result[location].push({
-			parameter,
-			imports
-		});
+		if (location === "path" || location === "query" || location === "header") {
+			const safeImports = p.$ref && isComponentRef(p.$ref) ? imports : [];
+			result[location].push({
+				parameter,
+				imports: safeImports
+			});
+		}
 	} else if (p.in === "query" || p.in === "path" || p.in === "header") result[p.in].push({
 		parameter: p,
 		imports: []
@@ -3262,7 +3311,7 @@ function getResponse({ responses, operationName, context, contentType }) {
 			success: success || (defaultType ?? "unknown"),
 			errors: errors || (defaultType ?? "unknown")
 		},
-		isBlob: groupedByStatus.success.some((t) => !!t.contentType && isBinaryContentType(t.contentType) || t.value === "Blob" && !t.isRef),
+		isBlob: groupedByStatus.success.some((t) => !!t.contentType && isBinaryContentType(t.contentType) || t.originalSchema?.format === "binary" || t.originalSchema?.contentMediaType === "application/octet-stream" && !t.originalSchema.contentEncoding),
 		types: groupedByStatus,
 		contentTypes,
 		schemas,
@@ -3355,6 +3404,8 @@ function getBaseUrlRuntimeImports(baseUrl) {
 		values: imp.values ?? true
 	}));
 }
+const wrapRouteParameters = (route, prepend, append) => route.replaceAll(TEMPLATE_TAG_REGEX, `\${${prepend}$1${append}}`);
+const makeRouteSafe = (route) => wrapRouteParameters(route, "encodeURIComponent(String(", "))");
 function getRouteAsArray(route) {
 	return route.split("/").filter((i) => i !== "").flatMap((segment) => {
 		if (!segment.includes("${")) return [`'${segment}'`];
@@ -3605,7 +3656,7 @@ function generateModelsInline(obj) {
 //#region src/generators/mutator-info.ts
 async function getMutatorInfo(filePath, options) {
 	const { root = process.cwd(), namedExport = "default", alias, external, tsconfig } = options ?? {};
-	return parseFile(await bundleFile(root, filePath, alias, external, tsconfig?.compilerOptions), namedExport, getEcmaVersion(tsconfig?.compilerOptions?.target));
+	return parseFile(await bundleFile(root, filePath, alias, external, tsconfig?.compilerOptions), namedExport);
 }
 async function bundleFile(root, fileName, alias, external, compilerOptions) {
 	const { text } = (await build({
@@ -3628,10 +3679,10 @@ async function bundleFile(root, fileName, alias, external, compilerOptions) {
 	})).outputFiles[0];
 	return text;
 }
-function parseFile(file, name, ecmaVersion = 6) {
+function parseFile(file, name) {
 	try {
 		const ast = Parser.parse(file, {
-			ecmaVersion,
+			ecmaVersion: "latest",
 			sourceType: "module"
 		});
 		const foundSpecifier = ast.body.filter((x) => x.type === "ExportNamedDeclaration").flatMap((x) => x.specifiers).find((x) => x.exported.type === "Identifier" && x.exported.name === name && x.local.type === "Identifier");
@@ -3688,15 +3739,6 @@ function parseFunction(ast, funcName) {
 		}
 	}
 }
-function getEcmaVersion(target) {
-	if (!target) return;
-	if (target.toLowerCase() === "esnext") return "latest";
-	try {
-		return Number(target.toLowerCase().replace("es", ""));
-	} catch {
-		return;
-	}
-}
 //#endregion
 //#region src/generators/mutator.ts
 const BODY_TYPE_NAME = "BodyType";
@@ -4594,8 +4636,8 @@ function getSchema({ schema: { imports, model }, header, namingConvention = Nami
 	file += model;
 	return file;
 }
-function getPath(path, name, fileExtension) {
-	return nodePath.join(path, `${name}${fileExtension}`);
+function getPath(path$1, name, fileExtension) {
+	return path.join(path$1, `${name}${fileExtension}`);
 }
 function writeModelInline(acc, model) {
 	return acc + `${model}\n`;
@@ -4647,7 +4689,7 @@ async function writeSchemas({ schemaPath, schemas, target, namingConvention, fil
 		});
 	}
 	if (indexFiles) {
-		const schemaFilePath = nodePath.join(schemaPath, `index.ts`);
+		const schemaFilePath = path.join(schemaPath, `index.ts`);
 		await fs$1.ensureFile(schemaFilePath);
 		const ext = getImportExtension(fileExtension, tsconfig);
 		const conventionNamesSet = new Set(Object.values(schemaGroups).map((group) => conventionName(group[0].name, namingConvention)));
@@ -4691,7 +4733,39 @@ function generateImportsForBuilder(output, imports, relativeSchemasPath) {
 	return [...schemaImports, ...otherImports];
 }
 //#endregion
+//#region src/writers/mock-outputs.ts
+/**
+* Collapses the per-generator mock outputs for "inline" writer modes
+* (`single`, `tags`) where every mock generator's content is concatenated
+* into the implementation file. The MSW generator already emits the
+* response-factory functions (`get<Op>ResponseMock`) that Faker would emit,
+* so when both generators are configured we keep MSW and drop Faker to
+* avoid duplicate function declarations and re-imported faker bindings.
+*/
+function collapseInlineMockOutputs(mockOutputs) {
+	if (!mockOutputs.some((m) => m.type === OutputMockType.MSW)) return mockOutputs;
+	return mockOutputs.filter((m) => m.type !== OutputMockType.FAKER);
+}
+//#endregion
 //#region src/writers/target.ts
+function emptyMockOutputFull$1(type) {
+	return {
+		type,
+		implementation: {
+			function: "",
+			handler: "",
+			handlerName: ""
+		},
+		imports: []
+	};
+}
+function flattenMockOutput$1(full) {
+	return {
+		type: full.type,
+		implementation: full.implementation.function + full.implementation.handler,
+		imports: full.imports
+	};
+}
 function generateTarget(builder, options) {
 	const operationNames = Object.values(builder.operations).map(({ operationName }) => operationName);
 	const isAngularClient = options.client === OutputClient.ANGULAR;
@@ -4704,12 +4778,7 @@ function generateTarget(builder, options) {
 	const target = {
 		imports: [],
 		implementation: "",
-		implementationMock: {
-			function: "",
-			handler: "",
-			handlerName: ""
-		},
-		importsMock: [],
+		mockOutputs: [],
 		mutators: [],
 		clientMutators: [],
 		formData: [],
@@ -4721,12 +4790,21 @@ function generateTarget(builder, options) {
 	const operations = Object.values(builder.operations);
 	for (const [index, operation] of operations.entries()) {
 		target.imports.push(...operation.imports);
-		target.importsMock.push(...operation.importsMock);
 		target.implementation += operation.implementation + "\n";
-		target.implementationMock.function += operation.implementationMock.function;
-		target.implementationMock.handler += operation.implementationMock.handler;
-		const handlerNameSeparator = target.implementationMock.handlerName.length > 0 ? ",\n  " : "  ";
-		target.implementationMock.handlerName += handlerNameSeparator + operation.implementationMock.handlerName + "()";
+		for (const opMock of operation.mockOutputs) {
+			let acc = target.mockOutputs.find((m) => m.type === opMock.type);
+			if (!acc) {
+				acc = emptyMockOutputFull$1(opMock.type);
+				target.mockOutputs.push(acc);
+			}
+			acc.imports.push(...opMock.imports);
+			acc.implementation.function += opMock.implementation.function;
+			acc.implementation.handler += opMock.implementation.handler;
+			if (opMock.implementation.handlerName) {
+				const separator = acc.implementation.handlerName.length > 0 ? ",\n  " : "  ";
+				acc.implementation.handlerName += separator + opMock.implementation.handlerName + "()";
+			}
+		}
 		if (operation.mutator) target.mutators.push(operation.mutator);
 		if (operation.formData) target.formData.push(operation.formData);
 		if (operation.formUrlEncoded) target.formUrlEncoded.push(operation.formUrlEncoded);
@@ -4750,7 +4828,6 @@ function generateTarget(builder, options) {
 				clientImplementation: target.implementation
 			});
 			target.implementation = header.implementation + target.implementation;
-			target.implementationMock.handler = target.implementationMock.handler + header.implementationMock + target.implementationMock.handlerName;
 			const footer = builder.footer({
 				outputClient: options.client,
 				operationNames,
@@ -4760,12 +4837,20 @@ function generateTarget(builder, options) {
 				output: options
 			});
 			target.implementation += footer.implementation;
-			target.implementationMock.handler += footer.implementationMock;
+			for (const acc of target.mockOutputs) if (acc.implementation.handlerName) acc.implementation.handler = acc.implementation.handler + header.implementationMock + acc.implementation.handlerName + footer.implementationMock;
 		}
 	}
 	return {
-		...target,
-		implementationMock: target.implementationMock.function + target.implementationMock.handler
+		imports: target.imports,
+		implementation: target.implementation,
+		mockOutputs: target.mockOutputs.map((m) => flattenMockOutput$1(m)),
+		mutators: target.mutators,
+		clientMutators: target.clientMutators,
+		formData: target.formData,
+		formUrlEncoded: target.formUrlEncoded,
+		paramsSerializer: target.paramsSerializer,
+		paramsFilter: target.paramsFilter,
+		fetchReviver: target.fetchReviver
 	};
 }
 //#endregion
@@ -4814,7 +4899,10 @@ async function writeSingleMode({ builder, output, projectName, header, needSchem
 			backupFilename: conventionName(builder.info.title ?? "filename", output.namingConvention),
 			extension: output.fileExtension
 		});
-		const { imports, importsMock, implementation, implementationMock, mutators, clientMutators, formData, formUrlEncoded, paramsSerializer, paramsFilter, fetchReviver } = generateTarget(builder, output);
+		const { imports, mockOutputs: rawMockOutputs, implementation, mutators, clientMutators, formData, formUrlEncoded, paramsSerializer, paramsFilter, fetchReviver } = generateTarget(builder, output);
+		const mockOutputs = collapseInlineMockOutputs(rawMockOutputs);
+		const implementationMock = mockOutputs.map((m) => m.implementation).join("\n\n");
+		const importsMock = mockOutputs.flatMap((m) => m.imports);
 		let data = header;
 		const schemasPath = output.schemas ? getRelativeImportPath(path, getFileInfo(isString(output.schemas) ? output.schemas : output.schemas.path, { extension: output.fileExtension }).dirname) : void 0;
 		const isAllowSyntheticDefaultImports = isSyntheticDefaultImportsAllow(output.tsconfig);
@@ -4842,16 +4930,17 @@ async function writeSingleMode({ builder, output, projectName, header, needSchem
 			packageJson: output.packageJson,
 			output
 		});
-		if (output.mock) {
-			const filteredMockImports = importsMock.filter((impMock) => !normalizedImports.some((imp) => imp.name === impMock.name && (imp.alias ?? "") === (impMock.alias ?? "")));
+		for (const mockOutput of mockOutputs) {
+			const entry = output.mock.generators.find((g) => !isFunction(g) && g.type === mockOutput.type);
+			const filteredMockImports = mockOutput.imports.filter((impMock) => !normalizedImports.some((imp) => imp.name === impMock.name && (imp.alias ?? "") === (impMock.alias ?? "")));
 			const importsMockForBuilder = schemasPath ? generateImportsForBuilder(output, filteredMockImports, schemasPath) : generateImportsForBuilder(output, filteredMockImports.filter((imp) => !!imp.importPath), ".");
 			data += builder.importsMock({
-				implementation: implementationMock,
+				implementation: mockOutput.implementation,
 				imports: importsMockForBuilder,
 				projectName,
 				hasSchemaDir: !!output.schemas,
 				isAllowSyntheticDefaultImports,
-				options: isFunction(output.mock) ? void 0 : output.mock
+				options: entry && !isFunction(entry) ? entry : void 0
 			});
 		}
 		if (mutators) data += generateMutatorImports({
@@ -4874,7 +4963,7 @@ async function writeSingleMode({ builder, output, projectName, header, needSchem
 		}
 		if (!output.schemas && needSchema) data += generateSchemasInline ? generateSchemasInline() : generateModelsInline(builder.schemas);
 		data += `${implementation.trim()}\n`;
-		if (output.mock) {
+		if (mockOutputs.length > 0) {
 			data += "\n\n";
 			data += implementationMock;
 		}
@@ -4893,9 +4982,8 @@ async function writeSplitMode({ builder, output, projectName, header, needSchema
 			backupFilename: conventionName(builder.info.title ?? "filename", output.namingConvention),
 			extension: output.fileExtension
 		});
-		const { imports, implementation, implementationMock, importsMock, mutators, clientMutators, formData, formUrlEncoded, paramsSerializer, paramsFilter, fetchReviver } = generateTarget(builder, output);
+		const { imports, implementation, mockOutputs, mutators, clientMutators, formData, formUrlEncoded, paramsSerializer, paramsFilter, fetchReviver } = generateTarget(builder, output);
 		let implementationData = header;
-		let mockData = header;
 		const relativeSchemasPath = output.schemas ? getRelativeImportPath(targetPath, getFileInfo(isString(output.schemas) ? output.schemas : output.schemas.path, { extension: output.fileExtension }).dirname) : "./" + filename + ".schemas" + extension.replace(/\.ts$/, "");
 		const isAllowSyntheticDefaultImports = isSyntheticDefaultImportsAllow(output.tsconfig);
 		const importsForBuilder = generateImportsForBuilder(output, imports, relativeSchemasPath);
@@ -4912,16 +5000,7 @@ async function writeSplitMode({ builder, output, projectName, header, needSchema
 			packageJson: output.packageJson,
 			output
 		});
-		const importsMockForBuilder = generateImportsForBuilder(output, importsMock, relativeSchemasPath);
-		mockData += builder.importsMock({
-			implementation: implementationMock,
-			imports: importsMockForBuilder,
-			projectName,
-			hasSchemaDir: !!output.schemas,
-			isAllowSyntheticDefaultImports,
-			options: isFunction(output.mock) ? void 0 : output.mock
-		});
-		const schemasPath = !output.schemas && needSchema ? nodePath.join(dirname, filename + ".schemas" + extension) : void 0;
+		const schemasPath = !output.schemas && needSchema ? path.join(dirname, filename + ".schemas" + extension) : void 0;
 		if (schemasPath) await writeGeneratedFile(schemasPath, generateSchemasInline ? header + generateSchemasInline() : header + generateModelsInline(builder.schemas));
 		if (mutators) implementationData += generateMutatorImports({
 			mutators,
@@ -4942,16 +5021,32 @@ async function writeSplitMode({ builder, output, projectName, header, needSchema
 			implementationData += "\n";
 		}
 		implementationData += `\n${implementation}`;
-		mockData += `\n${implementationMock}`;
 		const implementationFilename = filename + (OutputClient.ANGULAR === output.client ? ".service" : "") + extension;
-		const implementationPath = nodePath.join(dirname, implementationFilename);
+		const implementationPath = path.join(dirname, implementationFilename);
 		await writeGeneratedFile(implementationPath, implementationData);
-		const mockPath = output.mock ? nodePath.join(dirname, filename + "." + getMockFileExtensionByTypeName(output.mock) + extension) : void 0;
-		if (mockPath) await writeGeneratedFile(mockPath, mockData);
+		const mockPaths = [];
+		for (const mockOutput of mockOutputs) {
+			const entry = output.mock.generators.find((g) => !isFunction(g) && g.type === mockOutput.type);
+			if (!entry) continue;
+			const importsMockForBuilder = generateImportsForBuilder(output, mockOutput.imports, relativeSchemasPath);
+			let mockData = header;
+			mockData += builder.importsMock({
+				implementation: mockOutput.implementation,
+				imports: importsMockForBuilder,
+				projectName,
+				hasSchemaDir: !!output.schemas,
+				isAllowSyntheticDefaultImports,
+				options: entry
+			});
+			mockData += `\n${mockOutput.implementation}`;
+			const mockPath = path.join(dirname, filename + "." + getMockFileExtensionByTypeName(entry) + extension);
+			await writeGeneratedFile(mockPath, mockData);
+			mockPaths.push(mockPath);
+		}
 		return [
 			implementationPath,
 			...schemasPath ? [schemasPath] : [],
-			...mockPath ? [mockPath] : []
+			...mockPaths
 		];
 	} catch (error) {
 		throw new Error(`Oups... 🍻. An Error occurred while splitting => ${String(error)}`, { cause: error });
@@ -4971,12 +5066,63 @@ function addDefaultTagIfEmpty(operation) {
 		tags: operation.tags.length > 0 ? operation.tags : [DefaultTag]
 	};
 }
+function emptyMockOutputFull(type) {
+	return {
+		type,
+		implementation: {
+			function: "",
+			handler: "",
+			handlerName: ""
+		},
+		imports: []
+	};
+}
+function flattenMockOutput(full) {
+	return {
+		type: full.type,
+		implementation: full.implementation.function + full.implementation.handler,
+		imports: full.imports
+	};
+}
+function mergeOperationMockOutputs(accMockOutputs, opMockOutputs) {
+	const result = accMockOutputs.map((m) => ({
+		type: m.type,
+		implementation: { ...m.implementation },
+		imports: [...m.imports]
+	}));
+	for (const op of opMockOutputs) {
+		let acc = result.find((m) => m.type === op.type);
+		if (!acc) {
+			acc = emptyMockOutputFull(op.type);
+			result.push(acc);
+		}
+		acc.imports.push(...op.imports);
+		acc.implementation.function += op.implementation.function;
+		acc.implementation.handler += op.implementation.handler;
+		if (op.implementation.handlerName) {
+			const separator = acc.implementation.handlerName.length > 0 ? ",\n  " : "  ";
+			acc.implementation.handlerName += separator + op.implementation.handlerName + "()";
+		}
+	}
+	return result;
+}
+function initialMockOutputsForOperation(op) {
+	return op.mockOutputs.map((m) => ({
+		type: m.type,
+		implementation: {
+			function: m.implementation.function,
+			handler: m.implementation.handler,
+			handlerName: m.implementation.handlerName ? "  " + m.implementation.handlerName + "()" : ""
+		},
+		imports: [...m.imports]
+	}));
+}
 function generateTargetTags(currentAcc, operation) {
 	const tag = kebab(operation.tags[0]);
 	if (!(tag in currentAcc)) {
 		currentAcc[tag] = {
 			imports: operation.imports,
-			importsMock: operation.importsMock,
+			mockOutputs: initialMockOutputsForOperation(operation),
 			mutators: operation.mutator ? [operation.mutator] : [],
 			clientMutators: operation.clientMutators ?? [],
 			formData: operation.formData ? [operation.formData] : [],
@@ -4984,12 +5130,7 @@ function generateTargetTags(currentAcc, operation) {
 			paramsSerializer: operation.paramsSerializer ? [operation.paramsSerializer] : [],
 			paramsFilter: operation.paramsFilter ? [operation.paramsFilter] : [],
 			fetchReviver: operation.fetchReviver ? [operation.fetchReviver] : [],
-			implementation: operation.implementation,
-			implementationMock: {
-				function: operation.implementationMock.function,
-				handler: operation.implementationMock.handler,
-				handlerName: "  " + operation.implementationMock.handlerName + "()"
-			}
+			implementation: operation.implementation
 		};
 		return currentAcc;
 	}
@@ -4997,12 +5138,7 @@ function generateTargetTags(currentAcc, operation) {
 	currentAcc[tag] = {
 		implementation: currentOperation.implementation + operation.implementation,
 		imports: [...currentOperation.imports, ...operation.imports],
-		importsMock: [...currentOperation.importsMock, ...operation.importsMock],
-		implementationMock: {
-			function: currentOperation.implementationMock.function + operation.implementationMock.function,
-			handler: currentOperation.implementationMock.handler + operation.implementationMock.handler,
-			handlerName: currentOperation.implementationMock.handlerName + ",\n  " + operation.implementationMock.handlerName + "()"
-		},
+		mockOutputs: mergeOperationMockOutputs(currentOperation.mockOutputs, operation.mockOutputs),
 		mutators: operation.mutator ? [...currentOperation.mutators ?? [], operation.mutator] : currentOperation.mutators,
 		clientMutators: operation.clientMutators ? [...currentOperation.clientMutators ?? [], ...operation.clientMutators] : currentOperation.clientMutators,
 		formData: operation.formData ? [...currentOperation.formData ?? [], operation.formData] : currentOperation.formData,
@@ -5053,15 +5189,19 @@ function generateTargetForTags(builder, options) {
 					isDefaultTagBucket: tag === "default" && Object.values(builder.operations).some((operation) => operation.tags.length === 0),
 					clientImplementation: target.implementation
 				});
+				const wrappedMockOutputs = target.mockOutputs.map((m) => ({
+					type: m.type,
+					implementation: {
+						function: m.implementation.function,
+						handler: m.implementation.handlerName ? m.implementation.handler + header.implementationMock + m.implementation.handlerName + footer.implementationMock : m.implementation.handler,
+						handlerName: m.implementation.handlerName
+					},
+					imports: m.imports
+				}));
 				transformed[tag] = {
 					implementation: header.implementation + target.implementation + footer.implementation,
-					implementationMock: {
-						function: target.implementationMock.function,
-						handler: target.implementationMock.handler + header.implementationMock + target.implementationMock.handlerName + footer.implementationMock,
-						handlerName: target.implementationMock.handlerName
-					},
+					mockOutputs: wrappedMockOutputs,
 					imports: target.imports,
-					importsMock: target.importsMock,
 					mutators: target.mutators,
 					clientMutators: target.clientMutators,
 					formData: target.formData,
@@ -5077,7 +5217,7 @@ function generateTargetForTags(builder, options) {
 	const result = {};
 	for (const [tag, target] of Object.entries(allTargetTags)) result[tag] = {
 		...target,
-		implementationMock: target.implementationMock.function + target.implementationMock.handler
+		mockOutputs: target.mockOutputs.map((m) => flattenMockOutput(m))
 	};
 	return result;
 }
@@ -5090,28 +5230,33 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 	});
 	const target = generateTargetForTags(builder, output);
 	const isAllowSyntheticDefaultImports = isSyntheticDefaultImportsAllow(output.tsconfig);
-	const mockOption = output.mock && !isFunction(output.mock) ? output.mock : void 0;
-	const indexFilePath = mockOption?.indexMockFiles ? nodePath.join(dirname, "index." + getMockFileExtensionByTypeName(mockOption) + extension) : void 0;
-	if (indexFilePath) await fs$1.outputFile(indexFilePath, "");
+	if (output.mock.generators.some((g) => isFunction(g))) throw new Error("Function mock generators (ClientMockBuilder) are not supported in tags-split mode. Use typed generators ({ type: \"msw\" } or { type: \"faker\" }).");
+	const generatorEntries = output.mock.generators.filter((g) => !isFunction(g));
+	const indexFilePathsByType = /* @__PURE__ */ new Map();
+	if (output.mock.indexMockFiles) for (const entry of generatorEntries) {
+		const ext = getMockFileExtensionByTypeName(entry);
+		const indexPath = path.join(dirname, `index.${ext}${extension}`);
+		indexFilePathsByType.set(ext, indexPath);
+		await fs$1.outputFile(indexPath, "");
+	}
 	const tagEntries = Object.entries(target);
 	const generatedFilePathsArray = await Promise.all(tagEntries.map(async ([tag, target]) => {
 		try {
-			const { imports, implementation, implementationMock, importsMock, mutators, clientMutators, formData, fetchReviver, formUrlEncoded, paramsSerializer, paramsFilter } = target;
+			const { imports, implementation, mockOutputs, mutators, clientMutators, formData, fetchReviver, formUrlEncoded, paramsSerializer, paramsFilter } = target;
 			let implementationData = header;
-			let mockData = header;
-			const importerPath = nodePath.join(dirname, tag, tag + extension);
+			const importerPath = path.join(dirname, tag, tag + extension);
 			const relativeSchemasPath = output.schemas ? getRelativeImportPath(importerPath, getFileInfo(isString(output.schemas) ? output.schemas : output.schemas.path, { extension: output.fileExtension }).dirname) : "../" + filename + ".schemas" + extension.replace(/\.ts$/, "");
 			const tagNames = new Set(tagEntries.map(([t]) => t));
 			const serviceSuffix = OutputClient.ANGULAR === output.client ? ".service" : "";
 			const importsForBuilder = generateImportsForBuilder(output, imports.map((imp) => {
 				if (!imp.importPath) return imp;
 				if (!imp.importPath.startsWith(".")) return imp;
-				const resolvedPath = nodePath.resolve(dirname, imp.importPath);
-				const targetBasename = nodePath.basename(resolvedPath);
+				const resolvedPath = path.resolve(dirname, imp.importPath);
+				const targetBasename = path.basename(resolvedPath);
 				let targetFile;
 				if (tagNames.has(targetBasename)) {
 					const tagFilename = targetBasename + serviceSuffix + extension;
-					targetFile = nodePath.join(resolvedPath, tagFilename);
+					targetFile = path.join(resolvedPath, tagFilename);
 				} else targetFile = resolvedPath + extension;
 				const adjustedPath = getRelativeImportPath(importerPath, targetFile);
 				return {
@@ -5132,16 +5277,7 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 				packageJson: output.packageJson,
 				output
 			});
-			const importsMockForBuilder = generateImportsForBuilder(output, importsMock, relativeSchemasPath);
-			mockData += builder.importsMock({
-				implementation: implementationMock,
-				imports: importsMockForBuilder,
-				projectName,
-				hasSchemaDir: !!output.schemas,
-				isAllowSyntheticDefaultImports,
-				options: isFunction(output.mock) ? void 0 : output.mock
-			});
-			const schemasPath = !output.schemas && needSchema ? nodePath.join(dirname, filename + ".schemas" + extension) : void 0;
+			const schemasPath = !output.schemas && needSchema ? path.join(dirname, filename + ".schemas" + extension) : void 0;
 			if (schemasPath) await writeGeneratedFile(schemasPath, generateSchemasInline ? header + generateSchemasInline() : header + generateModelsInline(builder.schemas));
 			if (mutators) implementationData += generateMutatorImports({
 				mutators,
@@ -5181,29 +5317,48 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 				implementationData += "\n";
 			}
 			implementationData += `\n${implementation}`;
-			mockData += `\n${implementationMock}`;
 			const implementationFilename = tag + (OutputClient.ANGULAR === output.client ? ".service" : "") + extension;
-			const implementationPath = nodePath.join(dirname, tag, implementationFilename);
+			const implementationPath = path.join(dirname, tag, implementationFilename);
 			await writeGeneratedFile(implementationPath, implementationData);
-			const mockPath = output.mock ? nodePath.join(dirname, tag, tag + "." + getMockFileExtensionByTypeName(output.mock) + extension) : void 0;
-			if (mockPath) await writeGeneratedFile(mockPath, mockData);
+			const mockPaths = [];
+			for (const mockOutput of mockOutputs) {
+				const entry = output.mock.generators.find((g) => !isFunction(g) && g.type === mockOutput.type);
+				if (!entry) continue;
+				const importsMockForBuilder = generateImportsForBuilder(output, mockOutput.imports, relativeSchemasPath);
+				let mockData = header;
+				mockData += builder.importsMock({
+					implementation: mockOutput.implementation,
+					imports: importsMockForBuilder,
+					projectName,
+					hasSchemaDir: !!output.schemas,
+					isAllowSyntheticDefaultImports,
+					options: entry
+				});
+				mockData += `\n${mockOutput.implementation}`;
+				const mockPath = path.join(dirname, tag, tag + "." + getMockFileExtensionByTypeName(entry) + extension);
+				await writeGeneratedFile(mockPath, mockData);
+				mockPaths.push(mockPath);
+			}
 			return [
 				implementationPath,
 				...schemasPath ? [schemasPath] : [],
-				...mockPath ? [mockPath] : []
+				...mockPaths
 			];
 		} catch (error) {
 			throw new Error(`Oups... 🍻. An Error occurred while splitting tag ${tag} => ${String(error)}`, { cause: error });
 		}
 	}));
-	if (indexFilePath && mockOption) {
+	if (output.mock.indexMockFiles) for (const entry of generatorEntries) {
+		const ext = getMockFileExtensionByTypeName(entry);
+		const indexFilePath = indexFilePathsByType.get(ext);
+		if (!indexFilePath) continue;
 		const indexContent = tagEntries.map(([tag]) => {
-			const localMockPath = joinSafe("./", tag, tag + "." + getMockFileExtensionByTypeName(mockOption));
-			return `export { get${pascal(tag)}Mock } from '${localMockPath}'\n`;
+			const localMockPath = joinSafe("./", tag, tag + "." + ext);
+			return ext === OutputMockType.MSW ? `export { get${pascal(tag)}Mock } from '${localMockPath}'\n` : `export * from '${localMockPath}'\n`;
 		}).join("");
 		await fs$1.appendFile(indexFilePath, indexContent);
 	}
-	return [...new Set([...indexFilePath ? [indexFilePath] : [], ...generatedFilePathsArray.flat()])];
+	return [...new Set([...indexFilePathsByType.values(), ...generatedFilePathsArray.flat()])];
 }
 //#endregion
 //#region src/writers/tags-mode.ts
@@ -5216,7 +5371,10 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema,
 	const isAllowSyntheticDefaultImports = isSyntheticDefaultImportsAllow(output.tsconfig);
 	return (await Promise.all(Object.entries(target).map(async ([tag, target]) => {
 		try {
-			const { imports, implementation, implementationMock, importsMock, mutators, clientMutators, formData, formUrlEncoded, fetchReviver, paramsSerializer, paramsFilter } = target;
+			const { imports, implementation, mockOutputs: rawMockOutputs, mutators, clientMutators, formData, formUrlEncoded, fetchReviver, paramsSerializer, paramsFilter } = target;
+			const mockOutputs = collapseInlineMockOutputs(rawMockOutputs);
+			const importsMock = mockOutputs.flatMap((m) => m.imports);
+			const implementationMock = mockOutputs.map((m) => m.implementation).join("\n\n");
 			let data = header;
 			const schemasPathRelative = output.schemas ? getRelativeImportPath(targetPath, getFileInfo(isString(output.schemas) ? output.schemas : output.schemas.path, { extension: output.fileExtension }).dirname) : "./" + filename + ".schemas" + extension.replace(/\.ts$/, "");
 			const normalizedImports = imports.filter((imp) => {
@@ -5243,18 +5401,19 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema,
 				packageJson: output.packageJson,
 				output
 			});
-			if (output.mock) {
-				const importsMockForBuilder = generateImportsForBuilder(output, importsMock.filter((impMock) => !normalizedImports.some((imp) => imp.name === impMock.name && (imp.alias ?? "") === (impMock.alias ?? ""))), schemasPathRelative);
+			for (const mockOutput of mockOutputs) {
+				const entry = output.mock.generators.find((g) => !isFunction(g) && g.type === mockOutput.type);
+				const importsMockForBuilder = generateImportsForBuilder(output, mockOutput.imports.filter((impMock) => !normalizedImports.some((imp) => imp.name === impMock.name && (imp.alias ?? "") === (impMock.alias ?? ""))), schemasPathRelative);
 				data += builder.importsMock({
-					implementation: implementationMock,
+					implementation: mockOutput.implementation,
 					imports: importsMockForBuilder,
 					projectName,
 					hasSchemaDir: !!output.schemas,
 					isAllowSyntheticDefaultImports,
-					options: isFunction(output.mock) ? void 0 : output.mock
+					options: entry && !isFunction(entry) ? entry : void 0
 				});
 			}
-			const schemasPath = !output.schemas && needSchema ? nodePath.join(dirname, filename + ".schemas" + extension) : void 0;
+			const schemasPath = !output.schemas && needSchema ? path.join(dirname, filename + ".schemas" + extension) : void 0;
 			if (schemasPath) await writeGeneratedFile(schemasPath, generateSchemasInline ? header + generateSchemasInline() : header + generateModelsInline(builder.schemas));
 			if (mutators) data += generateMutatorImports({
 				mutators,
@@ -5276,11 +5435,11 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema,
 				data += "\n";
 			}
 			data += implementation;
-			if (output.mock) {
+			if (mockOutputs.length > 0) {
 				data += "\n\n";
 				data += implementationMock;
 			}
-			const implementationPath = nodePath.join(dirname, `${kebab(tag)}${extension}`);
+			const implementationPath = path.join(dirname, `${kebab(tag)}${extension}`);
 			await writeGeneratedFile(implementationPath, data);
 			return [implementationPath, ...schemasPath ? [schemasPath] : []];
 		} catch (error) {
@@ -5289,6 +5448,6 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema,
 	}))).flat();
 }
 //#endregion
-export { BODY_TYPE_NAME, DefaultTag, EnumGeneration, ErrorWithTag, FormDataArrayHandling, GetterPropType, LogLevels, NAMED_COMPONENT_SECTIONS, NamingConvention, OutputClient, OutputHttpClient, OutputMockType, OutputMode, PropertySortOrder, RefComponentSuffix, SchemaType, SupportedFormatter, TEMPLATE_TAG_REGEX, URL_REGEX, VERBS_WITH_BODY, Verbs, addDependency, asyncReduce, buildAngularParamsFilterExpression, camel, collectReferencedComponents, combineSchemas, compareVersions, conventionName, count, createDebugger, createLogger, createSuccessMessage, createTypeAliasIfNeeded, dedupeUnionType, dynamicImport, escape, escapeRegExp, filterByContentType, filteredVerbs, fixCrossDirectoryImports, fixRegularSchemaImports, generalJSTypes, generalJSTypesWithArray, generateAxiosOptions, generateBodyMutatorConfig, generateBodyOptions, generateComponentDefinition, generateDependencyImports, generateFormDataAndUrlEncodedFunction, generateImports, generateModelInline, generateModelsInline, generateMutator, generateMutatorConfig, generateMutatorImports, generateMutatorRequestOptions, generateOptions, generateParameterDefinition, generateQueryParamsAxiosConfig, generateSchemasDefinition, generateTarget, generateTargetForTags, generateVerbImports, generateVerbOptions, generateVerbsOptions, getAngularFilteredParamsCallExpression, getAngularFilteredParamsExpression, getAngularFilteredParamsHelperBody, getArray, getBaseUrlRuntimeImports, getBodiesByContentType, getBody, getCombinedEnumValue, getDefaultContentType, getEnum, getEnumDescriptions, getEnumImplementation, getEnumNames, getEnumUnionFromSchema, getExtension, getFileInfo, getFormDataFieldFileType, getFullRoute, getImportExtension, getIsBodyVerb, getKey, getMockFileExtensionByTypeName, getNumberWord, getObject, getOperationId, getOrvalGeneratedTypes, getParameters, getParams, getParamsInPath, getPropertySafe, getProps, getQueryParams, getRefInfo, getResReqTypes, getResponse, getResponseTypeCategory, getRoute, getRouteAsArray, getScalar, getSuccessResponseType, getTypedResponse, getWarningCount, isBinaryContentType, isBoolean, isComponentRef, isDirectory, isFunction, isModule, isNullish, isNumber, isNumeric, isObject, isReference, isSchema, isString, isStringLike, isSyntheticDefaultImportsAllow, isUrl, isVerb, isVerbose, jsDoc, jsStringEscape, kebab, keyValuePairsToJsDoc, log, logError, logVerbose, logWarning, mergeDeep, mismatchArgsMessage, pascal, removeFilesAndEmptyFolders, resetWarnings, resolveDiscriminators, resolveExampleRefs, resolveInstalledVersion, resolveInstalledVersions, resolveObject, resolveRef, resolveValue, sanitize, setVerbose, snake, sortByPriority, splitSchemasByType, startMessage, stringify, toObjectString, path_exports as upath, upper, writeModelInline, writeModelsInline, writeSchema, writeSchemas, writeSingleMode, writeSplitMode, writeSplitTagsMode, writeTagsMode };
+export { BODY_TYPE_NAME, DefaultTag, EnumGeneration, ErrorWithTag, FormDataArrayHandling, GetterPropType, LogLevels, NAMED_COMPONENT_SECTIONS, NamingConvention, OutputClient, OutputHttpClient, OutputMockType, OutputMode, PropertySortOrder, RefComponentSuffix, SchemaType, SupportedFormatter, TEMPLATE_TAG_REGEX, URL_REGEX, VERBS_WITH_BODY, Verbs, addDependency, asyncReduce, buildAngularParamsFilterExpression, camel, collectReferencedComponents, combineSchemas, compareVersions, conventionName, count, createDebugger, createLogger, createSuccessMessage, createTypeAliasIfNeeded, dedupeUnionType, dynamicImport, escape, escapeRegExp, filterByContentType, filteredVerbs, fixCrossDirectoryImports, fixRegularSchemaImports, generalJSTypes, generalJSTypesWithArray, generateAxiosOptions, generateBodyMutatorConfig, generateBodyOptions, generateComponentDefinition, generateDependencyImports, generateFormDataAndUrlEncodedFunction, generateImports, generateModelInline, generateModelsInline, generateMutator, generateMutatorConfig, generateMutatorImports, generateMutatorRequestOptions, generateOptions, generateParameterDefinition, generateQueryParamsAxiosConfig, generateSchemasDefinition, generateTarget, generateTargetForTags, generateVerbImports, generateVerbOptions, generateVerbsOptions, getAngularFilteredParamsCallExpression, getAngularFilteredParamsExpression, getAngularFilteredParamsHelperBody, getArray, getBaseUrlRuntimeImports, getBodiesByContentType, getBody, getCombinedEnumValue, getDefaultContentType, getEnum, getEnumDescriptions, getEnumImplementation, getEnumNames, getEnumUnionFromSchema, getExtension, getFileInfo, getFormDataFieldFileType, getFullRoute, getImportExtension, getIsBodyVerb, getKey, getMockFileExtensionByTypeName, getNumberWord, getObject, getOperationId, getOrvalGeneratedTypes, getParameters, getParams, getParamsInPath, getPropertySafe, getProps, getQueryParams, getRefInfo, getResReqTypes, getResponse, getResponseTypeCategory, getRoute, getRouteAsArray, getScalar, getSuccessResponseType, getTypedResponse, getWarningCount, isBinaryContentType, isBoolean, isComponentRef, isDirectory, isFakerMock, isFunction, isModule, isMswMock, isNullish, isNumber, isNumeric, isObject, isReference, isSchema, isString, isStringLike, isSyntheticDefaultImportsAllow, isUrl, isVerb, isVerbose, jsDoc, jsStringEscape, kebab, keyValuePairsToJsDoc, log, logError, logVerbose, logWarning, makeRouteSafe, mergeDeep, mismatchArgsMessage, pascal, removeFilesAndEmptyFolders, resetWarnings, resolveDiscriminators, resolveExampleRefs, resolveInstalledVersion, resolveInstalledVersions, resolveObject, resolveRef, resolveValue, sanitize, setVerbose, snake, sortByPriority, splitSchemasByType, startMessage, stringify, toObjectString, path_exports as upath, upper, wrapRouteParameters, writeModelInline, writeModelsInline, writeSchema, writeSchemas, writeSingleMode, writeSplitMode, writeSplitTagsMode, writeTagsMode };
 
 //# sourceMappingURL=index.mjs.map