@orval/core 8.5.3 → 8.6.0

package/dist/index.mjs

@@ -6,6 +6,7 @@ import nodePath 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 readline from "node:readline";
@@ -245,10 +246,10 @@ function camel(s = "") {
 	const camelString = decap(pascal(s), isStartWithUnderscore ? 1 : 0);
 	return isStartWithUnderscore ? `_${camelString}` : camelString;
 }
-function snake(s) {
+function snake(s = "") {
 	return lower(s, "_", true);
 }
-function kebab(s) {
+function kebab(s = "") {
 	return lower(s, "-", true);
 }
 function upper(s, fillWith, isDeapostrophe) {
@@ -457,12 +458,26 @@ function keyValuePairsToJsDoc(keyValues) {
 
 //#endregion
 //#region src/utils/dynamic-import.ts
+const TS_MODULE_EXTENSIONS = new Set([
+	".ts",
+	".mts",
+	".cts",
+	".tsx",
+	".jsx"
+]);
 async function dynamicImport(toImport, from = process.cwd(), takeDefault = true) {
 	if (!toImport) return toImport;
 	try {
 		if (isString(toImport)) {
-			const fileUrl = pathToFileURL(nodePath.resolve(from, toImport));
-			const data = nodePath.extname(fileUrl.href) === ".json" ? await import(fileUrl.href, { with: { type: "json" } }) : await import(fileUrl.href);
+			const filePath = nodePath.resolve(from, toImport);
+			const extension = nodePath.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;
+				return data;
+			}
+			const fileUrl = pathToFileURL(filePath);
+			const data = extension === ".json" ? await import(fileUrl.href, { with: { type: "json" } }) : await import(fileUrl.href);
 			if (takeDefault && (isObject(data) || isModule(data)) && data.default) return data.default;
 			return data;
 		}
@@ -817,7 +832,7 @@ const sortByPriority = (arr) => arr.toSorted((a, b) => {
 * Handles strings, numbers, booleans, functions, arrays, and objects.
 *
 * @param data - The data to stringify. Can be a string, array, object, number, boolean, function, null, or undefined.
-* @returns A string representation of the data, or undefined if data is null or undefined.
+* @returns A string representation of the data, `null` for null, or undefined if data is undefined.
 * @example
 * stringify('hello') // returns "'hello'"
 * stringify(42) // returns "42"
@@ -825,7 +840,8 @@ const sortByPriority = (arr) => arr.toSorted((a, b) => {
 * stringify({ a: 1, b: 'test' }) // returns "{ a: 1, b: 'test', }"
 */
 function stringify(data) {
-	if (isNullish$1(data)) return;
+	if (data === void 0) return;
+	if (data === null) return "null";
 	if (isString(data)) return `'${data.replaceAll("'", String.raw`\'`)}'`;
 	if (isNumber(data) || isBoolean(data) || isFunction(data)) return String(data);
 	if (Array.isArray(data)) return `[${data.map((item) => stringify(item)).join(", ")}]`;
@@ -933,6 +949,18 @@ function escape(str, char = "'") {
 	return str?.replaceAll(char, `\\${char}`);
 }
 /**
+* Escapes regular expression metacharacters in a string so it can be safely
+* embedded inside a RegExp pattern.
+*
+* @param value - The raw string value to escape for regex usage.
+* @returns The escaped string.
+* @example
+* escapeRegExp('foo$bar') // returns 'foo\\$bar'
+*/
+function escapeRegExp(value) {
+	return value.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`);
+}
+/**
 * Escape all characters not included in SingleStringCharacters and
 * DoubleStringCharacters on
 * http://www.ecma-international.org/ecma-262/5.1/#sec-7.8.4
@@ -998,6 +1026,38 @@ function isSyntheticDefaultImportsAllow(config) {
 
 //#endregion
 //#region src/getters/enum.ts
+/**
+* Map of special characters to semantic word replacements.
+*
+* Applied before naming convention transforms (PascalCase, camelCase, …) so
+* that characters which would otherwise be stripped still contribute a unique
+* segment to the generated key.  Without this, values like "created_at" and
+* "-created_at" both PascalCase to "CreatedAt", silently overwriting one
+* another in the generated const/enum object.
+*
+* Only characters that appear as leading/trailing modifiers in real-world
+* OpenAPI enums are mapped — the list is intentionally conservative to avoid
+* changing output for schemas that don't hit collisions.
+*/
+const ENUM_SPECIAL_CHARACTER_MAP = {
+	"-": "minus",
+	"+": "plus"
+};
+/**
+* Replace special characters with semantic words (plus an underscore separator)
+* so that naming convention transforms (PascalCase, etc.) produce unique keys.
+*
+* The trailing underscore acts as a word boundary so that PascalCase treats the
+* replacement as a separate word: "-created_at" → "minus_created_at" → "MinusCreatedAt".
+*/
+function replaceSpecialCharacters(key) {
+	let result = "";
+	for (const char of key) {
+		const replacement = ENUM_SPECIAL_CHARACTER_MAP[char];
+		result += replacement ? replacement + "_" : char;
+	}
+	return result;
+}
 function getEnumNames(schemaObject) {
 	const names = schemaObject?.["x-enumNames"] ?? schemaObject?.["x-enumnames"] ?? schemaObject?.["x-enum-varnames"];
 	if (!names) return;
@@ -1025,9 +1085,33 @@ const getTypeConstEnum = (value, enumName, names, descriptions, enumNamingConven
 	enumValue += `export const ${enumName} = {\n${implementation}} as const;\n`;
 	return enumValue;
 };
+/**
+* Derive the object/enum key for a single enum value.
+*
+* Handles numeric prefixes, sanitization, and optional naming convention
+* transforms.  When `disambiguate` is true, special characters (-/+) are
+* replaced with semantic words before the convention transform to prevent
+* key collisions.
+*/
+function deriveEnumKey(val, enumNamingConvention, disambiguate = false) {
+	let key = val.startsWith("'") ? val.slice(1, -1) : val;
+	if (isNumeric(key)) key = toNumberKey(key);
+	if (key.length > 1) key = sanitize(key, {
+		whitespace: "_",
+		underscore: true,
+		dash: true,
+		special: true
+	});
+	if (enumNamingConvention) {
+		if (disambiguate) key = replaceSpecialCharacters(key);
+		key = conventionName(key, enumNamingConvention);
+	}
+	return key;
+}
 function getEnumImplementation(value, names, descriptions, enumNamingConvention) {
 	if (value === "") return "";
 	const uniqueValues = [...new Set(value.split(" | "))];
+	const disambiguate = !!enumNamingConvention && new Set(uniqueValues.map((v) => deriveEnumKey(v, enumNamingConvention))).size < uniqueValues.length;
 	let result = "";
 	for (const [index, val] of uniqueValues.entries()) {
 		const name = names?.[index];
@@ -1037,15 +1121,7 @@ function getEnumImplementation(value, names, descriptions, enumNamingConvention)
 			result += comment + `  ${keyword.isIdentifierNameES5(name) ? name : `'${name}'`}: ${val},\n`;
 			continue;
 		}
-		let key = val.startsWith("'") ? val.slice(1, -1) : val;
-		if (isNumeric(key)) key = toNumberKey(key);
-		if (key.length > 1) key = sanitize(key, {
-			whitespace: "_",
-			underscore: true,
-			dash: true,
-			special: true
-		});
-		if (enumNamingConvention) key = conventionName(key, enumNamingConvention);
+		const key = deriveEnumKey(val, enumNamingConvention, disambiguate);
 		result += comment + `  ${keyword.isIdentifierNameES5(key) ? key : `'${key}'`}: ${val},\n`;
 	}
 	return result;
@@ -1056,6 +1132,7 @@ const getNativeEnum = (value, enumName, names, enumNamingConvention) => {
 const getNativeEnumItems = (value, names, enumNamingConvention) => {
 	if (value === "") return "";
 	const uniqueValues = [...new Set(value.split(" | "))];
+	const disambiguate = !!enumNamingConvention && new Set(uniqueValues.map((v) => deriveEnumKey(v, enumNamingConvention))).size < uniqueValues.length;
 	let result = "";
 	for (const [index, val] of uniqueValues.entries()) {
 		const name = names?.[index];
@@ -1063,15 +1140,7 @@ const getNativeEnumItems = (value, names, enumNamingConvention) => {
 			result += `  ${keyword.isIdentifierNameES5(name) ? name : `'${name}'`}= ${val},\n`;
 			continue;
 		}
-		let key = val.startsWith("'") ? val.slice(1, -1) : val;
-		if (isNumeric(key)) key = toNumberKey(key);
-		if (key.length > 1) key = sanitize(key, {
-			whitespace: "_",
-			underscore: true,
-			dash: true,
-			special: true
-		});
-		if (enumNamingConvention) key = conventionName(key, enumNamingConvention);
+		const key = deriveEnumKey(val, enumNamingConvention, disambiguate);
 		result += `  ${keyword.isIdentifierNameES5(key) ? key : `'${key}'`}= ${val},\n`;
 	}
 	return result;
@@ -1178,7 +1247,7 @@ function getRefInfo($ref, context) {
 		return firstLevel[paths[1]]?.suffix ?? "";
 	};
 	const suffix = getOverrideSuffix(context.output.override, refPaths);
-	const originalName = ref ? refPaths[refPaths.length - 1] : getSchemaFileName(pathname);
+	const originalName = ref ? refPaths.at(-1) ?? "" : getSchemaFileName(pathname);
 	if (!pathname) return {
 		name: sanitize(pascal(originalName) + suffix, {
 			es5keyword: true,
@@ -1265,10 +1334,9 @@ function getSchema$1(schema, context) {
 	if (!schema.$ref) throw new Error(`${REF_NOT_FOUND_PREFIX}: missing $ref`);
 	const refInfo = getRefInfo(schema.$ref, context);
 	const { refPaths } = refInfo;
-	let schemaByRefPaths = Array.isArray(refPaths) ? prop(context.spec, ...refPaths) : void 0;
-	schemaByRefPaths ??= context.spec;
-	if (isReference(schemaByRefPaths)) return getSchema$1(schemaByRefPaths, context);
-	let currentSchema = schemaByRefPaths || context.spec;
+	const schemaByRefPaths = Array.isArray(refPaths) ? prop(context.spec, ...refPaths) : void 0;
+	if (isObject(schemaByRefPaths) && isReference(schemaByRefPaths)) return getSchema$1(schemaByRefPaths, context);
+	let currentSchema = schemaByRefPaths;
 	if (isObject(currentSchema) && "nullable" in schema) {
 		const nullable = schema.nullable;
 		currentSchema = {
@@ -1505,7 +1573,7 @@ function getArray({ schema, name, context, formDataContext }) {
 			example: schemaExample,
 			examples: resolveExampleRefs(schemaExamples, context)
 		};
-	} else if (compareVersions(context.spec.openapi, "3.1", ">=")) return {
+	} else if (compareVersions(context.spec.openapi ?? "3.0.0", "3.1", ">=")) return {
 		value: "unknown[]",
 		imports: [],
 		schemas: [],
@@ -1563,11 +1631,12 @@ function getResReqTypes(responsesOrRequests, name, context, defaultType = "unkno
 				isEnum: false,
 				isRef: true,
 				hasReadonlyProps: false,
+				dependencies: [name],
 				originalSchema: void 0,
 				example: void 0,
 				examples: void 0,
 				key,
-				contentType: void 0
+				contentType: ""
 			}];
 			const [contentType, mediaType] = firstEntry;
 			const isFormData = formDataContentTypes.has(contentType);
@@ -1583,6 +1652,7 @@ function getResReqTypes(responsesOrRequests, name, context, defaultType = "unkno
 				isEnum: false,
 				isRef: true,
 				hasReadonlyProps: false,
+				dependencies: [name],
 				originalSchema: mediaType.schema,
 				example: mediaType.example,
 				examples: resolveExampleRefs(mediaType.examples, context),
@@ -1620,6 +1690,7 @@ function getResReqTypes(responsesOrRequests, name, context, defaultType = "unkno
 				type: "unknown",
 				isEnum: false,
 				hasReadonlyProps: false,
+				dependencies: [name],
 				formData,
 				formUrlEncoded,
 				isRef: true,
@@ -1664,6 +1735,7 @@ function getResReqTypes(responsesOrRequests, name, context, defaultType = "unkno
 			if (!isFormData && !isFormUrlEncoded || !effectivePropName || !mediaType.schema) return {
 				...resolvedValue,
 				imports: resolvedValue.imports,
+				dependencies: resolvedValue.dependencies,
 				contentType,
 				example: mediaType.example,
 				examples: resolveExampleRefs(mediaType.examples, context)
@@ -1718,6 +1790,7 @@ function getResReqTypes(responsesOrRequests, name, context, defaultType = "unkno
 			schemas: [],
 			type: defaultType,
 			isEnum: false,
+			dependencies: [],
 			key,
 			isRef: false,
 			hasReadonlyProps: false,
@@ -1929,7 +2002,7 @@ function getBody({ requestBody, operationName, context, contentType }) {
 	const imports = filteredBodyTypes.flatMap(({ imports }) => imports);
 	const schemas = filteredBodyTypes.flatMap(({ schemas }) => schemas);
 	const definition = filteredBodyTypes.map(({ value }) => value).join(" | ");
-	const nonReadonlyDefinition = filteredBodyTypes.some((x) => x.hasReadonlyProps) && definition ? `NonReadonly<${definition}>` : definition;
+	const nonReadonlyDefinition = filteredBodyTypes.some((x) => x.hasReadonlyProps) && definition && context.output.override.preserveReadonlyRequestBodies !== "preserve" ? `NonReadonly<${definition}>` : definition;
 	let implementation = generalJSTypesWithArray.includes(definition.toLowerCase()) || filteredBodyTypes.length > 1 ? camel(operationName) + context.output.override.components.requestBodies.suffix : camel(definition);
 	let isOptional = false;
 	if (implementation) {
@@ -2039,17 +2112,22 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 			examples: resolveExampleRefs(item.examples, context)
 		};
 	}
-	if (item.allOf || item.oneOf || item.anyOf) return combineSchemas({
-		schema: item,
+	const schemaItem = item;
+	const itemAllOf = schemaItem.allOf;
+	const itemOneOf = schemaItem.oneOf;
+	const itemAnyOf = schemaItem.anyOf;
+	const itemType = schemaItem.type;
+	if (itemAllOf || itemOneOf || itemAnyOf) return combineSchemas({
+		schema: schemaItem,
 		name,
-		separator: item.allOf ? "allOf" : item.oneOf ? "oneOf" : "anyOf",
+		separator: itemAllOf ? "allOf" : itemOneOf ? "oneOf" : "anyOf",
 		context,
 		nullable,
 		formDataContext
 	});
-	if (Array.isArray(item.type)) {
-		const typeArray = item.type;
-		const baseItem = item;
+	if (Array.isArray(itemType)) {
+		const typeArray = itemType;
+		const baseItem = schemaItem;
 		return combineSchemas({
 			schema: { anyOf: typeArray.map((type) => ({
 				...baseItem,
@@ -2061,7 +2139,7 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 			nullable
 		});
 	}
-	const itemProperties = item.properties;
+	const itemProperties = schemaItem.properties;
 	if (itemProperties && Object.entries(itemProperties).length > 0) {
 		const entries = Object.entries(itemProperties);
 		if (context.output.propertySortOrder === PropertySortOrder.ALPHABETICAL) entries.sort((a, b) => {
@@ -2074,14 +2152,13 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 			isEnum: false,
 			type: "object",
 			isRef: false,
-			schema: {},
 			hasReadonlyProps: false,
 			useTypeAlias: false,
 			dependencies: [],
-			example: item.example,
-			examples: resolveExampleRefs(item.examples, context)
+			example: schemaItem.example,
+			examples: resolveExampleRefs(schemaItem.examples, context)
 		};
-		const itemRequired = item.required;
+		const itemRequired = schemaItem.required;
 		for (const [index, [key, schema]] of entries.entries()) {
 			const isRequired = (Array.isArray(itemRequired) ? itemRequired : []).includes(key);
 			let propName = "";
@@ -2101,10 +2178,11 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 				context,
 				formDataContext: propertyFormDataContext
 			});
-			const isReadOnly = item.readOnly ?? schema.readOnly;
+			const isReadOnly = Boolean(schemaItem.readOnly) || Boolean(schema.readOnly);
 			if (!index) acc.value += "{";
 			const doc = jsDoc(schema, true, context);
-			if (isReadOnly ?? false) acc.hasReadonlyProps = true;
+			const propertyDoc = doc ? `${doc.trimEnd().split("\n").map((line) => `  ${line}`).join("\n")}\n` : "";
+			if (isReadOnly) acc.hasReadonlyProps = true;
 			const constValue = "const" in schema ? schema.const : void 0;
 			const hasConst = constValue !== void 0;
 			let constLiteral;
@@ -2112,6 +2190,7 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 			else if (isString(constValue)) constLiteral = `'${escape(constValue)}'`;
 			else constLiteral = JSON.stringify(constValue);
 			const needsValueImport = hasConst && (resolvedValue.isEnum || resolvedValue.type === "enum");
+			const usedResolvedValue = !hasConst || needsValueImport;
 			const aliasedImports = needsValueImport ? resolvedValue.imports.map((imp) => ({
 				...imp,
 				isConstant: true
@@ -2128,19 +2207,21 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 			});
 			const propValue = needsValueImport ? alias : constLiteral ?? alias;
 			const finalPropValue = isRequired ? propValue : context.output.override.useNullForOptional === true ? `${propValue} | null` : propValue;
-			acc.value += `\n  ${doc ? `${doc}  ` : ""}${isReadOnly && !context.output.override.suppressReadonlyModifier ? "readonly " : ""}${getKey(key)}${isRequired ? "" : "?"}: ${finalPropValue};`;
-			acc.schemas.push(...resolvedValue.schemas);
-			acc.dependencies.push(...resolvedValue.dependencies);
+			acc.value += `\n${propertyDoc}${isReadOnly && !context.output.override.suppressReadonlyModifier ? "  readonly " : "  "}${getKey(key)}${isRequired ? "" : "?"}: ${finalPropValue};`;
+			if (usedResolvedValue) {
+				acc.schemas.push(...resolvedValue.schemas);
+				acc.dependencies.push(...resolvedValue.dependencies);
+			}
 			if (entries.length - 1 === index) {
-				const additionalProps = item.additionalProperties;
-				if (additionalProps) if (isBoolean(additionalProps)) {
-					const recordType = getPropertyNamesRecordType(item, "unknown");
+				const additionalProps = schemaItem.additionalProperties;
+				if (additionalProps) if (additionalProps === true) {
+					const recordType = getPropertyNamesRecordType(schemaItem, "unknown");
 					if (recordType) {
 						acc.value += "\n}";
 						acc.value += ` & ${recordType}`;
 						acc.useTypeAlias = true;
 					} else {
-						const keyType = getIndexSignatureKey(item);
+						const keyType = getIndexSignatureKey(schemaItem);
 						acc.value += `\n  [key: ${keyType}]: unknown;\n }`;
 					}
 				} else {
@@ -2149,13 +2230,13 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 						name,
 						context
 					});
-					const recordType = getPropertyNamesRecordType(item, resolvedValue.value);
+					const recordType = getPropertyNamesRecordType(schemaItem, resolvedValue.value);
 					if (recordType) {
 						acc.value += "\n}";
 						acc.value += ` & ${recordType}`;
 						acc.useTypeAlias = true;
 					} else {
-						const keyType = getIndexSignatureKey(item);
+						const keyType = getIndexSignatureKey(schemaItem);
 						acc.value += `\n  [key: ${keyType}]: ${resolvedValue.value};\n}`;
 					}
 					acc.dependencies.push(...resolvedValue.dependencies);
@@ -2166,11 +2247,11 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 		}
 		return acc;
 	}
-	const outerAdditionalProps = item.additionalProperties;
-	const readOnlyFlag = item.readOnly;
+	const outerAdditionalProps = schemaItem.additionalProperties;
+	const readOnlyFlag = schemaItem.readOnly;
 	if (outerAdditionalProps) {
-		if (isBoolean(outerAdditionalProps)) {
-			const recordType = getPropertyNamesRecordType(item, "unknown");
+		if (outerAdditionalProps === true) {
+			const recordType = getPropertyNamesRecordType(schemaItem, "unknown");
 			if (recordType) return {
 				value: recordType + nullable,
 				imports: [],
@@ -2183,7 +2264,7 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 				dependencies: []
 			};
 			return {
-				value: `{ [key: ${getIndexSignatureKey(item)}]: unknown }` + nullable,
+				value: `{ [key: ${getIndexSignatureKey(schemaItem)}]: unknown }` + nullable,
 				imports: [],
 				schemas: [],
 				isEnum: false,
@@ -2199,7 +2280,7 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 			name,
 			context
 		});
-		const recordType = getPropertyNamesRecordType(item, resolvedValue.value);
+		const recordType = getPropertyNamesRecordType(schemaItem, resolvedValue.value);
 		if (recordType) return {
 			value: recordType + nullable,
 			imports: resolvedValue.imports,
@@ -2212,7 +2293,7 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 			dependencies: resolvedValue.dependencies
 		};
 		return {
-			value: `{[key: ${getIndexSignatureKey(item)}]: ${resolvedValue.value}}` + nullable,
+			value: `{[key: ${getIndexSignatureKey(schemaItem)}]: ${resolvedValue.value}}` + nullable,
 			imports: resolvedValue.imports,
 			schemas: resolvedValue.schemas,
 			isEnum: false,
@@ -2223,20 +2304,29 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 			dependencies: resolvedValue.dependencies
 		};
 	}
-	const constValue = item.const;
-	if (constValue) return {
-		value: `'${constValue}'`,
-		imports: [],
-		schemas: [],
-		isEnum: false,
-		type: "string",
-		isRef: false,
-		hasReadonlyProps: readOnlyFlag ?? false,
-		dependencies: []
-	};
-	const keyType = item.type === "object" ? getIndexSignatureKey(item) : "string";
-	const recordType = getPropertyNamesRecordType(item, "unknown");
-	if (item.type === "object" && recordType) return {
+	const constValue = schemaItem.const;
+	if (constValue !== void 0) {
+		let type;
+		if (Array.isArray(constValue)) type = "array";
+		else if (constValue === null) type = "null";
+		else if (typeof constValue === "string") type = "string";
+		else if (typeof constValue === "number") type = "number";
+		else if (typeof constValue === "boolean") type = "boolean";
+		else type = "object";
+		return {
+			value: typeof constValue === "string" ? `'${escape(constValue)}'` : JSON.stringify(constValue),
+			imports: [],
+			schemas: [],
+			isEnum: false,
+			type,
+			isRef: false,
+			hasReadonlyProps: readOnlyFlag ?? false,
+			dependencies: []
+		};
+	}
+	const keyType = itemType === "object" ? getIndexSignatureKey(schemaItem) : "string";
+	const recordType = getPropertyNamesRecordType(schemaItem, "unknown");
+	if (itemType === "object" && recordType) return {
 		value: recordType + nullable,
 		imports: [],
 		schemas: [],
@@ -2248,7 +2338,7 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 		dependencies: []
 	};
 	return {
-		value: (item.type === "object" ? `{ [key: ${keyType}]: unknown }` : "unknown") + nullable,
+		value: (itemType === "object" ? `{ [key: ${keyType}]: unknown }` : "unknown") + nullable,
 		imports: [],
 		schemas: [],
 		isEnum: false,
@@ -2436,7 +2526,7 @@ function normalizeAllOfSchema(schema) {
 	let didMerge = false;
 	const schemaProperties = schema.properties;
 	const schemaRequired = schema.required;
-	const mergedProperties = { ...schemaProperties };
+	const mergedProperties = schemaProperties ? { ...schemaProperties } : {};
 	const mergedRequired = new Set(schemaRequired);
 	const remainingAllOf = [];
 	for (const subSchema of schemaAllOf) {
@@ -2583,15 +2673,18 @@ function combineSchemas({ name, schema, separator, context, nullable, formDataCo
 		};
 	}
 	let resolvedValue;
-	if (normalizedSchema.properties) resolvedValue = getScalar({
+	const normalizedProperties = normalizedSchema.properties;
+	const schemaOneOf = schema.oneOf;
+	const schemaAnyOf = schema.anyOf;
+	if (normalizedProperties) resolvedValue = getScalar({
 		item: Object.fromEntries(Object.entries(normalizedSchema).filter(([key]) => key !== separator)),
 		name,
 		context,
 		formDataContext
 	});
-	else if (separator === "allOf" && (schema.oneOf || schema.anyOf)) {
-		const siblingCombiner = schema.oneOf ? "oneOf" : "anyOf";
-		const siblingSchemas = schema[siblingCombiner];
+	else if (separator === "allOf" && (schemaOneOf || schemaAnyOf)) {
+		const siblingCombiner = schemaOneOf ? "oneOf" : "anyOf";
+		const siblingSchemas = schemaOneOf ?? schemaAnyOf;
 		resolvedValue = combineSchemas({
 			schema: { [siblingCombiner]: siblingSchemas },
 			name,
@@ -2785,8 +2878,8 @@ function getProps({ body, queryParams, params, operationName, headers, context }
 		const parameterTypeName = `${pascal(operationName)}PathParameters`;
 		const name = "pathParams";
 		const namedParametersTypeDefinition = `export type ${parameterTypeName} = {\n ${params.map((property) => property.definition).join(",\n    ")},\n }`;
-		const isOptional = context.output.optionsParamRequired || params.every((param) => param.default);
-		const implementation = `{ ${params.map((property) => property.default ? `${property.name} = ${property.default}` : property.name).join(", ")} }: ${parameterTypeName}${isOptional ? " = {}" : ""}`;
+		const isOptional = context.output.optionsParamRequired || params.every((param) => param.default !== void 0);
+		const implementation = `{ ${params.map((property) => property.default === void 0 ? property.name : `${property.name} = ${stringify(property.default)}`).join(", ")} }: ${parameterTypeName}${isOptional ? " = {}" : ""}`;
 		const destructured = `{ ${params.map((property) => property.name).join(", ")} }`;
 		paramGetterProps = [{
 			type: GetterPropType.NAMED_PATH_PARAMS,
@@ -2951,13 +3044,15 @@ const getRoutePath = (path) => {
 	const matches = /([^{]*){?([\w*_-]*)}?(.*)/.exec(path);
 	if (!matches?.length) return path;
 	const prev = matches[1];
-	const param = sanitize(camel(matches[2]), {
+	const rawParam = matches[2];
+	const rest = matches[3];
+	const param = sanitize(camel(rawParam), {
 		es5keyword: true,
 		underscore: true,
 		dash: true,
 		dot: true
 	});
-	const next = hasParam(matches[3]) ? getRoutePath(matches[3]) : matches[3];
+	const next = hasParam(rest) ? getRoutePath(rest) : rest;
 	return hasParam(path) ? `${prev}\${${param}}${next}` : `${prev}${param}${next}`;
 };
 function getRoute(route) {
@@ -2977,13 +3072,14 @@ function getFullRoute(route, servers, baseUrl) {
 			if (!servers) throw new Error("Orval is configured to use baseUrl from the specifications 'servers' field, but there exist no servers in the specification.");
 			const server = servers.at(Math.min(baseUrl.index ?? 0, servers.length - 1));
 			if (!server) return "";
-			if (!server.variables) return server.url;
-			let url = server.url;
+			const serverUrl = server.url ?? "";
+			if (!server.variables) return serverUrl;
+			let url = serverUrl;
 			const variables = baseUrl.variables;
 			for (const variableKey of Object.keys(server.variables)) {
 				const variable = server.variables[variableKey];
 				if (variables?.[variableKey]) {
-					if (variable.enum && !variable.enum.some((e) => e == variables[variableKey])) throw new Error(`Invalid variable value '${variables[variableKey]}' for variable '${variableKey}' when resolving ${server.url}. Valid values are: ${variable.enum.join(", ")}.`);
+					if (variable.enum && !variable.enum.some((e) => e == variables[variableKey])) throw new Error(`Invalid variable value '${variables[variableKey]}' for variable '${variableKey}' when resolving ${serverUrl}. Valid values are: ${variable.enum.join(", ")}.`);
 					url = url.replaceAll(`{${variableKey}}`, variables[variableKey]);
 				} else url = url.replaceAll(`{${variableKey}}`, String(variable.default));
 			}
@@ -3083,7 +3179,8 @@ function generateDependency({ deps, isAllowSyntheticDefaultImports, dependency,
 }
 function addDependency({ implementation, exports, dependency, projectName, isAllowSyntheticDefaultImports }) {
 	const toAdds = exports.filter((e) => {
-		const searchWords = [e.alias, e.name].filter((p) => p?.length).join("|");
+		const searchWords = [e.alias, e.name].filter((p) => Boolean(p?.length)).map((part) => escapeRegExp(part)).join("|");
+		if (!searchWords) return false;
 		const pattern = new RegExp(String.raw`\b(${searchWords})\b`, "g");
 		return implementation.match(pattern);
 	});
@@ -3126,8 +3223,7 @@ function addDependency({ implementation, exports, dependency, projectName, isAll
 	}).join("\n") + "\n";
 }
 function getLibName(code) {
-	const splitString = code.split(" from ");
-	return splitString[splitString.length - 1].split(";")[0].trim();
+	return (code.split(" from ").at(-1) ?? "").split(";")[0].trim();
 }
 function generateDependencyImports(implementation, imports, projectName, hasSchemaDir, isAllowSyntheticDefaultImports) {
 	const dependencies = imports.map((dep) => addDependency({
@@ -3172,7 +3268,7 @@ function generateModelInline(acc, model) {
 	return acc + `${model}\n`;
 }
 function generateModelsInline(obj) {
-	const schemas = Object.values(obj).flat();
+	const schemas = Array.isArray(obj) ? obj : Object.values(obj).flat();
 	let result = "";
 	for (const { model } of schemas) result = generateModelInline(result, model);
 	return result;
@@ -3336,9 +3432,14 @@ function removeComments(file) {
 * (e.g. observe-mode branches), prefer getAngularFilteredParamsCallExpression +
 * getAngularFilteredParamsHelperBody instead.
 */
-const getAngularFilteredParamsExpression = (paramsExpression, requiredNullableParamKeys = []) => `(() => {
+const getAngularFilteredParamsExpression = (paramsExpression, requiredNullableParamKeys = [], preserveRequiredNullables = false) => {
+	const filteredParamValueType = `string | number | boolean${preserveRequiredNullables ? " | null" : ""} | Array<string | number | boolean>`;
+	const preserveNullableBranch = preserveRequiredNullables ? `    } else if (value === null && requiredNullableParamKeys.has(key)) {
+      filteredParams[key] = value;
+` : "";
+	return `(() => {
   const requiredNullableParamKeys = new Set<string>(${JSON.stringify(requiredNullableParamKeys)});
-  const filteredParams = {} as Record<string, string | number | boolean | null | Array<string | number | boolean>>;
+  const filteredParams: Record<string, ${filteredParamValueType}> = {};
   for (const [key, value] of Object.entries(${paramsExpression})) {
     if (Array.isArray(value)) {
       const filtered = value.filter(
@@ -3347,33 +3448,46 @@ const getAngularFilteredParamsExpression = (paramsExpression, requiredNullablePa
           (typeof item === 'string' ||
             typeof item === 'number' ||
             typeof item === 'boolean'),
-          ) as Array<string | number | boolean>;
+      ) as Array<string | number | boolean>;
       if (filtered.length) {
         filteredParams[key] = filtered;
       }
-    } else if (value === null && requiredNullableParamKeys.has(key)) {
-      filteredParams[key] = value;
-    } else if (
+${preserveNullableBranch}    } else if (
       value != null &&
       (typeof value === 'string' ||
         typeof value === 'number' ||
         typeof value === 'boolean')
     ) {
-      filteredParams[key] = value as string | number | boolean;
+      filteredParams[key] = value;
     }
   }
-  return filteredParams as unknown as Record<string, string | number | boolean | Array<string | number | boolean>>;
+  return filteredParams;
 })()`;
+};
 /**
 * Returns the body of a standalone `filterParams` helper function
 * to be emitted once in the generated file header, replacing the
 * inline IIFE that was previously duplicated in every method.
 */
-const getAngularFilteredParamsHelperBody = () => `function filterParams(
+const getAngularFilteredParamsHelperBody = () => `type AngularHttpParamValue = string | number | boolean | Array<string | number | boolean>;
+type AngularHttpParamValueWithNullable = AngularHttpParamValue | null;
+
+function filterParams(
+  params: Record<string, unknown>,
+  requiredNullableKeys?: ReadonlySet<string>,
+  preserveRequiredNullables?: false,
+): Record<string, AngularHttpParamValue>;
+function filterParams(
   params: Record<string, unknown>,
-  requiredNullableKeys: Set<string> = new Set(),
-): Record<string, string | number | boolean | Array<string | number | boolean>> {
-  const filteredParams: Record<string, string | number | boolean | null | Array<string | number | boolean>> = {};
+  requiredNullableKeys: ReadonlySet<string> | undefined,
+  preserveRequiredNullables: true,
+): Record<string, AngularHttpParamValueWithNullable>;
+function filterParams(
+  params: Record<string, unknown>,
+  requiredNullableKeys: ReadonlySet<string> = new Set(),
+  preserveRequiredNullables = false,
+): Record<string, AngularHttpParamValueWithNullable> {
+  const filteredParams: Record<string, AngularHttpParamValueWithNullable> = {};
   for (const [key, value] of Object.entries(params)) {
     if (Array.isArray(value)) {
       const filtered = value.filter(
@@ -3386,7 +3500,11 @@ const getAngularFilteredParamsHelperBody = () => `function filterParams(
       if (filtered.length) {
         filteredParams[key] = filtered;
       }
-    } else if (value === null && requiredNullableKeys.has(key)) {
+    } else if (
+      preserveRequiredNullables &&
+      value === null &&
+      requiredNullableKeys.has(key)
+    ) {
       filteredParams[key] = value;
     } else if (
       value != null &&
@@ -3394,15 +3512,15 @@ const getAngularFilteredParamsHelperBody = () => `function filterParams(
         typeof value === 'number' ||
         typeof value === 'boolean')
     ) {
-      filteredParams[key] = value as string | number | boolean;
+      filteredParams[key] = value;
     }
   }
-  return filteredParams as Record<string, string | number | boolean | Array<string | number | boolean>>;
+  return filteredParams;
 }`;
 /**
 * Returns a call expression to the `filterParams` helper function.
 */
-const getAngularFilteredParamsCallExpression = (paramsExpression, requiredNullableParamKeys = []) => `filterParams(${paramsExpression}, new Set<string>(${JSON.stringify(requiredNullableParamKeys)}))`;
+const getAngularFilteredParamsCallExpression = (paramsExpression, requiredNullableParamKeys = [], preserveRequiredNullables = false) => `filterParams(${paramsExpression}, new Set<string>(${JSON.stringify(requiredNullableParamKeys)})${preserveRequiredNullables ? ", true" : ""})`;
 function generateBodyOptions(body, isFormData, isFormUrlEncoded) {
 	if (isFormData && body.formData) return "\n      formData,";
 	if (isFormUrlEncoded && body.formUrlEncoded) return "\n      formUrlEncoded,";
@@ -3424,7 +3542,7 @@ function generateAxiosOptions({ response, isExactOptionalPropertyTypes, angularO
 	let value = "";
 	if (!isRequestOptions) {
 		if (queryParams) if (isAngular) {
-			const iifeExpr = getAngularFilteredParamsExpression("params ?? {}", requiredNullableQueryParamKeys);
+			const iifeExpr = getAngularFilteredParamsExpression("params ?? {}", requiredNullableQueryParamKeys, !!paramsSerializer);
 			value += paramsSerializer ? `\n        params: ${paramsSerializer.name}(${iifeExpr}),` : `\n        params: ${iifeExpr},`;
 		} else value += "\n        params,";
 		if (headers) value += "\n        headers,";
@@ -3441,7 +3559,7 @@ 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);
+			const callExpr = getAngularFilteredParamsCallExpression("{...params, ...options?.params}", requiredNullableQueryParamKeys, 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},";
@@ -3889,6 +4007,20 @@ function _filteredVerbs(verbs, filters) {
 	});
 }
 
+//#endregion
+//#region src/writers/file.ts
+const TRAILING_WHITESPACE_RE = /[^\S\r\n]+$/gm;
+/**
+* Write generated code to a file, stripping trailing whitespace from each line.
+*
+* Template literals in code generators can produce lines with only whitespace
+* when conditional expressions evaluate to empty strings. This function
+* ensures the output is always clean regardless of generator implementation.
+*/
+async function writeGeneratedFile(filePath, content) {
+	await fs$1.outputFile(filePath, content.replaceAll(TRAILING_WHITESPACE_RE, ""));
+}
+
 //#endregion
 //#region src/writers/schemas.ts
 /**
@@ -4018,11 +4150,10 @@ function resolveImportKey(schemaPath, importPath, fileExtension) {
 function removeFileExtension(path, fileExtension) {
 	return path.endsWith(fileExtension) ? path.slice(0, path.length - fileExtension.length) : path;
 }
-function getSchema({ schema: { imports, model }, target, header, namingConvention = NamingConvention.CAMEL_CASE }) {
+function getSchema({ schema: { imports, model }, header, namingConvention = NamingConvention.CAMEL_CASE }) {
 	let file = header;
 	file += generateImports({
 		imports: imports.filter((imp) => !model.includes(`type ${imp.alias ?? imp.name} =`) && !model.includes(`interface ${imp.alias ?? imp.name} {`)),
-		target,
 		namingConvention
 	});
 	file += imports.length > 0 ? "\n\n" : "\n";
@@ -4043,7 +4174,7 @@ function writeModelsInline(array) {
 async function writeSchema({ path, schema, target, namingConvention, fileExtension, header }) {
 	const name = conventionName(schema.name, namingConvention);
 	try {
-		await fs$1.outputFile(getPath(path, name, fileExtension), getSchema({
+		await writeGeneratedFile(getPath(path, name, fileExtension), getSchema({
 			schema,
 			target,
 			header,
@@ -4084,14 +4215,7 @@ async function writeSchemas({ schemaPath, schemas, target, namingConvention, fil
 		const ext = fileExtension.endsWith(".ts") ? fileExtension.slice(0, -3) : fileExtension;
 		const conventionNamesSet = new Set(Object.values(schemaGroups).map((group) => conventionName(group[0].name, namingConvention)));
 		try {
-			const currentExports = [...conventionNamesSet].map((schemaName) => `export * from './${schemaName}${ext}';`).toSorted((a, b) => a.localeCompare(b));
-			const existingExports = (await fs$1.readFile(schemaFilePath, "utf8")).match(/export\s+\*\s+from\s+['"][^'"]+['"]/g)?.map((statement) => {
-				const match = /export\s+\*\s+from\s+['"]([^'"]+)['"]/.exec(statement);
-				if (!match) return;
-				return `export * from '${match[1]}';`;
-			}).filter(Boolean) ?? [];
-			const fileContent = `${header}\n${[...new Set([...existingExports, ...currentExports])].toSorted((a, b) => a.localeCompare(b)).join("\n")}`;
-			await fs$1.writeFile(schemaFilePath, fileContent, { encoding: "utf8" });
+			await writeGeneratedFile(schemaFilePath, `${header}\n${[...conventionNamesSet].map((schemaName) => `export * from './${schemaName}${ext}';`).toSorted((a, b) => a.localeCompare(b)).join("\n")}\n`);
 		} catch (error) {
 			throw new Error(`Oups... 🍻. An Error occurred while writing schema index file ${schemaFilePath} => ${String(error)}`, { cause: error });
 		}
@@ -4110,15 +4234,21 @@ function generateImportsForBuilder(output, imports, relativeSchemasPath) {
 		exports: imports.filter((i) => !i.importPath),
 		dependency: relativeSchemasPath
 	}];
-	else schemaImports = uniqueBy(imports.filter((i) => !i.importPath), (x) => x.name).map((i) => {
-		const name = conventionName(isZodSchemaOutput ? i.name : i.schemaName ?? i.name, output.namingConvention);
-		const suffix = isZodSchemaOutput ? ".zod" : "";
-		const importExtension = output.fileExtension.replace(/\.ts$/, "") || "";
-		return {
-			exports: [i],
-			dependency: joinSafe(relativeSchemasPath, `${name}${suffix}${importExtension}`)
-		};
-	});
+	else {
+		const importsByDependency = /* @__PURE__ */ new Map();
+		for (const schemaImport of imports.filter((i) => !i.importPath)) {
+			const normalizedName = conventionName(isZodSchemaOutput ? schemaImport.name : schemaImport.schemaName ?? schemaImport.name, output.namingConvention);
+			const suffix = isZodSchemaOutput ? ".zod" : "";
+			const importExtension = output.fileExtension.replace(/\.ts$/, "") || "";
+			const dependency = joinSafe(relativeSchemasPath, `${normalizedName}${suffix}${importExtension}`);
+			if (!importsByDependency.has(dependency)) importsByDependency.set(dependency, []);
+			importsByDependency.get(dependency)?.push(schemaImport);
+		}
+		schemaImports = [...importsByDependency.entries()].map(([dependency, dependencyImports]) => ({
+			dependency,
+			exports: uniqueBy(dependencyImports, (entry) => `${entry.name}|${entry.alias ?? ""}|${String(entry.values)}|${String(entry.default)}`)
+		}));
+	}
 	const otherImports = uniqueBy(imports.filter((i) => !!i.importPath), (x) => x.name + x.importPath).map((i) => {
 		return {
 			exports: [i],
@@ -4249,14 +4379,24 @@ interface TypedResponse<T> extends Response {
 async function writeSingleMode({ builder, output, projectName, header, needSchema }) {
 	try {
 		const { path } = getFileInfo(output.target, {
-			backupFilename: conventionName(builder.info.title, output.namingConvention),
+			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);
 		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);
-		const importsForBuilder = schemasPath ? generateImportsForBuilder(output, imports.filter((imp) => !importsMock.some((impMock) => imp.name === impMock.name)), schemasPath) : [];
+		const normalizedImports = imports.filter((imp) => {
+			const searchWords = [imp.alias, imp.name].filter((part) => Boolean(part?.length)).map((part) => escapeRegExp(part)).join("|");
+			if (!searchWords) return false;
+			return new RegExp(String.raw`\b(${searchWords})\b`, "g").test(implementation);
+		}).map((imp) => ({ ...imp }));
+		for (const mockImport of importsMock) {
+			const matchingImport = normalizedImports.find((imp) => imp.name === mockImport.name && (imp.alias ?? "") === (mockImport.alias ?? ""));
+			if (!matchingImport) continue;
+			if (!!mockImport.values || !!mockImport.isConstant || !!mockImport.default || !!mockImport.namespaceImport || !!mockImport.syntheticDefaultImport) matchingImport.values = true;
+		}
+		const importsForBuilder = schemasPath ? generateImportsForBuilder(output, normalizedImports, schemasPath) : [];
 		data += builder.imports({
 			client: output.client,
 			implementation,
@@ -4271,7 +4411,7 @@ async function writeSingleMode({ builder, output, projectName, header, needSchem
 			output
 		});
 		if (output.mock) {
-			const importsMockForBuilder = schemasPath ? generateImportsForBuilder(output, importsMock, schemasPath) : [];
+			const importsMockForBuilder = schemasPath ? generateImportsForBuilder(output, importsMock.filter((impMock) => !normalizedImports.some((imp) => imp.name === impMock.name && (imp.alias ?? "") === (impMock.alias ?? ""))), schemasPath) : [];
 			data += builder.importsMock({
 				implementation: implementationMock,
 				imports: importsMockForBuilder,
@@ -4304,7 +4444,7 @@ async function writeSingleMode({ builder, output, projectName, header, needSchem
 			data += "\n\n";
 			data += implementationMock;
 		}
-		await fs$1.outputFile(path, data);
+		await writeGeneratedFile(path, data);
 		return [path];
 	} catch (error) {
 		const errorMsg = error instanceof Error ? error.message : "unknown error";
@@ -4317,7 +4457,7 @@ async function writeSingleMode({ builder, output, projectName, header, needSchem
 async function writeSplitMode({ builder, output, projectName, header, needSchema }) {
 	try {
 		const { path: targetPath, filename, dirname, extension } = getFileInfo(output.target, {
-			backupFilename: conventionName(builder.info.title, output.namingConvention),
+			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);
@@ -4349,10 +4489,7 @@ async function writeSplitMode({ builder, output, projectName, header, needSchema
 			options: isFunction(output.mock) ? void 0 : output.mock
 		});
 		const schemasPath = output.schemas ? void 0 : nodePath.join(dirname, filename + ".schemas" + extension);
-		if (schemasPath && needSchema) {
-			const schemasData = header + generateModelsInline(builder.schemas);
-			await fs$1.outputFile(schemasPath, schemasData);
-		}
+		if (schemasPath && needSchema) await writeGeneratedFile(schemasPath, header + generateModelsInline(builder.schemas));
 		if (mutators) implementationData += generateMutatorImports({
 			mutators,
 			implementation
@@ -4374,9 +4511,9 @@ async function writeSplitMode({ builder, output, projectName, header, needSchema
 		mockData += `\n${implementationMock}`;
 		const implementationFilename = filename + (OutputClient.ANGULAR === output.client ? ".service" : "") + extension;
 		const implementationPath = nodePath.join(dirname, implementationFilename);
-		await fs$1.outputFile(implementationPath, implementationData);
+		await writeGeneratedFile(implementationPath, implementationData);
 		const mockPath = output.mock ? nodePath.join(dirname, filename + "." + getMockFileExtensionByTypeName(output.mock) + extension) : void 0;
-		if (mockPath) await fs$1.outputFile(mockPath, mockData);
+		if (mockPath) await writeGeneratedFile(mockPath, mockData);
 		return [
 			implementationPath,
 			...schemasPath ? [schemasPath] : [],
@@ -4506,7 +4643,7 @@ function generateTargetForTags(builder, options) {
 //#region src/writers/split-tags-mode.ts
 async function writeSplitTagsMode({ builder, output, projectName, header, needSchema }) {
 	const { filename, dirname, extension } = getFileInfo(output.target, {
-		backupFilename: conventionName(builder.info.title, output.namingConvention),
+		backupFilename: conventionName(builder.info.title ?? "filename", output.namingConvention),
 		extension: output.fileExtension
 	});
 	const target = generateTargetForTags(builder, output);
@@ -4546,10 +4683,7 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 				options: isFunction(output.mock) ? void 0 : output.mock
 			});
 			const schemasPath = output.schemas ? void 0 : nodePath.join(dirname, filename + ".schemas" + extension);
-			if (schemasPath && needSchema) {
-				const schemasData = header + generateModelsInline(builder.schemas);
-				await fs$1.outputFile(schemasPath, schemasData);
-			}
+			if (schemasPath && needSchema) await writeGeneratedFile(schemasPath, header + generateModelsInline(builder.schemas));
 			if (mutators) implementationData += generateMutatorImports({
 				mutators,
 				implementation,
@@ -4587,9 +4721,9 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 			mockData += `\n${implementationMock}`;
 			const implementationFilename = tag + (OutputClient.ANGULAR === output.client ? ".service" : "") + extension;
 			const implementationPath = nodePath.join(dirname, tag, implementationFilename);
-			await fs$1.outputFile(implementationPath, implementationData);
+			await writeGeneratedFile(implementationPath, implementationData);
 			const mockPath = output.mock ? nodePath.join(dirname, tag, tag + "." + getMockFileExtensionByTypeName(output.mock) + extension) : void 0;
-			if (mockPath) await fs$1.outputFile(mockPath, mockData);
+			if (mockPath) await writeGeneratedFile(mockPath, mockData);
 			return [
 				implementationPath,
 				...schemasPath ? [schemasPath] : [],
@@ -4606,14 +4740,14 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 		}).join("");
 		await fs$1.appendFile(indexFilePath, indexContent);
 	}
-	return [...indexFilePath ? [indexFilePath] : [], ...generatedFilePathsArray.flat()];
+	return [...new Set([...indexFilePath ? [indexFilePath] : [], ...generatedFilePathsArray.flat()])];
 }
 
 //#endregion
 //#region src/writers/tags-mode.ts
 async function writeTagsMode({ builder, output, projectName, header, needSchema }) {
 	const { path: targetPath, filename, dirname, extension } = getFileInfo(output.target, {
-		backupFilename: conventionName(builder.info.title, output.namingConvention),
+		backupFilename: conventionName(builder.info.title ?? "filename", output.namingConvention),
 		extension: output.fileExtension
 	});
 	const target = generateTargetForTags(builder, output);
@@ -4623,7 +4757,17 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema
 			const { imports, implementation, implementationMock, importsMock, mutators, clientMutators, formData, formUrlEncoded, fetchReviver, paramsSerializer } = target;
 			let data = header;
 			const schemasPathRelative = output.schemas ? getRelativeImportPath(targetPath, getFileInfo(isString(output.schemas) ? output.schemas : output.schemas.path, { extension: output.fileExtension }).dirname) : "./" + filename + ".schemas";
-			const importsForBuilder = generateImportsForBuilder(output, imports.filter((imp) => !importsMock.some((impMock) => imp.name === impMock.name)), schemasPathRelative);
+			const normalizedImports = imports.filter((imp) => {
+				const searchWords = [imp.alias, imp.name].filter((part) => Boolean(part?.length)).map((part) => escapeRegExp(part)).join("|");
+				if (!searchWords) return false;
+				return new RegExp(String.raw`\b(${searchWords})\b`, "g").test(implementation);
+			}).map((imp) => ({ ...imp }));
+			for (const mockImport of importsMock) {
+				const matchingImport = normalizedImports.find((imp) => imp.name === mockImport.name && (imp.alias ?? "") === (mockImport.alias ?? ""));
+				if (!matchingImport) continue;
+				if (!!mockImport.values || !!mockImport.isConstant || !!mockImport.default || !!mockImport.namespaceImport || !!mockImport.syntheticDefaultImport) matchingImport.values = true;
+			}
+			const importsForBuilder = generateImportsForBuilder(output, normalizedImports, schemasPathRelative);
 			data += builder.imports({
 				client: output.client,
 				implementation,
@@ -4638,7 +4782,7 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema
 				output
 			});
 			if (output.mock) {
-				const importsMockForBuilder = generateImportsForBuilder(output, importsMock, schemasPathRelative);
+				const importsMockForBuilder = generateImportsForBuilder(output, importsMock.filter((impMock) => !normalizedImports.some((imp) => imp.name === impMock.name && (imp.alias ?? "") === (impMock.alias ?? ""))), schemasPathRelative);
 				data += builder.importsMock({
 					implementation: implementationMock,
 					imports: importsMockForBuilder,
@@ -4649,10 +4793,7 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema
 				});
 			}
 			const schemasPath = output.schemas ? void 0 : nodePath.join(dirname, filename + ".schemas" + extension);
-			if (schemasPath && needSchema) {
-				const schemasData = header + generateModelsInline(builder.schemas);
-				await fs$1.outputFile(schemasPath, schemasData);
-			}
+			if (schemasPath && needSchema) await writeGeneratedFile(schemasPath, header + generateModelsInline(builder.schemas));
 			if (mutators) data += generateMutatorImports({
 				mutators,
 				implementation
@@ -4677,7 +4818,7 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema
 				data += implementationMock;
 			}
 			const implementationPath = nodePath.join(dirname, `${kebab(tag)}${extension}`);
-			await fs$1.outputFile(implementationPath, data);
+			await writeGeneratedFile(implementationPath, data);
 			return [implementationPath, ...schemasPath ? [schemasPath] : []];
 		} catch (error) {
 			throw new Error(`Oups... 🍻. An Error occurred while writing tag ${tag} => ${String(error)}`, { cause: error });
@@ -4686,5 +4827,5 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema
 }
 
 //#endregion
-export { BODY_TYPE_NAME, EnumGeneration, ErrorWithTag, FormDataArrayHandling, GetterPropType, LogLevels, NamingConvention, OutputClient, OutputHttpClient, OutputMockType, OutputMode, PropertySortOrder, RefComponentSuffix, SchemaType, TEMPLATE_TAG_REGEX, URL_REGEX, VERBS_WITH_BODY, Verbs, _filteredVerbs, addDependency, asyncReduce, camel, combineSchemas, compareVersions, conventionName, count, createDebugger, createLogger, createSuccessMessage, createTypeAliasIfNeeded, dedupeUnionType, dynamicImport, escape, filterByContentType, 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, 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, isBinaryContentType, isBoolean, isDirectory, isFunction, isModule, isNullish, isNumber, isNumeric, isObject, isReference, isSchema, isString, isStringLike, isSyntheticDefaultImportsAllow, isUrl, isVerb, isVerbose, jsDoc, jsStringEscape, kebab, keyValuePairsToJsDoc, log, logError, logVerbose, mergeDeep, mismatchArgsMessage, pascal, removeFilesAndEmptyFolders, 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, EnumGeneration, ErrorWithTag, FormDataArrayHandling, GetterPropType, LogLevels, NamingConvention, OutputClient, OutputHttpClient, OutputMockType, OutputMode, PropertySortOrder, RefComponentSuffix, SchemaType, TEMPLATE_TAG_REGEX, URL_REGEX, VERBS_WITH_BODY, Verbs, _filteredVerbs, addDependency, asyncReduce, camel, combineSchemas, compareVersions, conventionName, count, createDebugger, createLogger, createSuccessMessage, createTypeAliasIfNeeded, dedupeUnionType, dynamicImport, escape, escapeRegExp, filterByContentType, 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, 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, isBinaryContentType, isBoolean, isDirectory, isFunction, isModule, isNullish, isNumber, isNumeric, isObject, isReference, isSchema, isString, isStringLike, isSyntheticDefaultImportsAllow, isUrl, isVerb, isVerbose, jsDoc, jsStringEscape, kebab, keyValuePairsToJsDoc, log, logError, logVerbose, mergeDeep, mismatchArgsMessage, pascal, removeFilesAndEmptyFolders, 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 };
 //# sourceMappingURL=index.mjs.map