@orval/core 8.10.0 → 8.12.1

package/dist/index.mjs

@@ -1,6 +1,6 @@
 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 path from "node:path";
 import { compare } from "compare-versions";
@@ -8,7 +8,7 @@ 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",
@@ -77,6 +80,10 @@ const Verbs = {
 	DELETE: "delete",
 	HEAD: "head"
 };
+/**
+* Canonical tag name used for the generated bucket that collects untagged operations.
+*/
+const DefaultTag = "default";
 const GetterPropType = {
 	PARAM: "param",
 	NAMED_PATH_PARAMS: "namedPathParams",
@@ -173,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) {
@@ -361,7 +382,30 @@ 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",
+	"minimum",
+	"maximum",
+	"exclusiveMinimum",
+	"exclusiveMaximum",
+	"minItems",
+	"maxItems",
+	"pattern"
+];
+function getItemValidationDocEntries(schema, prefix = "items", visited = /* @__PURE__ */ new WeakSet()) {
+	if (!schema) return [];
+	if (visited.has(schema)) return [];
+	visited.add(schema);
+	return [...itemValidationKeys.flatMap((key) => {
+		const value = schema[key];
+		return value === void 0 ? [] : [{
+			key: `${prefix}.${key}`,
+			value
+		}];
+	}), ...getItemValidationDocEntries(schema.items, `${prefix}.items`, visited)];
+}
 function jsDoc(schema, tryOneLine = false, context) {
 	if (context?.output.override.jsDoc) {
 		const { filter } = context.output.override.jsDoc;
@@ -369,7 +413,8 @@ 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 lines = (Array.isArray(description) ? description.filter((d) => !d.includes("eslint-disable")) : [description ?? ""]).map((line) => line.replaceAll(regex$1, replacement));
+	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,
@@ -383,11 +428,12 @@ function jsDoc(schema, tryOneLine = false, context) {
 		minItems?.toString(),
 		maxItems?.toString(),
 		isNullable ? "null" : "",
-		pattern
+		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$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 ? "  " : ""} *`;
@@ -399,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) {
@@ -415,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);
@@ -426,6 +472,17 @@ function jsDoc(schema, tryOneLine = false, context) {
 	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;
@@ -487,12 +544,12 @@ function getFileInfo(target = "", { backupFilename = "filename", extension = ".t
 	};
 }
 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
@@ -506,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
@@ -1001,6 +1064,24 @@ function isSyntheticDefaultImportsAllow(config) {
 	if (!config) return true;
 	return !!(config.compilerOptions?.allowSyntheticDefaultImports ?? config.compilerOptions?.esModuleInterop);
 }
+const NODE_NEXT_MODULES = new Set(["nodenext", "node16"]);
+const NODE_NEXT_EXTENSION_MAP = [
+	[".tsx", ".jsx"],
+	[".mts", ".mjs"],
+	[".cts", ".cjs"],
+	[".ts", ".js"]
+];
+function getImportExtension(fileExtension, tsconfig) {
+	const compilerOptions = tsconfig?.compilerOptions;
+	if (compilerOptions?.allowImportingTsExtensions) return fileExtension;
+	const module = compilerOptions?.module?.toLowerCase();
+	const moduleResolution = compilerOptions?.moduleResolution?.toLowerCase();
+	if (module && NODE_NEXT_MODULES.has(module) || moduleResolution && NODE_NEXT_MODULES.has(moduleResolution)) {
+		for (const [from, to] of NODE_NEXT_EXTENSION_MAP) if (fileExtension.endsWith(from)) return `${fileExtension.slice(0, -from.length)}${to}`;
+		return fileExtension;
+	}
+	return fileExtension.replace(/\.ts$/, "") || "";
+}
 //#endregion
 //#region src/getters/enum.ts
 /**
@@ -1210,13 +1291,36 @@ function getCombinedEnumValue(inputs) {
 }
 //#endregion
 //#region src/getters/ref.ts
+/**
+* `$ref`s targeting these sections under `#/components/...` are emitted as
+* named TypeScript imports (e.g. `import type { Pet } from './model'`).
+* Refs to any other location — for example `#/paths/.../schema` produced by
+* JSON-Schema-Ref-Parser `bundle()` — have no corresponding `export type`
+* and must be inlined by the resolver. See issue #398.
+*/
+const NAMED_COMPONENT_SECTIONS = [
+	"schemas",
+	"responses",
+	"parameters",
+	"requestBodies"
+];
 const RefComponentSuffix = {
 	schemas: "",
 	responses: "Response",
 	parameters: "Parameter",
 	requestBodies: "Body"
 };
-const regex = /* @__PURE__ */ new RegExp("~1", "g");
+const COMPONENT_REF_PATTERN = new RegExp(String.raw`^#\/components\/(${NAMED_COMPONENT_SECTIONS.join("|")})\/[^/]+$`);
+/**
+* True iff `ref` targets a named slot eligible for emission as a TypeScript
+* import. Used by `resolveValue` to decide between named import vs inlining
+* the resolved schema.
+*/
+function isComponentRef(ref) {
+	return COMPONENT_REF_PATTERN.test(ref);
+}
+const TILDE_1 = /~1/g;
+const TILDE_0 = /~0/g;
 /**
 * Return the output type from the $ref
 *
@@ -1224,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 "";
@@ -1358,7 +1462,34 @@ function resolveExampleRefs(examples, context) {
 //#region src/resolvers/value.ts
 function resolveValue({ schema, name, context, formDataContext }) {
 	if (isReference(schema)) {
+		const refValue = schema.$ref;
 		const { schema: schemaObject, imports } = resolveRef(schema, context);
+		if (refValue && !isComponentRef(refValue)) {
+			if (context.parents?.includes(refValue)) return {
+				value: "unknown",
+				imports: [],
+				schemas: [],
+				type: "unknown",
+				isEnum: false,
+				originalSchema: schemaObject,
+				hasReadonlyProps: false,
+				isRef: false,
+				dependencies: []
+			};
+			return {
+				...getScalar({
+					item: schemaObject,
+					name,
+					context: {
+						...context,
+						parents: [...context.parents ?? [], refValue]
+					},
+					formDataContext
+				}),
+				originalSchema: schemaObject,
+				isRef: false
+			};
+		}
 		const resolvedImport = imports[0];
 		let hasReadonlyProps = false;
 		const refName = resolvedImport.name;
@@ -1568,7 +1699,7 @@ function getArray({ schema, name, context, formDataContext }) {
 }
 //#endregion
 //#region src/getters/res-req-types.ts
-const getSchemaType = (s) => s.type;
+const getSchemaType$1 = (s) => s.type;
 const getSchemaCombined = (s) => s.oneOf ?? s.anyOf ?? s.allOf;
 const getSchemaOneOf = (s) => s.oneOf;
 const getSchemaAnyOf = (s) => s.anyOf;
@@ -1581,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,
@@ -1849,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 {
@@ -1912,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);
@@ -1924,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,
@@ -1957,7 +2107,7 @@ function resolveSchemaPropertiesToFormData({ schema, variableName, propName, con
     ${resolvedValue}});\n`;
 				} else valueStr = "JSON.stringify(value)";
 				else {
-					const itemType = getSchemaType(itemSchema);
+					const itemType = getSchemaType$1(itemSchema);
 					if (itemType === "number" || Array.isArray(itemType) && itemType.includes("number") || itemType === "integer" || Array.isArray(itemType) && itemType.includes("integer") || itemType === "boolean" || Array.isArray(itemType) && itemType.includes("boolean")) valueStr = "value.toString()";
 				}
 			}
@@ -1965,7 +2115,7 @@ function resolveSchemaPropertiesToFormData({ schema, variableName, propName, con
 				if (!hasNonPrimitiveChild) formDataValue = `${valueKey}.forEach((value, index${depth > 0 ? depth : ""}) => ${variableName}.append(\`${keyPrefix}${key}[\${index${depth > 0 ? depth : ""}}]\`, ${valueStr}));\n`;
 			} else formDataValue = `${valueKey}.forEach(value => ${variableName}.append(\`${keyPrefix}${key}${context.output.override.formData.arrayHandling === FormDataArrayHandling.SERIALIZE_WITH_BRACKETS ? "[]" : ""}\`, ${valueStr}));\n`;
 		} else if ((() => {
-			const propType = getSchemaType(property);
+			const propType = getSchemaType$1(property);
 			return propType === "number" || Array.isArray(propType) && propType.includes("number") || propType === "integer" || Array.isArray(propType) && propType.includes("integer") || propType === "boolean" || Array.isArray(propType) && propType.includes("boolean");
 		})()) formDataValue = `${variableName}.append(\`${keyPrefix}${key}\`, ${nonOptionalValueKey}.toString())\n`;
 		else formDataValue = `${variableName}.append(\`${keyPrefix}${key}\`, ${nonOptionalValueKey});\n`;
@@ -1989,7 +2139,7 @@ function resolveSchemaPropertiesToFormData({ schema, variableName, propName, con
 			})) existSubSchemaNullable = true;
 		}
 		const isRequired = getSchemaRequired(schema)?.includes(key) && !isRequestBodyOptional;
-		const propType = getSchemaType(property);
+		const propType = getSchemaType$1(property);
 		if (property.nullable || Array.isArray(propType) && propType.includes("null") || existSubSchemaNullable) {
 			if (isRequired) {
 				formDataValues += `if(${valueKey} !== null) {\n ${formDataValue} }\n`;
@@ -2241,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,
@@ -2253,7 +2404,7 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 			if (!index) acc.value += "{";
 			const doc = jsDoc(schema, true, context);
 			const propertyDoc = doc ? `${doc.trimEnd().split("\n").map((line) => `  ${line}`).join("\n")}\n` : "";
-			if (isReadOnly) acc.hasReadonlyProps = true;
+			if (isReadOnly || resolvedValue.hasReadonlyProps) acc.hasReadonlyProps = true;
 			const constValue = "const" in schema ? schema.const : void 0;
 			const hasConst = constValue !== void 0;
 			let constLiteral;
@@ -2518,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}'`;
@@ -2863,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: []
@@ -2999,6 +3155,50 @@ const isOpenApiSchemaObject = (value) => {
 	if (!value || typeof value !== "object") return false;
 	return !("$ref" in value);
 };
+/**
+* A `$ref` schema object (e.g. array `items` or a oneOf/anyOf/allOf variant
+* pointing at a component). We don't resolve the reference here, but a query
+* parameter behind a `$ref` is virtually always a complex (object-like) type,
+* so it must be treated as non-primitive. Over-flagging is harmless: the only
+* consumer (the Angular `nonPrimitiveKeys` passthrough) is gated on a
+* configured `paramsSerializer`, which is precisely what handles raw values.
+*/
+const isRefObject = (value) => !!value && typeof value === "object" && "$ref" in value;
+const getSchemaType = (schema) => {
+	const type = schema.type;
+	if (typeof type === "string") return type;
+	if (Array.isArray(type) && type.every((variant) => typeof variant === "string")) return type;
+};
+/**
+* Detects whether a query parameter's resolved schema is non-primitive — i.e.
+* an object, an array of objects, or a composition (oneOf/anyOf/allOf) that
+* resolves to a non-primitive shape.
+*
+* Used by Angular generators so the default `filterParams` helper preserves
+* such values instead of silently dropping them. Angular's `HttpParams` only
+* accepts primitives, but a user-provided `paramsSerializer`, `mutator`, or
+* `paramsFilter` may need the raw object to flatten or stringify it.
+*/
+const isSchemaNonPrimitive = (schema) => {
+	const schemaType = getSchemaType(schema);
+	const type = Array.isArray(schemaType) ? schemaType.filter((variant) => variant !== "null") : schemaType;
+	const additionalProperties = schema.additionalProperties;
+	if (type === "object") return true;
+	if (Array.isArray(type) && type.includes("object")) return true;
+	if (type === "array" || Array.isArray(type) && type.includes("array")) {
+		const items = schema.items;
+		if (isOpenApiSchemaObject(items)) return isSchemaNonPrimitive(items);
+		return true;
+	}
+	const compositions = [
+		...Array.isArray(schema.oneOf) ? schema.oneOf : [],
+		...Array.isArray(schema.anyOf) ? schema.anyOf : [],
+		...Array.isArray(schema.allOf) ? schema.allOf : []
+	];
+	if (compositions.length > 0) return compositions.some((variant) => isOpenApiSchemaObject(variant) ? isSchemaNonPrimitive(variant) : isRefObject(variant));
+	if (!type && (schema.properties !== void 0 || additionalProperties !== void 0 && additionalProperties !== false)) return true;
+	return false;
+};
 const isSchemaNullable = (schema) => {
 	if (schema.nullable === true) return true;
 	if (schema.type === "null") return true;
@@ -3076,6 +3276,7 @@ function getQueryParams({ queryParams, operationName, context, suffix = "params"
 	const type = types.map(({ definition }) => definition).join("\n");
 	const allOptional = queryParams.every(({ parameter }) => !parameter.required);
 	const requiredNullableKeys = types.filter(({ required, originalSchema }) => required && isSchemaNullable(originalSchema)).map(({ name }) => name);
+	const nonPrimitiveKeys = types.filter(({ originalSchema }) => isSchemaNonPrimitive(originalSchema)).map(({ name }) => name);
 	return {
 		schema: {
 			name,
@@ -3084,7 +3285,8 @@ function getQueryParams({ queryParams, operationName, context, suffix = "params"
 		},
 		deps: schemas,
 		isOptional: allOptional,
-		requiredNullableKeys
+		requiredNullableKeys,
+		...nonPrimitiveKeys.length > 0 ? { nonPrimitiveKeys } : {}
 	};
 }
 //#endregion
@@ -3109,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,
@@ -3202,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}'`];
@@ -3240,11 +3444,11 @@ function generateComponentDefinition(responses = {}, context, suffix) {
 }
 //#endregion
 //#region src/generators/imports.ts
-function generateImports({ imports, namingConvention = NamingConvention.CAMEL_CASE }) {
+function generateImports({ imports, namingConvention = NamingConvention.CAMEL_CASE, importExtension = "" }) {
 	if (imports.length === 0) return "";
 	const grouped = groupBy(uniqueWith(imports, (a, b) => a.name === b.name && a.default === b.default && a.alias === b.alias && a.values === b.values && a.isConstant === b.isConstant && a.namespaceImport === b.namespaceImport && a.syntheticDefaultImport === b.syntheticDefaultImport && a.importPath === b.importPath).map((imp) => ({
 		...imp,
-		importPath: imp.importPath ?? `./${conventionName(imp.name, namingConvention)}`
+		importPath: imp.importPath ?? `./${conventionName(imp.name, namingConvention)}${importExtension}`
 	})), (imp) => !imp.default && !imp.namespaceImport && !imp.syntheticDefaultImport && !imp.values && !imp.isConstant ? `aggregate|${imp.importPath}` : `single|${imp.importPath}|${imp.name}|${imp.alias ?? ""}|${String(imp.default)}|${String(imp.namespaceImport)}|${String(imp.syntheticDefaultImport)}|${String(imp.values)}|${String(imp.isConstant)}`);
 	return Object.entries(grouped).toSorted(([a], [b]) => a.localeCompare(b, "en", { numeric: true })).map(([, group]) => {
 		const sample = group[0];
@@ -3256,7 +3460,8 @@ function generateImports({ imports, namingConvention = NamingConvention.CAMEL_CA
 function generateMutatorImports({ mutators, implementation, oneMore }) {
 	let imports = "";
 	for (const mutator of uniqueWith(mutators, (a, b) => a.name === b.name && a.default === b.default)) {
-		const path = `${oneMore ? "../" : ""}${mutator.path}`;
+		const isRelativeImport = mutator.path.startsWith(".");
+		const path = `${oneMore && isRelativeImport ? "../" : ""}${mutator.path}`;
 		const importDefault = mutator.default ? mutator.name : `{ ${mutator.name} }`;
 		imports += `import ${importDefault} from '${path}';`;
 		imports += "\n";
@@ -3451,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({
@@ -3474,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");
@@ -3534,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";
@@ -3603,16 +3799,24 @@ function removeComments(file) {
 * (e.g. observe-mode branches), prefer getAngularFilteredParamsCallExpression +
 * getAngularFilteredParamsHelperBody instead.
 */
-const getAngularFilteredParamsExpression = (paramsExpression, requiredNullableParamKeys = [], preserveRequiredNullables = false) => {
-	const filteredParamValueType = `string | number | boolean${preserveRequiredNullables ? " | null" : ""} | Array<string | number | boolean>`;
+const getAngularFilteredParamsExpression = (paramsExpression, requiredNullableParamKeys = [], preserveRequiredNullables = false, nonPrimitiveKeys = []) => {
+	const hasPassthrough = nonPrimitiveKeys.length > 0;
+	const filteredParamValueType = hasPassthrough ? "unknown" : `string | number | boolean${preserveRequiredNullables ? " | null" : ""} | Array<string | number | boolean>`;
+	const passthroughBranch = hasPassthrough ? `    if (passthroughKeys.has(key)) {
+      if (value !== undefined) {
+        filteredParams[key] = value;
+      }
+      continue;
+    }
+` : "";
 	const preserveNullableBranch = preserveRequiredNullables ? `    } else if (value === null && requiredNullableParamKeys.has(key)) {
       filteredParams[key] = null;
 ` : "";
 	return `(() => {
-  const requiredNullableParamKeys = new Set<string>(${JSON.stringify(requiredNullableParamKeys)});
+${hasPassthrough ? `  const passthroughKeys = new Set<string>(${JSON.stringify(nonPrimitiveKeys)});\n` : ""}  const requiredNullableParamKeys = new Set<string>(${JSON.stringify(requiredNullableParamKeys)});
   const filteredParams: Record<string, ${filteredParamValueType}> = {};
   for (const [key, value] of Object.entries(${paramsExpression})) {
-    if (Array.isArray(value)) {
+${passthroughBranch}    if (Array.isArray(value)) {
       const filtered = value.filter(
         (item) =>
           item != null &&
@@ -3647,19 +3851,34 @@ function filterParams(
   params: Record<string, unknown>,
   requiredNullableKeys?: ReadonlySet<string>,
   preserveRequiredNullables?: false,
+  passthroughKeys?: undefined,
 ): Record<string, AngularHttpParamValue>;
 function filterParams(
   params: Record<string, unknown>,
   requiredNullableKeys: ReadonlySet<string> | undefined,
   preserveRequiredNullables: true,
+  passthroughKeys?: undefined,
 ): Record<string, AngularHttpParamValueWithNullable>;
+function filterParams(
+  params: Record<string, unknown>,
+  requiredNullableKeys: ReadonlySet<string> | undefined,
+  preserveRequiredNullables: boolean | undefined,
+  passthroughKeys: ReadonlySet<string>,
+): Record<string, unknown>;
 function filterParams(
   params: Record<string, unknown>,
   requiredNullableKeys: ReadonlySet<string> = new Set(),
   preserveRequiredNullables = false,
-): Record<string, AngularHttpParamValueWithNullable> {
-  const filteredParams: Record<string, AngularHttpParamValueWithNullable> = {};
+  passthroughKeys: ReadonlySet<string> = new Set(),
+): Record<string, unknown> {
+  const filteredParams: Record<string, unknown> = {};
   for (const [key, value] of Object.entries(params)) {
+    if (passthroughKeys.has(key)) {
+      if (value !== undefined) {
+        filteredParams[key] = value;
+      }
+      continue;
+    }
     if (Array.isArray(value)) {
       const filtered = value.filter(
         (item) =>
@@ -3691,14 +3910,34 @@ function filterParams(
 /**
 * Returns a call expression to the `filterParams` helper function.
 */
-const getAngularFilteredParamsCallExpression = (paramsExpression, requiredNullableParamKeys = [], preserveRequiredNullables = false) => `filterParams(${paramsExpression}, new Set<string>(${JSON.stringify(requiredNullableParamKeys)})${preserveRequiredNullables ? ", true" : ""})`;
+const getAngularFilteredParamsCallExpression = (paramsExpression, requiredNullableParamKeys = [], preserveRequiredNullables = false, nonPrimitiveKeys = []) => {
+	const baseArgs = `${paramsExpression}, new Set<string>(${JSON.stringify(requiredNullableParamKeys)})`;
+	if (nonPrimitiveKeys.length > 0) return `filterParams(${baseArgs}, ${preserveRequiredNullables}, new Set<string>(${JSON.stringify(nonPrimitiveKeys)}))`;
+	return `filterParams(${baseArgs}${preserveRequiredNullables ? ", true" : ""})`;
+};
+/**
+* Returns the filter call/IIFE used to massage query params before passing
+* them to Angular's HttpParams. When the user supplied a `paramsFilter`
+* mutator, the built-in `filterParams` is bypassed entirely and the user's
+* function is called with the raw params — they own nullish-stripping and
+* any object/array handling. Otherwise the built-in filter is used (either
+* the shared helper or an inline IIFE), and callers should only pass
+* `nonPrimitiveKeys` when a downstream serializer or custom consumer can
+* legally handle raw object/array values.
+*/
+const buildAngularParamsFilterExpression = ({ paramsExpression, requiredNullableParamKeys = [], preserveRequiredNullables = false, nonPrimitiveKeys = [], paramsFilter, useSharedHelper }) => {
+	if (paramsFilter) return `${paramsFilter.name}(${paramsExpression})`;
+	if (useSharedHelper) return getAngularFilteredParamsCallExpression(paramsExpression, requiredNullableParamKeys, preserveRequiredNullables, nonPrimitiveKeys);
+	return getAngularFilteredParamsExpression(paramsExpression, requiredNullableParamKeys, preserveRequiredNullables, nonPrimitiveKeys);
+};
 function generateBodyOptions(body, isFormData, isFormUrlEncoded) {
 	if (isFormData && body.formData) return "formData";
 	if (isFormUrlEncoded && body.formUrlEncoded) return "formUrlEncoded";
 	if (body.implementation) return body.implementation;
 }
-function generateAxiosOptions({ response, isExactOptionalPropertyTypes, angularObserve, angularParamsRef, requiredNullableQueryParamKeys, queryParams, headers, requestOptions, hasSignal, hasSignalParam = false, isVue, isAngular, paramsSerializer, paramsSerializerOptions }) {
+function generateAxiosOptions({ response, isExactOptionalPropertyTypes, angularObserve, angularParamsRef, requiredNullableQueryParamKeys, nonPrimitiveQueryParamKeys, queryParams, headers, requestOptions, hasSignal, hasSignalParam = false, isVue, isAngular, paramsSerializer, paramsSerializerOptions, paramsFilter }) {
 	const isRequestOptions = requestOptions !== false;
+	const angularPassthroughQueryParamKeys = paramsSerializer ? nonPrimitiveQueryParamKeys : [];
 	const signalVar = hasSignalParam ? "querySignal" : "signal";
 	const signalProp = hasSignalParam ? `signal: ${signalVar}` : "signal";
 	if (!queryParams && !headers && !response.isBlob && response.definition.success !== "string") {
@@ -3712,7 +3951,14 @@ function generateAxiosOptions({ response, isExactOptionalPropertyTypes, angularO
 	let value = "";
 	if (!isRequestOptions) {
 		if (queryParams) if (isAngular) {
-			const iifeExpr = getAngularFilteredParamsExpression("params ?? {}", requiredNullableQueryParamKeys, !!paramsSerializer);
+			const iifeExpr = buildAngularParamsFilterExpression({
+				paramsExpression: "params ?? {}",
+				requiredNullableParamKeys: requiredNullableQueryParamKeys,
+				preserveRequiredNullables: !!paramsSerializer,
+				nonPrimitiveKeys: angularPassthroughQueryParamKeys,
+				paramsFilter,
+				useSharedHelper: false
+			});
 			value += paramsSerializer ? `\n        params: ${paramsSerializer.name}(${iifeExpr}),` : `\n        params: ${iifeExpr},`;
 		} else value += "\n        params,";
 		if (headers) value += "\n        headers,";
@@ -3729,10 +3975,25 @@ function generateAxiosOptions({ response, isExactOptionalPropertyTypes, angularO
 		if (queryParams) if (isVue) value += "\n        params: {...unref(params), ...options?.params},";
 		else if (isAngular && angularParamsRef) value += `\n        params: ${angularParamsRef},`;
 		else if (isAngular && paramsSerializer) {
-			const callExpr = getAngularFilteredParamsCallExpression("{...params, ...options?.params}", requiredNullableQueryParamKeys, true);
+			const callExpr = buildAngularParamsFilterExpression({
+				paramsExpression: "{...params, ...options?.params}",
+				requiredNullableParamKeys: requiredNullableQueryParamKeys,
+				preserveRequiredNullables: true,
+				nonPrimitiveKeys: angularPassthroughQueryParamKeys,
+				paramsFilter,
+				useSharedHelper: true
+			});
 			value += `\n        params: ${paramsSerializer.name}(${callExpr}),`;
-		} else if (isAngular) value += `\n        params: ${getAngularFilteredParamsCallExpression("{...params, ...options?.params}", requiredNullableQueryParamKeys)},`;
-		else value += "\n        params: {...params, ...options?.params},";
+		} else if (isAngular) {
+			const callExpr = buildAngularParamsFilterExpression({
+				paramsExpression: "{...params, ...options?.params}",
+				requiredNullableParamKeys: requiredNullableQueryParamKeys,
+				nonPrimitiveKeys: angularPassthroughQueryParamKeys,
+				paramsFilter,
+				useSharedHelper: true
+			});
+			value += `\n        params: ${callExpr},`;
+		} else value += "\n        params: {...params, ...options?.params},";
 		if (headers) value += "\n        headers: {...headers, ...options?.headers},";
 	}
 	if (!isAngular && queryParams && (paramsSerializer || paramsSerializerOptions?.qs)) {
@@ -3741,13 +4002,14 @@ function generateAxiosOptions({ response, isExactOptionalPropertyTypes, angularO
 	}
 	return value;
 }
-function generateOptions({ route, body, angularObserve, angularParamsRef, headers, queryParams, response, verb, requestOptions, isFormData, isFormUrlEncoded, isAngular, isExactOptionalPropertyTypes, hasSignal, hasSignalParam, isVue, paramsSerializer, paramsSerializerOptions }) {
+function generateOptions({ route, body, angularObserve, angularParamsRef, headers, queryParams, response, verb, requestOptions, isFormData, isFormUrlEncoded, isAngular, isExactOptionalPropertyTypes, hasSignal, hasSignalParam, isVue, paramsSerializer, paramsSerializerOptions, paramsFilter }) {
 	const bodyIdentifier = getIsBodyVerb(verb) ? generateBodyOptions(body, isFormData, isFormUrlEncoded) : void 0;
 	const axiosOptions = generateAxiosOptions({
 		response,
 		angularObserve,
 		angularParamsRef,
 		requiredNullableQueryParamKeys: queryParams?.requiredNullableKeys,
+		nonPrimitiveQueryParamKeys: queryParams?.nonPrimitiveKeys,
 		queryParams: queryParams?.schema,
 		headers: headers?.schema,
 		requestOptions,
@@ -3757,7 +4019,8 @@ function generateOptions({ route, body, angularObserve, angularParamsRef, header
 		isVue: isVue ?? false,
 		isAngular: isAngular ?? false,
 		paramsSerializer,
-		paramsSerializerOptions
+		paramsSerializerOptions,
+		paramsFilter
 	});
 	const trimmedAxiosOptions = axiosOptions.trim();
 	const isRawOptionsArgument = trimmedAxiosOptions === "options" || trimmedAxiosOptions.startsWith("(") && trimmedAxiosOptions.endsWith(")") || trimmedAxiosOptions.startsWith("{") && trimmedAxiosOptions.endsWith("}");
@@ -3776,18 +4039,26 @@ function generateBodyMutatorConfig(body, isFormData, isFormUrlEncoded) {
 	if (body.implementation) return `,\n      data: ${body.implementation}`;
 	return "";
 }
-function generateQueryParamsAxiosConfig(response, isVue, isAngular, requiredNullableQueryParamKeys, queryParams) {
+function generateQueryParamsAxiosConfig(response, isVue, isAngular, requiredNullableQueryParamKeys, queryParams, paramsFilter) {
 	if (!queryParams && !response.isBlob) return "";
 	let value = "";
 	if (queryParams) if (isVue) value += ",\n        params: unref(params)";
-	else if (isAngular) value += `,\n        params: ${getAngularFilteredParamsExpression("params ?? {}", requiredNullableQueryParamKeys)}`;
-	else value += ",\n        params";
+	else if (isAngular) {
+		const paramsExpr = buildAngularParamsFilterExpression({
+			paramsExpression: "params ?? {}",
+			requiredNullableParamKeys: requiredNullableQueryParamKeys,
+			nonPrimitiveKeys: queryParams.nonPrimitiveKeys,
+			paramsFilter,
+			useSharedHelper: false
+		});
+		value += `,\n        params: ${paramsExpr}`;
+	} else value += ",\n        params";
 	if (response.isBlob) value += `,\n        responseType: 'blob'`;
 	return value;
 }
-function generateMutatorConfig({ route, body, headers, queryParams, response, verb, isFormData, isFormUrlEncoded, hasSignal, hasSignalParam = false, isExactOptionalPropertyTypes, isVue, isAngular }) {
+function generateMutatorConfig({ route, body, headers, queryParams, response, verb, isFormData, isFormUrlEncoded, hasSignal, hasSignalParam = false, isExactOptionalPropertyTypes, isVue, isAngular, paramsFilter }) {
 	const bodyOptions = getIsBodyVerb(verb) ? generateBodyMutatorConfig(body, isFormData, isFormUrlEncoded) : "";
-	const queryParamsOptions = generateQueryParamsAxiosConfig(response, isVue ?? false, isAngular ?? false, queryParams?.requiredNullableKeys, queryParams);
+	const queryParamsOptions = generateQueryParamsAxiosConfig(response, isVue ?? false, isAngular ?? false, queryParams?.requiredNullableKeys, queryParams, paramsFilter);
 	const ignoreContentTypes = isAngular ? ["multipart/form-data"] : [];
 	const headerOptions = body.contentType && !ignoreContentTypes.includes(body.contentType) ? `,\n      headers: {'Content-Type': '${body.contentType}', ${headers ? "...headers" : ""}}` : headers ? ",\n      headers" : "";
 	const signalVar = hasSignalParam ? "querySignal" : "signal";
@@ -4100,6 +4371,13 @@ async function buildVerbOption({ verb, output, operation, route, pathRoute, verb
 			workspace: context.workspace,
 			tsconfig: context.output.tsconfig
 		}) : void 0,
+		paramsFilter: isString(override.paramsFilter) || isObject(override.paramsFilter) ? await generateMutator({
+			output: output.target,
+			name: "paramsFilter",
+			mutator: override.paramsFilter,
+			workspace: context.workspace,
+			tsconfig: context.output.tsconfig
+		}) : void 0,
 		fetchReviver: isString(override.fetch.jsonReviver) || isObject(override.fetch.jsonReviver) ? await generateMutator({
 			output: output.target,
 			name: "fetchReviver",
@@ -4264,19 +4542,12 @@ function splitSchemasByType(schemas) {
 	};
 }
 /**
-* Get the import extension from a file extension.
-* Removes `.ts` suffix since TypeScript doesn't need it in imports.
-*/
-function getImportExtension(fileExtension) {
-	return fileExtension.replace(/\.ts$/, "") || "";
-}
-/**
 * Fix cross-directory imports when schemas reference other schemas in a different directory.
 * Updates import paths to use correct relative paths between directories.
 */
-function fixSchemaImports(schemas, targetSchemaNames, fromPath, toPath, namingConvention, fileExtension) {
+function fixSchemaImports(schemas, targetSchemaNames, fromPath, toPath, namingConvention, fileExtension, tsconfig) {
 	const relativePath = relativeSafe(fromPath, toPath);
-	const importExtension = getImportExtension(fileExtension);
+	const importExtension = getImportExtension(fileExtension, tsconfig);
 	for (const schema of schemas) schema.imports = schema.imports.map((imp) => {
 		if (targetSchemaNames.has(imp.name)) {
 			const fileName = conventionName(imp.name, namingConvention);
@@ -4291,14 +4562,14 @@ function fixSchemaImports(schemas, targetSchemaNames, fromPath, toPath, namingCo
 /**
 * Fix imports in operation schemas that reference regular schemas.
 */
-function fixCrossDirectoryImports(operationSchemas, regularSchemaNames, schemaPath, operationSchemaPath, namingConvention, fileExtension) {
-	fixSchemaImports(operationSchemas, regularSchemaNames, operationSchemaPath, schemaPath, namingConvention, fileExtension);
+function fixCrossDirectoryImports(operationSchemas, regularSchemaNames, schemaPath, operationSchemaPath, namingConvention, fileExtension, tsconfig) {
+	fixSchemaImports(operationSchemas, regularSchemaNames, operationSchemaPath, schemaPath, namingConvention, fileExtension, tsconfig);
 }
 /**
 * Fix imports in regular schemas that reference operation schemas.
 */
-function fixRegularSchemaImports(regularSchemas, operationSchemaNames, schemaPath, operationSchemaPath, namingConvention, fileExtension) {
-	fixSchemaImports(regularSchemas, operationSchemaNames, schemaPath, operationSchemaPath, namingConvention, fileExtension);
+function fixRegularSchemaImports(regularSchemas, operationSchemaNames, schemaPath, operationSchemaPath, namingConvention, fileExtension, tsconfig) {
+	fixSchemaImports(regularSchemas, operationSchemaNames, schemaPath, operationSchemaPath, namingConvention, fileExtension, tsconfig);
 }
 function getSchemaKey(schemaPath, schemaName, namingConvention, fileExtension) {
 	return getPath(schemaPath, conventionName(schemaName, namingConvention), fileExtension).toLowerCase().replaceAll("\\", "/");
@@ -4322,14 +4593,16 @@ function getCanonicalMap(schemaGroups, schemaPath, namingConvention, fileExtensi
 		canonicalNameMap
 	};
 }
-function normalizeCanonicalImportPaths(schemas, canonicalPathMap, canonicalNameMap, schemaPath, namingConvention, fileExtension) {
+function normalizeCanonicalImportPaths(schemas, canonicalPathMap, canonicalNameMap, schemaPath, namingConvention, fileExtension, tsconfig) {
+	const importExtension = getImportExtension(fileExtension, tsconfig);
 	for (const schema of schemas) schema.imports = schema.imports.map((imp) => {
 		const canonicalByName = canonicalNameMap.get(imp.name);
 		const resolvedImportKey = resolveImportKey(schemaPath, imp.importPath ?? `./${conventionName(imp.name, namingConvention)}`, fileExtension);
 		const canonicalByPath = canonicalPathMap.get(resolvedImportKey);
 		const canonical = canonicalByName ?? canonicalByPath;
 		if (!canonical?.importPath) return imp;
-		const importPath = removeTSExtension(relativeSafe(schemaPath, canonical.importPath.replaceAll("\\", "/")));
+		const relative = relativeSafe(schemaPath, canonical.importPath.replaceAll("\\", "/"));
+		const importPath = `${relative.endsWith(fileExtension) ? relative.slice(0, -fileExtension.length) : relative.replace(/\.ts$/, "")}${importExtension}`;
 		return {
 			...imp,
 			importPath
@@ -4352,14 +4625,12 @@ function mergeSchemaGroup(schemas) {
 function resolveImportKey(schemaPath, importPath, fileExtension) {
 	return join(schemaPath, `${importPath}${fileExtension}`).toLowerCase().replaceAll("\\", "/");
 }
-function removeTSExtension(path) {
-	return path.endsWith(".ts") ? path.slice(0, -3) : path;
-}
-function getSchema({ schema: { imports, model }, header, namingConvention = NamingConvention.CAMEL_CASE }) {
+function getSchema({ schema: { imports, model }, header, namingConvention = NamingConvention.CAMEL_CASE, importExtension }) {
 	let file = header;
 	file += generateImports({
 		imports: imports.filter((imp) => !model.includes(`type ${imp.alias ?? imp.name} =`) && !model.includes(`interface ${imp.alias ?? imp.name} {`)),
-		namingConvention
+		namingConvention,
+		importExtension
 	});
 	file += imports.length > 0 ? "\n\n" : "\n";
 	file += model;
@@ -4376,23 +4647,24 @@ function writeModelsInline(array) {
 	for (const { model } of array) acc = writeModelInline(acc, model);
 	return acc;
 }
-async function writeSchema({ path, schema, target, namingConvention, fileExtension, header }) {
+async function writeSchema({ path, schema, target, namingConvention, fileExtension, header, tsconfig }) {
 	const name = conventionName(schema.name, namingConvention);
 	try {
 		await writeGeneratedFile(getPath(path, name, fileExtension), getSchema({
 			schema,
 			target,
 			header,
-			namingConvention
+			namingConvention,
+			importExtension: getImportExtension(fileExtension, tsconfig)
 		}));
 	} catch (error) {
 		throw new Error(`Oups... 🍻. An Error occurred while writing schema ${name} => ${String(error)}`, { cause: error });
 	}
 }
-async function writeSchemas({ schemaPath, schemas, target, namingConvention, fileExtension, header, indexFiles }) {
+async function writeSchemas({ schemaPath, schemas, target, namingConvention, fileExtension, header, indexFiles, tsconfig }) {
 	const schemaGroups = getSchemaGroups(schemaPath, schemas, namingConvention, fileExtension);
 	const { canonicalPathMap, canonicalNameMap } = getCanonicalMap(schemaGroups, schemaPath, namingConvention, fileExtension);
-	normalizeCanonicalImportPaths(schemas, canonicalPathMap, canonicalNameMap, schemaPath, namingConvention, fileExtension);
+	normalizeCanonicalImportPaths(schemas, canonicalPathMap, canonicalNameMap, schemaPath, namingConvention, fileExtension, tsconfig);
 	for (const groupSchemas of Object.values(schemaGroups)) {
 		if (groupSchemas.length === 1) {
 			await writeSchema({
@@ -4401,7 +4673,8 @@ async function writeSchemas({ schemaPath, schemas, target, namingConvention, fil
 				target,
 				namingConvention,
 				fileExtension,
-				header
+				header,
+				tsconfig
 			});
 			continue;
 		}
@@ -4411,13 +4684,14 @@ async function writeSchemas({ schemaPath, schemas, target, namingConvention, fil
 			target,
 			namingConvention,
 			fileExtension,
-			header
+			header,
+			tsconfig
 		});
 	}
 	if (indexFiles) {
 		const schemaFilePath = path.join(schemaPath, `index.ts`);
 		await fs$1.ensureFile(schemaFilePath);
-		const ext = fileExtension.endsWith(".ts") ? fileExtension.slice(0, -3) : fileExtension;
+		const ext = getImportExtension(fileExtension, tsconfig);
 		const conventionNamesSet = new Set(Object.values(schemaGroups).map((group) => conventionName(group[0].name, namingConvention)));
 		try {
 			await writeGeneratedFile(schemaFilePath, `${header}\n${[...conventionNamesSet].map((schemaName) => `export * from './${schemaName}${ext}';`).toSorted((a, b) => a.localeCompare(b, "en", { numeric: true })).join("\n")}\n`);
@@ -4441,7 +4715,7 @@ function generateImportsForBuilder(output, imports, relativeSchemasPath) {
 	else {
 		const importsByDependency = /* @__PURE__ */ new Map();
 		for (const schemaImport of imports.filter((i) => !i.importPath)) {
-			const dependency = joinSafe(relativeSchemasPath, `${conventionName(isZodSchemaOutput ? schemaImport.name : schemaImport.schemaName ?? schemaImport.name, output.namingConvention)}${isZodSchemaOutput ? ".zod" : ""}${output.fileExtension.replace(/\.ts$/, "") || ""}`);
+			const dependency = joinSafe(relativeSchemasPath, `${conventionName(isZodSchemaOutput ? schemaImport.name : schemaImport.schemaName ?? schemaImport.name, output.namingConvention)}${isZodSchemaOutput ? ".zod" : ""}${getImportExtension(output.fileExtension, output.tsconfig)}`);
 			if (!importsByDependency.has(dependency)) importsByDependency.set(dependency, []);
 			importsByDependency.get(dependency)?.push(schemaImport);
 		}
@@ -4459,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;
@@ -4472,32 +4778,38 @@ function generateTarget(builder, options) {
 	const target = {
 		imports: [],
 		implementation: "",
-		implementationMock: {
-			function: "",
-			handler: "",
-			handlerName: ""
-		},
-		importsMock: [],
+		mockOutputs: [],
 		mutators: [],
 		clientMutators: [],
 		formData: [],
 		formUrlEncoded: [],
 		paramsSerializer: [],
+		paramsFilter: [],
 		fetchReviver: []
 	};
 	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);
 		if (operation.paramsSerializer) target.paramsSerializer.push(operation.paramsSerializer);
+		if (operation.paramsFilter) target.paramsFilter.push(operation.paramsFilter);
 		if (operation.clientMutators) target.clientMutators.push(...operation.clientMutators);
 		if (operation.fetchReviver) target.fetchReviver.push(operation.fetchReviver);
 		if (index === operations.length - 1) {
@@ -4516,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,
@@ -4526,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
@@ -4580,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, 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);
@@ -4608,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({
@@ -4628,6 +4951,7 @@ async function writeSingleMode({ builder, output, projectName, header, needSchem
 		if (formData) data += generateMutatorImports({ mutators: formData });
 		if (formUrlEncoded) data += generateMutatorImports({ mutators: formUrlEncoded });
 		if (paramsSerializer) data += generateMutatorImports({ mutators: paramsSerializer });
+		if (paramsFilter) data += generateMutatorImports({ mutators: paramsFilter });
 		if (fetchReviver) data += generateMutatorImports({ mutators: fetchReviver });
 		if (implementation.includes("NonReadonly<")) {
 			data += getOrvalGeneratedTypes();
@@ -4639,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;
 		}
@@ -4658,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, 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);
@@ -4677,15 +5000,6 @@ 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 ? path.join(dirname, filename + ".schemas" + extension) : void 0;
 		if (schemasPath) await writeGeneratedFile(schemasPath, generateSchemasInline ? header + generateSchemasInline() : header + generateModelsInline(builder.schemas));
 		if (mutators) implementationData += generateMutatorImports({
@@ -4696,6 +5010,7 @@ async function writeSplitMode({ builder, output, projectName, header, needSchema
 		if (formData) implementationData += generateMutatorImports({ mutators: formData });
 		if (formUrlEncoded) implementationData += generateMutatorImports({ mutators: formUrlEncoded });
 		if (paramsSerializer) implementationData += generateMutatorImports({ mutators: paramsSerializer });
+		if (paramsFilter) implementationData += generateMutatorImports({ mutators: paramsFilter });
 		if (fetchReviver) implementationData += generateMutatorImports({ mutators: fetchReviver });
 		if (implementation.includes("NonReadonly<")) {
 			implementationData += getOrvalGeneratedTypes();
@@ -4706,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 = path.join(dirname, implementationFilename);
 		await writeGeneratedFile(implementationPath, implementationData);
-		const mockPath = output.mock ? path.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 });
@@ -4723,30 +5054,83 @@ async function writeSplitMode({ builder, output, projectName, header, needSchema
 }
 //#endregion
 //#region src/writers/target-tags.ts
+/**
+* Ensures every operation has at least one tag by falling back to the
+* {@link DefaultTag} constant for untagged operations, so the tag-routing
+* logic in {@link generateTargetTags} always has a bucket to assign the
+* operation to.
+*/
 function addDefaultTagIfEmpty(operation) {
 	return {
 		...operation,
-		tags: operation.tags.length > 0 ? operation.tags : ["default"]
+		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] : [],
 			formUrlEncoded: operation.formUrlEncoded ? [operation.formUrlEncoded] : [],
 			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;
 	}
@@ -4754,17 +5138,13 @@ 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,
 		formUrlEncoded: operation.formUrlEncoded ? [...currentOperation.formUrlEncoded ?? [], operation.formUrlEncoded] : currentOperation.formUrlEncoded,
 		paramsSerializer: operation.paramsSerializer ? [...currentOperation.paramsSerializer ?? [], operation.paramsSerializer] : currentOperation.paramsSerializer,
+		paramsFilter: operation.paramsFilter ? [...currentOperation.paramsFilter ?? [], operation.paramsFilter] : currentOperation.paramsFilter,
 		fetchReviver: operation.fetchReviver ? [...currentOperation.fetchReviver ?? [], operation.fetchReviver] : currentOperation.fetchReviver
 	};
 	return currentAcc;
@@ -4806,22 +5186,28 @@ function generateTargetForTags(builder, options) {
 					output: options,
 					verbOptions: builder.verbOptions,
 					tag,
+					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,
 					formUrlEncoded: target.formUrlEncoded,
 					paramsSerializer: target.paramsSerializer,
+					paramsFilter: target.paramsFilter,
 					fetchReviver: target.fetchReviver
 				};
 			}
@@ -4831,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;
 }
@@ -4844,15 +5230,20 @@ 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 ? path.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 } = target;
+			const { imports, implementation, mockOutputs, mutators, clientMutators, formData, fetchReviver, formUrlEncoded, paramsSerializer, paramsFilter } = target;
 			let implementationData = header;
-			let mockData = header;
 			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));
@@ -4886,15 +5277,6 @@ 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 ? path.join(dirname, filename + ".schemas" + extension) : void 0;
 			if (schemasPath) await writeGeneratedFile(schemasPath, generateSchemasInline ? header + generateSchemasInline() : header + generateModelsInline(builder.schemas));
 			if (mutators) implementationData += generateMutatorImports({
@@ -4918,6 +5300,10 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 				mutators: paramsSerializer,
 				oneMore: true
 			});
+			if (paramsFilter) implementationData += generateMutatorImports({
+				mutators: paramsFilter,
+				oneMore: true
+			});
 			if (fetchReviver) implementationData += generateMutatorImports({
 				mutators: fetchReviver,
 				oneMore: true
@@ -4931,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 = path.join(dirname, tag, implementationFilename);
 			await writeGeneratedFile(implementationPath, implementationData);
-			const mockPath = output.mock ? path.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
@@ -4966,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 } = 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) => {
@@ -4993,15 +5401,16 @@ 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 ? path.join(dirname, filename + ".schemas" + extension) : void 0;
@@ -5014,6 +5423,7 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema,
 			if (formData) data += generateMutatorImports({ mutators: formData });
 			if (formUrlEncoded) data += generateMutatorImports({ mutators: formUrlEncoded });
 			if (paramsSerializer) data += generateMutatorImports({ mutators: paramsSerializer });
+			if (paramsFilter) data += generateMutatorImports({ mutators: paramsFilter });
 			if (fetchReviver) data += generateMutatorImports({ mutators: fetchReviver });
 			data += "\n\n";
 			if (implementation.includes("NonReadonly<")) {
@@ -5025,7 +5435,7 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema,
 				data += "\n";
 			}
 			data += implementation;
-			if (output.mock) {
+			if (mockOutputs.length > 0) {
 				data += "\n\n";
 				data += implementationMock;
 			}
@@ -5038,6 +5448,6 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema,
 	}))).flat();
 }
 //#endregion
-export { BODY_TYPE_NAME, EnumGeneration, ErrorWithTag, FormDataArrayHandling, GetterPropType, LogLevels, NamingConvention, OutputClient, OutputHttpClient, OutputMockType, OutputMode, PropertySortOrder, RefComponentSuffix, SchemaType, SupportedFormatter, TEMPLATE_TAG_REGEX, URL_REGEX, VERBS_WITH_BODY, Verbs, addDependency, asyncReduce, 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, 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, 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