@orval/core 8.0.2 → 8.1.0

package/dist/index.mjs

@@ -234,7 +234,7 @@ function joinSafe(...values) {
 * @param property
 */
 function isReference(obj) {
-	return Object.hasOwn(obj, "$ref");
+	return !isNull(obj) && Object.hasOwn(obj, "$ref");
 }
 function isDirectory(path$2) {
 	return !extname(path$2);
@@ -810,6 +810,14 @@ function jsStringEscape(input) {
 		}
 	});
 }
+/**
+* Deduplicates a TypeScript union type string.
+* Handles types like "A | B | B" → "A | B" and "null | null" → "null".
+*/
+function dedupeUnionType(unionType) {
+	const parts = unionType.split("|").map((part) => part.trim());
+	return [...new Set(parts)].join(" | ");
+}
 
 //#endregion
 //#region src/utils/tsconfig.ts
@@ -895,6 +903,76 @@ const toNumberKey = (value) => {
 const getUnion = (value, enumName) => {
 	return `export type ${enumName} = ${value};`;
 };
+function getEnumUnionFromSchema(schema) {
+	if (!schema?.enum) return "";
+	return schema.enum.filter((val) => val !== null).map((val) => isString(val) ? `'${escape(val)}'` : `${val}`).join(" | ");
+}
+const stripNullUnion = (value) => value.replace(/\s*\|\s*null/g, "").trim();
+const isSpreadableEnumRef = (schema, refName) => {
+	if (!schema?.enum || !refName) return false;
+	if (!getEnumUnionFromSchema(schema)) return false;
+	const type = schema.type;
+	if (type === "boolean" || Array.isArray(type) && type.includes("boolean")) return false;
+	return /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(refName);
+};
+const buildInlineEnum = (schema, enumValue) => {
+	const names = getEnumNames(schema);
+	const descriptions = getEnumDescriptions(schema);
+	return getEnumImplementation(enumValue ?? getEnumUnionFromSchema(schema), names, descriptions);
+};
+function getCombinedEnumValue(inputs) {
+	const valueImports = [];
+	const hasNull = inputs.some((input) => {
+		if (input.value.includes("| null")) return true;
+		const schema = input.schema;
+		if (!schema) return false;
+		if (schema.nullable === true) return true;
+		if (Array.isArray(schema.type) && schema.type.includes("null")) return true;
+		return schema.enum?.includes(null) ?? false;
+	});
+	const addValueImport = (name) => {
+		if (!valueImports.includes(name)) valueImports.push(name);
+	};
+	if (inputs.length === 1) {
+		const input = inputs[0];
+		if (input.isRef) {
+			const refName = stripNullUnion(input.value);
+			if (isSpreadableEnumRef(input.schema, refName)) {
+				addValueImport(refName);
+				return {
+					value: refName,
+					valueImports,
+					hasNull
+				};
+			}
+			return {
+				value: `{${buildInlineEnum(input.schema)}} as const`,
+				valueImports,
+				hasNull
+			};
+		}
+		return {
+			value: `{${buildInlineEnum(input.schema, stripNullUnion(input.value))}} as const`,
+			valueImports,
+			hasNull
+		};
+	}
+	return {
+		value: `{${inputs.map((input) => {
+			if (input.isRef) {
+				const refName = stripNullUnion(input.value);
+				if (isSpreadableEnumRef(input.schema, refName)) {
+					addValueImport(refName);
+					return `...${refName},`;
+				}
+				return buildInlineEnum(input.schema);
+			}
+			return buildInlineEnum(input.schema, stripNullUnion(input.value));
+		}).join("")}} as const`,
+		valueImports,
+		hasNull
+	};
+}
 
 //#endregion
 //#region src/getters/ref.ts
@@ -1383,12 +1461,13 @@ function getScalar({ item, name, context }) {
 function combineValues({ resolvedData, resolvedValue, separator: separator$1, context }) {
 	if (resolvedData.isEnum.every(Boolean)) return `${resolvedData.values.join(` | `)}${resolvedValue ? ` | ${resolvedValue.value}` : ""}`;
 	if (separator$1 === "allOf") {
-		let resolvedDataValue = resolvedData.values.join(` & `);
+		let resolvedDataValue = resolvedData.values.map((v) => v.includes(" | ") ? `(${v})` : v).join(` & `);
 		if (resolvedData.originalSchema.length > 0 && resolvedValue) {
 			const discriminatedPropertySchemas = resolvedData.originalSchema.filter((s) => s?.discriminator && resolvedValue.value.includes(` ${s.discriminator.propertyName}:`));
 			if (discriminatedPropertySchemas.length > 0) resolvedDataValue = `Omit<${resolvedDataValue}, '${discriminatedPropertySchemas.map((s) => s.discriminator?.propertyName).join("' | '")}'>`;
 		}
-		const joined = `${resolvedDataValue}${resolvedValue ? ` & ${resolvedValue.value}` : ""}`;
+		const resolvedValueStr = resolvedValue?.value.includes(" | ") ? `(${resolvedValue.value})` : resolvedValue?.value;
+		const joined = `${resolvedDataValue}${resolvedValue ? ` & ${resolvedValueStr}` : ""}`;
 		const overrideRequiredProperties = resolvedData.requiredProperties.filter((prop$1) => !resolvedData.originalSchema.some((schema) => schema?.properties?.[prop$1] && schema.required?.includes(prop$1)));
 		if (overrideRequiredProperties.length > 0) return `${joined} & Required<Pick<${joined}, '${overrideRequiredProperties.join("' | '")}'>>`;
 		return joined;
@@ -1460,13 +1539,20 @@ function combineSchemas({ name, schema, separator: separator$1, context, nullabl
 		examples: resolveExampleRefs(schema.examples, context),
 		requiredProperties: separator$1 === "allOf" ? schema.required ?? [] : []
 	});
-	if (resolvedData.isEnum.every(Boolean) && name && items.length > 1 && separator$1 !== "oneOf") {
-		const newEnum = `export const ${pascal(name)} = ${getCombineEnumValue(resolvedData)}`;
+	if (resolvedData.isEnum.every(Boolean) && name && items.length > 1 && context.output.override.enumGenerationType !== EnumGeneration.UNION) {
+		const { value: combinedEnumValue, valueImports, hasNull } = getCombinedEnumValue(resolvedData.values.map((value, index) => ({
+			value,
+			isRef: resolvedData.isRef[index],
+			schema: resolvedData.originalSchema[index]
+		})));
+		const newEnum = `export const ${pascal(name)} = ${combinedEnumValue}`;
+		const valueImportSet = new Set(valueImports);
+		const typeSuffix = `${nullable}${hasNull && !nullable.includes("null") ? " | null" : ""}`;
 		return {
-			value: `typeof ${pascal(name)}[keyof typeof ${pascal(name)}] ${nullable}`,
+			value: `typeof ${pascal(name)}[keyof typeof ${pascal(name)}]${typeSuffix}`,
 			imports: [{ name: pascal(name) }],
 			schemas: [...resolvedData.schemas, {
-				imports: resolvedData.imports.map((toImport) => ({
+				imports: resolvedData.imports.filter((toImport) => valueImportSet.has(toImport.alias ?? toImport.name)).map((toImport) => ({
 					...toImport,
 					values: true
 				})),
@@ -1488,13 +1574,23 @@ function combineSchemas({ name, schema, separator: separator$1, context, nullabl
 		name,
 		context
 	});
+	else if (separator$1 === "allOf" && (schema.oneOf || schema.anyOf)) {
+		const siblingCombiner = schema.oneOf ? "oneOf" : "anyOf";
+		resolvedValue = combineSchemas({
+			schema: { [siblingCombiner]: schema[siblingCombiner] },
+			name,
+			separator: siblingCombiner,
+			context,
+			nullable: ""
+		});
+	}
 	return {
-		value: combineValues({
+		value: dedupeUnionType(combineValues({
 			resolvedData,
 			separator: separator$1,
 			resolvedValue,
 			context
-		}) + nullable,
+		}) + nullable),
 		imports: resolvedValue ? [...resolvedData.imports, ...resolvedValue.imports] : resolvedData.imports,
 		schemas: resolvedValue ? [...resolvedData.schemas, ...resolvedValue.schemas] : resolvedData.schemas,
 		dependencies: resolvedValue ? [...resolvedData.dependencies, ...resolvedValue.dependencies] : resolvedData.dependencies,
@@ -1506,16 +1602,6 @@ function combineSchemas({ name, schema, separator: separator$1, context, nullabl
 		examples: resolveExampleRefs(schema.examples, context)
 	};
 }
-const getCombineEnumValue = ({ values, isRef, originalSchema }) => {
-	if (values.length === 1) {
-		if (isRef[0]) return values[0];
-		return `{${getEnumImplementation(values[0])}} as const`;
-	}
-	return `{${values.map((e, i) => {
-		if (isRef[i]) return `...${e},`;
-		return getEnumImplementation(e, getEnumNames(originalSchema[i]), getEnumDescriptions(originalSchema[i]));
-	}).join("")}} as const`;
-};
 
 //#endregion
 //#region src/getters/keys.ts
@@ -1541,6 +1627,11 @@ function getIndexSignatureKey(item) {
 	if (enumValues && enumValues.length > 0) return enumValues.map((val) => `'${val}'`).join(" | ");
 	return "string";
 }
+function getPropertyNamesRecordType(item, valueType) {
+	const enumValues = getPropertyNamesEnum(item);
+	if (!enumValues || enumValues.length === 0) return;
+	return `Partial<Record<${enumValues.map((val) => `'${val}'`).join(" | ")}, ${valueType}>>`;
+}
 /**
 * Return the output type from an object
 *
@@ -1624,23 +1715,39 @@ function getObject({ item, name, context, nullable, propertyOverrides }) {
 				imports: aliasedImports
 			});
 			const propValue = needsValueImport ? alias : constLiteral ?? alias;
-			acc.value += `\n  ${doc ? `${doc}  ` : ""}${isReadOnly && !context.output.override.suppressReadonlyModifier ? "readonly " : ""}${getKey(key)}${isRequired ? "" : "?"}: ${propValue};`;
+			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);
 			if (arr.length - 1 === index) {
-				if (item.additionalProperties) {
-					const keyType$1 = getIndexSignatureKey(item);
-					if (isBoolean(item.additionalProperties)) acc.value += `\n  [key: ${keyType$1}]: unknown;\n }`;
-					else {
-						const resolvedValue$1 = resolveValue({
-							schema: item.additionalProperties,
-							name,
-							context
-						});
+				if (item.additionalProperties) if (isBoolean(item.additionalProperties)) {
+					const recordType$1 = getPropertyNamesRecordType(item, "unknown");
+					if (recordType$1) {
+						acc.value += "\n}";
+						acc.value += ` & ${recordType$1}`;
+						acc.useTypeAlias = true;
+					} else {
+						const keyType$1 = getIndexSignatureKey(item);
+						acc.value += `\n  [key: ${keyType$1}]: unknown;\n }`;
+					}
+				} else {
+					const resolvedValue$1 = resolveValue({
+						schema: item.additionalProperties,
+						name,
+						context
+					});
+					const recordType$1 = getPropertyNamesRecordType(item, resolvedValue$1.value);
+					if (recordType$1) {
+						acc.value += "\n}";
+						acc.value += ` & ${recordType$1}`;
+						acc.useTypeAlias = true;
+					} else {
+						const keyType$1 = getIndexSignatureKey(item);
 						acc.value += `\n  [key: ${keyType$1}]: ${resolvedValue$1.value};\n}`;
-						acc.dependencies.push(...resolvedValue$1.dependencies);
 					}
-				} else acc.value += "\n}";
+					acc.dependencies.push(...resolvedValue$1.dependencies);
+				}
+				else acc.value += "\n}";
 				acc.value += nullable;
 			}
 			return acc;
@@ -1653,36 +1760,64 @@ function getObject({ item, name, context, nullable, propertyOverrides }) {
 			isRef: false,
 			schema: {},
 			hasReadonlyProps: false,
+			useTypeAlias: false,
 			dependencies: [],
 			example: item.example,
 			examples: resolveExampleRefs(item.examples, context)
 		});
 	}
 	if (item.additionalProperties) {
-		const keyType$1 = getIndexSignatureKey(item);
-		if (isBoolean(item.additionalProperties)) return {
-			value: `{ [key: ${keyType$1}]: unknown }` + nullable,
-			imports: [],
-			schemas: [],
-			isEnum: false,
-			type: "object",
-			isRef: false,
-			hasReadonlyProps: item.readOnly || false,
-			dependencies: []
-		};
+		if (isBoolean(item.additionalProperties)) {
+			const recordType$2 = getPropertyNamesRecordType(item, "unknown");
+			if (recordType$2) return {
+				value: recordType$2 + nullable,
+				imports: [],
+				schemas: [],
+				isEnum: false,
+				type: "object",
+				isRef: false,
+				hasReadonlyProps: item.readOnly || false,
+				useTypeAlias: true,
+				dependencies: []
+			};
+			return {
+				value: `{ [key: ${getIndexSignatureKey(item)}]: unknown }` + nullable,
+				imports: [],
+				schemas: [],
+				isEnum: false,
+				type: "object",
+				isRef: false,
+				hasReadonlyProps: item.readOnly || false,
+				useTypeAlias: false,
+				dependencies: []
+			};
+		}
 		const resolvedValue = resolveValue({
 			schema: item.additionalProperties,
 			name,
 			context
 		});
+		const recordType$1 = getPropertyNamesRecordType(item, resolvedValue.value);
+		if (recordType$1) return {
+			value: recordType$1 + nullable,
+			imports: resolvedValue.imports ?? [],
+			schemas: resolvedValue.schemas ?? [],
+			isEnum: false,
+			type: "object",
+			isRef: false,
+			hasReadonlyProps: resolvedValue.hasReadonlyProps,
+			useTypeAlias: true,
+			dependencies: resolvedValue.dependencies
+		};
 		return {
-			value: `{[key: ${keyType$1}]: ${resolvedValue.value}}` + nullable,
+			value: `{[key: ${getIndexSignatureKey(item)}]: ${resolvedValue.value}}` + nullable,
 			imports: resolvedValue.imports ?? [],
 			schemas: resolvedValue.schemas ?? [],
 			isEnum: false,
 			type: "object",
 			isRef: false,
 			hasReadonlyProps: resolvedValue.hasReadonlyProps,
+			useTypeAlias: false,
 			dependencies: resolvedValue.dependencies
 		};
 	}
@@ -1698,6 +1833,18 @@ function getObject({ item, name, context, nullable, propertyOverrides }) {
 		dependencies: []
 	};
 	const keyType = item.type === "object" ? getIndexSignatureKey(item) : "string";
+	const recordType = getPropertyNamesRecordType(item, "unknown");
+	if (item.type === "object" && recordType) return {
+		value: recordType + nullable,
+		imports: [],
+		schemas: [],
+		isEnum: false,
+		type: "object",
+		isRef: false,
+		hasReadonlyProps: item.readOnly || false,
+		useTypeAlias: true,
+		dependencies: []
+	};
 	return {
 		value: (item.type === "object" ? `{ [key: ${keyType}]: unknown }` : "unknown") + nullable,
 		imports: [],
@@ -1706,6 +1853,7 @@ function getObject({ item, name, context, nullable, propertyOverrides }) {
 		type: "object",
 		isRef: false,
 		hasReadonlyProps: item.readOnly || false,
+		useTypeAlias: false,
 		dependencies: []
 	};
 }
@@ -1804,10 +1952,15 @@ function getResReqTypes(responsesOrRequests, name, context, defaultType = "unkno
 		if (res.content) return Object.entries(res.content).map(([contentType, mediaType], index, arr) => {
 			let propName = key ? pascal(name) + pascal(key) : void 0;
 			if (propName && arr.length > 1) propName = propName + pascal(getNumberWord(index + 1));
+			let effectivePropName = propName;
+			if (mediaType.schema && isReference(mediaType.schema)) {
+				const { imports } = resolveRef(mediaType.schema, context);
+				if (imports[0]?.name) effectivePropName = imports[0].name;
+			}
 			const isFormData = formDataContentTypes.has(contentType);
 			const resolvedValue = getResReqContentTypes({
 				mediaType,
-				propName,
+				propName: effectivePropName,
 				context,
 				isFormData,
 				contentType
@@ -1827,7 +1980,7 @@ function getResReqTypes(responsesOrRequests, name, context, defaultType = "unkno
 				return;
 			}
 			const isFormUrlEncoded = formUrlEncodedContentTypes.has(contentType);
-			if (!isFormData && !isFormUrlEncoded || !propName) return {
+			if (!isFormData && !isFormUrlEncoded || !effectivePropName) return {
 				...resolvedValue,
 				imports: resolvedValue.imports,
 				contentType,
@@ -1835,18 +1988,20 @@ function getResReqTypes(responsesOrRequests, name, context, defaultType = "unkno
 				examples: resolveExampleRefs(mediaType.examples, context)
 			};
 			const formData = isFormData ? getSchemaFormDataAndUrlEncoded({
-				name: propName,
+				name: effectivePropName,
 				schemaObject: mediaType.schema,
 				context,
 				isRequestBodyOptional: "required" in res && res.required === false,
+				isRef: true,
 				encoding: mediaType.encoding
 			}) : void 0;
 			const formUrlEncoded = isFormUrlEncoded ? getSchemaFormDataAndUrlEncoded({
-				name: propName,
+				name: effectivePropName,
 				schemaObject: mediaType.schema,
 				context,
 				isUrlEncoded: true,
 				isRequestBodyOptional: "required" in res && res.required === false,
+				isRef: true,
 				encoding: mediaType.encoding
 			}) : void 0;
 			const additionalImports = getFormDataAdditionalImports({
@@ -2222,7 +2377,7 @@ function resolveDiscriminators(schemas, context) {
 //#endregion
 //#region src/getters/operation.ts
 function getOperationId(operation, route, verb) {
-	if (operation.operationId) return operation.operationId;
+	if (isString(operation.operationId)) return operation.operationId;
 	return pascal([verb, ...route.split("/").map((p) => sanitize(p, {
 		dash: true,
 		underscore: "-",
@@ -2313,10 +2468,10 @@ function getParams({ route, pathParams = [], operationId, context, output }) {
 function getProps({ body, queryParams, params, operationName, headers, context }) {
 	const bodyProp = {
 		name: body.implementation,
-		definition: `${body.implementation}${body.isOptional ? "?" : ""}: ${body.definition}`,
-		implementation: `${body.implementation}${body.isOptional ? "?" : ""}: ${body.definition}`,
+		definition: `${body.implementation}${body.isOptional && !context.output.optionsParamRequired ? "?" : ""}: ${body.definition}`,
+		implementation: `${body.implementation}${body.isOptional && !context.output.optionsParamRequired ? "?" : ""}: ${body.definition}`,
 		default: false,
-		required: !body.isOptional,
+		required: !body.isOptional || context.output.optionsParamRequired,
 		type: GetterPropType.BODY
 	};
 	const queryParamsProp = {
@@ -2324,15 +2479,15 @@ function getProps({ body, queryParams, params, operationName, headers, context }
 		definition: getQueryParamDefinition(queryParams, context),
 		implementation: getQueryParamDefinition(queryParams, context),
 		default: false,
-		required: isUndefined(queryParams?.isOptional) ? !context.output.allParamsOptional : !queryParams?.isOptional && !context.output.allParamsOptional,
+		required: isUndefined(queryParams?.isOptional) ? !context.output.allParamsOptional || context.output.optionsParamRequired : !queryParams?.isOptional && !context.output.allParamsOptional || context.output.optionsParamRequired,
 		type: GetterPropType.QUERY_PARAM
 	};
 	const headersProp = {
 		name: "headers",
-		definition: `headers${headers?.isOptional ? "?" : ""}: ${headers?.schema.name}`,
-		implementation: `headers${headers?.isOptional ? "?" : ""}: ${headers?.schema.name}`,
+		definition: `headers${headers?.isOptional && !context.output.optionsParamRequired ? "?" : ""}: ${headers?.schema.name}`,
+		implementation: `headers${headers?.isOptional && !context.output.optionsParamRequired ? "?" : ""}: ${headers?.schema.name}`,
 		default: false,
-		required: isUndefined(headers?.isOptional) ? false : !headers?.isOptional,
+		required: isUndefined(headers?.isOptional) ? false : !headers?.isOptional || context.output.optionsParamRequired,
 		type: GetterPropType.HEADER
 	};
 	let paramGetterProps;
@@ -2340,7 +2495,7 @@ 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 = params.every((param) => param.default);
+		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 destructured = `{ ${params.map((property) => property.name).join(", ")} }`;
 		paramGetterProps = [{
@@ -2371,7 +2526,7 @@ function getProps({ body, queryParams, params, operationName, headers, context }
 function getQueryParamDefinition(queryParams, context) {
 	let paramType = queryParams?.schema.name;
 	if (OutputClient.ANGULAR === context.output.client) paramType = `DeepNonNullable<${paramType}>`;
-	return `params${queryParams?.isOptional || context.output.allParamsOptional ? "?" : ""}: ${paramType}`;
+	return `params${(queryParams?.isOptional || context.output.allParamsOptional) && !context.output.optionsParamRequired ? "?" : ""}: ${paramType}`;
 }
 
 //#endregion
@@ -2480,8 +2635,8 @@ function getResponse({ responses, operationName, context, contentType }) {
 		success: [],
 		errors: []
 	});
-	const success = groupedByStatus.success.map(({ value, formData }) => formData ? "Blob" : value).join(" | ");
-	const errors = groupedByStatus.errors.map(({ value }) => value).join(" | ");
+	const success = dedupeUnionType(groupedByStatus.success.map(({ value, formData }) => formData ? "Blob" : value).join(" | "));
+	const errors = dedupeUnionType(groupedByStatus.errors.map(({ value }) => value).join(" | "));
 	const defaultType = filteredTypes.find(({ key }) => key === "default")?.value;
 	return {
 		imports,
@@ -2875,18 +3030,20 @@ function generateBodyOptions(body, isFormData, isFormUrlEncoded) {
 	if (body.implementation) return `\n      ${body.implementation},`;
 	return "";
 }
-function generateAxiosOptions({ response, isExactOptionalPropertyTypes, queryParams, headers, requestOptions, hasSignal, isVue, isAngular, paramsSerializer, paramsSerializerOptions }) {
+function generateAxiosOptions({ response, isExactOptionalPropertyTypes, queryParams, headers, requestOptions, hasSignal, hasSignalParam = false, isVue, isAngular, paramsSerializer, paramsSerializerOptions }) {
 	const isRequestOptions = requestOptions !== false;
+	const signalVar = hasSignalParam ? "querySignal" : "signal";
+	const signalProp = hasSignalParam ? `signal: ${signalVar}` : "signal";
 	if (!queryParams && !headers && !response.isBlob && response.definition.success !== "string") {
 		if (isRequestOptions) return "options";
-		if (hasSignal) return isExactOptionalPropertyTypes ? "...(signal ? { signal } : {})" : "signal";
+		if (hasSignal) return isExactOptionalPropertyTypes ? `...(${signalVar} ? { ${signalProp} } : {})` : signalProp;
 		return "";
 	}
 	let value = "";
 	if (!isRequestOptions) {
 		if (queryParams) value += "\n        params,";
 		if (headers) value += "\n        headers,";
-		if (hasSignal) value += isExactOptionalPropertyTypes ? "\n        ...(signal ? { signal } : {})," : "\n        signal,";
+		if (hasSignal) value += isExactOptionalPropertyTypes ? `\n        ...(${signalVar} ? { ${signalProp} } : {}),` : `\n        ${signalProp},`;
 	}
 	if (!isObject(requestOptions) || !requestOptions.hasOwnProperty("responseType")) {
 		if (response.isBlob) value += `\n        responseType: 'blob',`;
@@ -2903,7 +3060,7 @@ function generateAxiosOptions({ response, isExactOptionalPropertyTypes, queryPar
 	if (!isAngular && queryParams && (paramsSerializer || paramsSerializerOptions?.qs)) value += paramsSerializer ? `\n        paramsSerializer: ${paramsSerializer.name},` : `\n        paramsSerializer: (params) => qs.stringify(params, ${JSON.stringify(paramsSerializerOptions.qs)}),`;
 	return value;
 }
-function generateOptions({ route, body, headers, queryParams, response, verb, requestOptions, isFormData, isFormUrlEncoded, isAngular, isExactOptionalPropertyTypes, hasSignal, isVue, paramsSerializer, paramsSerializerOptions }) {
+function generateOptions({ route, body, headers, queryParams, response, verb, requestOptions, isFormData, isFormUrlEncoded, isAngular, isExactOptionalPropertyTypes, hasSignal, hasSignalParam, isVue, paramsSerializer, paramsSerializerOptions }) {
 	const bodyOptions = getIsBodyVerb(verb) ? generateBodyOptions(body, isFormData, isFormUrlEncoded) : "";
 	const axiosOptions = generateAxiosOptions({
 		response,
@@ -2912,6 +3069,7 @@ function generateOptions({ route, body, headers, queryParams, response, verb, re
 		requestOptions,
 		isExactOptionalPropertyTypes,
 		hasSignal,
+		hasSignalParam,
 		isVue: isVue ?? false,
 		isAngular: isAngular ?? false,
 		paramsSerializer,
@@ -2937,11 +3095,13 @@ function generateQueryParamsAxiosConfig(response, isVue, queryParams) {
 	if (response.isBlob) value += `,\n        responseType: 'blob'`;
 	return value;
 }
-function generateMutatorConfig({ route, body, headers, queryParams, response, verb, isFormData, isFormUrlEncoded, hasSignal, isExactOptionalPropertyTypes, isVue }) {
+function generateMutatorConfig({ route, body, headers, queryParams, response, verb, isFormData, isFormUrlEncoded, hasSignal, hasSignalParam = false, isExactOptionalPropertyTypes, isVue }) {
 	const bodyOptions = getIsBodyVerb(verb) ? generateBodyMutatorConfig(body, isFormData, isFormUrlEncoded) : "";
 	const queryParamsOptions = generateQueryParamsAxiosConfig(response, isVue ?? false, queryParams);
 	const headerOptions = body.contentType ? `,\n      headers: {'Content-Type': '${body.contentType}', ${headers ? "...headers" : ""}}` : headers ? ",\n      headers" : "";
-	return `{url: \`${route}\`, method: '${verb.toUpperCase()}'${headerOptions}${bodyOptions}${queryParamsOptions}${hasSignal ? `, ${isExactOptionalPropertyTypes ? "...(signal ? { signal }: {})" : "signal"}` : ""}\n    }`;
+	const signalVar = hasSignalParam ? "querySignal" : "signal";
+	const signalProp = hasSignalParam ? `signal: ${signalVar}` : "signal";
+	return `{url: \`${route}\`, method: '${verb.toUpperCase()}'${headerOptions}${bodyOptions}${queryParamsOptions}${hasSignal ? `, ${isExactOptionalPropertyTypes ? `...(${signalVar} ? { ${signalProp} }: {})` : signalProp}` : ""}\n    }`;
 }
 function generateMutatorRequestOptions(requestOptions, hasSecondArgument) {
 	if (!hasSecondArgument) return isObject(requestOptions) ? `{${stringify(requestOptions)?.slice(1, -1)}}` : "";
@@ -3020,10 +3180,11 @@ function generateInterface({ name, schema, context }) {
 		context
 	});
 	const isEmptyObject = scalar.value === "{}";
+	const shouldUseTypeAlias = context?.output.override?.useTypeOverInterfaces || scalar.useTypeAlias;
 	let model = "";
 	model += jsDoc(schema);
 	if (isEmptyObject) model += "// eslint-disable-next-line @typescript-eslint/no-empty-interface\n";
-	if (scalar.type === "object" && !context?.output.override?.useTypeOverInterfaces) if (scalar.type === "object" && schema.properties && Object.values(schema.properties).length > 0 && Object.values(schema.properties).every((item) => "const" in item)) {
+	if (scalar.type === "object" && !shouldUseTypeAlias) if (scalar.type === "object" && schema.properties && Object.values(schema.properties).length > 0 && Object.values(schema.properties).every((item) => "const" in item)) {
 		const mappedScalarValue = scalar.value.replaceAll(";", ",").replaceAll("?:", ":");
 		model += `export const ${name}Value = ${mappedScalarValue} as const;\nexport type ${name} = typeof ${name}Value;\n`;
 	} else {
@@ -3175,7 +3336,7 @@ function generateSchemaDefinitions(schemaName, schema, context, suffix) {
 async function generateVerbOptions({ verb, output, operation, route, pathRoute, verbParameters = [], context }) {
 	const { responses, requestBody, parameters: operationParameters, tags = [], deprecated, description, summary } = operation;
 	const operationId = getOperationId(operation, route, verb);
-	const overrideOperation = output.override.operations[operation.operationId];
+	const overrideOperation = output.override.operations[operationId];
 	const overrideTag = Object.entries(output.override.tags).reduce((acc, [tag, options]) => tags.includes(tag) && options ? mergeDeep(acc, options) : acc, {});
 	const override = mergeDeep(mergeDeep(output.override, overrideTag), overrideOperation);
 	const overrideOperationName = overrideOperation?.operationName ?? output.override.operationName;
@@ -3364,7 +3525,7 @@ function fixSchemaImports(schemas, targetSchemaNames, fromPath, toPath, namingCo
 			const fileName = conventionName(imp.name, namingConvention);
 			return {
 				...imp,
-				importPath: join(relativePath, fileName)
+				importPath: joinSafe(relativePath, fileName)
 			};
 		}
 		return imp;
@@ -3495,7 +3656,13 @@ 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 fileContent = `${header}\n${[...conventionNamesSet].map((schemaName) => `export * from './${schemaName}${ext}';`).toSorted((a, b) => a.localeCompare(b)).join("\n")}`;
+			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 = statement.match(/export\s+\*\s+from\s+['"]([^'"]+)['"]/);
+				if (!match) return void 0;
+				return `export * from '${match[1]}';`;
+			}).filter((statement) => Boolean(statement)) ?? [];
+			const fileContent = `${header}\n${[...new Set([...existingExports, ...currentExports])].toSorted((a, b) => a.localeCompare(b)).join("\n")}`;
 			await fs$1.writeFile(schemaFilePath, fileContent, { encoding: "utf8" });
 		} catch (error) {
 			throw new Error(`Oups... 🍻. An Error occurred while writing schema index file ${schemaFilePath} => ${error}`);
@@ -3510,12 +3677,13 @@ function generateImportsForBuilder(output, imports, relativeSchemasPath) {
 	if (!output.indexFiles) return uniqueBy(imports, (x) => x.name).map((i) => {
 		const name = conventionName(i.schemaName || i.name, output.namingConvention);
 		const suffix = isZodSchemaOutput ? ".zod" : "";
+		const importExtension = output.fileExtension?.replace(/\.ts$/, "") || "";
 		return {
 			exports: isZodSchemaOutput ? [{
 				...i,
 				values: true
 			}] : [i],
-			dependency: joinSafe(relativeSchemasPath, `${name}${suffix}`)
+			dependency: joinSafe(relativeSchemasPath, `${name}${suffix}${importExtension}`)
 		};
 	});
 	else if (isZodSchemaOutput) return [{
@@ -4080,5 +4248,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, dynamicImport, escape, 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, getArray, getBody, getDefaultContentType, getEnum, getEnumDescriptions, getEnumImplementation, getEnumNames, getExtension, getFileInfo, getFormDataFieldFileType, getFullRoute, getIsBodyVerb, getKey, getMockFileExtensionByTypeName, getNumberWord, getObject, getOperationId, getOrvalGeneratedTypes, getParameters, getParams, getParamsInPath, getPropertySafe, getProps, getQueryParams, getRefInfo, getResReqTypes, getResponse, getResponseTypeCategory, getRoute, getRouteAsArray, getScalar, getTypedResponse, isBinaryContentType, isBoolean, isDirectory, isFunction, isModule, isNull, isNumber, isNumeric, isObject, isReference, isSchema, isString, isSyntheticDefaultImportsAllow, isUndefined, isUrl, isVerb, jsDoc, jsStringEscape, kebab, keyValuePairsToJsDoc, log, logError, mergeDeep, mismatchArgsMessage, pascal, removeFilesAndEmptyFolders, resolveDiscriminators, resolveExampleRefs, resolveObject, resolveRef, resolveValue, sanitize, 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, 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, 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, getTypedResponse, isBinaryContentType, isBoolean, isDirectory, isFunction, isModule, isNull, isNumber, isNumeric, isObject, isReference, isSchema, isString, isSyntheticDefaultImportsAllow, isUndefined, isUrl, isVerb, jsDoc, jsStringEscape, kebab, keyValuePairsToJsDoc, log, logError, mergeDeep, mismatchArgsMessage, pascal, removeFilesAndEmptyFolders, resolveDiscriminators, resolveExampleRefs, resolveObject, resolveRef, resolveValue, sanitize, snake, sortByPriority, splitSchemasByType, startMessage, stringify, toObjectString, path_exports as upath, upper, writeModelInline, writeModelsInline, writeSchema, writeSchemas, writeSingleMode, writeSplitMode, writeSplitTagsMode, writeTagsMode };
 //# sourceMappingURL=index.mjs.map