@orval/core 8.9.0 → 8.10.0

package/dist/index.d.mts

@@ -836,7 +836,7 @@ interface Tsconfig {
     target?: TsConfigTarget;
   };
 }
-type TsConfigTarget = 'es3' | 'es5' | 'es6' | 'es2015' | 'es2016' | 'es2017' | 'es2018' | 'es2019' | 'es2020' | 'es2021' | 'es2022' | 'esnext';
+type TsConfigTarget = 'es3' | 'es5' | 'es6' | 'es2015' | 'es2016' | 'es2017' | 'es2018' | 'es2019' | 'es2020' | 'es2021' | 'es2022' | 'es2023' | 'es2024' | 'es2025' | 'esnext';
 interface PackageJson {
   dependencies?: Record<string, string>;
   devDependencies?: Record<string, string>;
@@ -959,6 +959,8 @@ interface GeneratorClient {
   implementation: string;
   imports: GeneratorImport[];
   mutators?: GeneratorMutator[];
+  /** When set, overrides the default verbOption.doc prepended to the implementation */
+  docComment?: string;
 }
 interface GeneratorMutatorParsingInfo {
   numberOfParams: number;
@@ -1367,7 +1369,7 @@ interface GenerateFormDataAndUrlEncodedFunctionOptions {
   isFormData: boolean;
   isFormUrlEncoded: boolean;
 }
-declare function generateBodyOptions(body: GetterBody, isFormData: boolean, isFormUrlEncoded: boolean): string;
+declare function generateBodyOptions(body: GetterBody, isFormData: boolean, isFormUrlEncoded: boolean): string | undefined;
 interface GenerateAxiosOptions {
   response: GetterResponse;
   isExactOptionalPropertyTypes: boolean;
@@ -1643,10 +1645,10 @@ declare function combineSchemas({
 declare function resolveDiscriminators(schemas: OpenApiSchemasObject, context: ContextSpec): OpenApiSchemasObject;
 //#endregion
 //#region src/getters/enum.d.ts
-declare function getEnumNames(schemaObject: OpenApiSchemaObject | undefined): string[] | undefined;
-declare function getEnumDescriptions(schemaObject: OpenApiSchemaObject | undefined): string[] | undefined;
-declare function getEnum(value: string, enumName: string, names: string[] | undefined, enumGenerationType: EnumGeneration, descriptions?: string[], enumNamingConvention?: NamingConvention): string;
-declare function getEnumImplementation(value: string, names?: string[], descriptions?: string[], enumNamingConvention?: NamingConvention): string;
+declare function getEnumNames(schemaObject: OpenApiSchemaObject | undefined): (string | undefined)[] | undefined;
+declare function getEnumDescriptions(schemaObject: OpenApiSchemaObject | undefined): (string | undefined)[] | undefined;
+declare function getEnum(value: string, enumName: string, names: (string | undefined)[] | undefined, enumGenerationType: EnumGeneration, descriptions?: (string | undefined)[], enumNamingConvention?: NamingConvention): string;
+declare function getEnumImplementation(value: string, names?: (string | undefined)[], descriptions?: (string | undefined)[], enumNamingConvention?: NamingConvention): string;
 interface CombinedEnumInput {
   value: string;
   isRef: boolean;

package/dist/index.mjs

@@ -2,7 +2,7 @@ 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 { keyword } from "esutils";
-import nodePath from "node:path";
+import path from "node:path";
 import { compare } from "compare-versions";
 import debug from "debug";
 import { pathToFileURL } from "node:url";
@@ -137,7 +137,7 @@ function isReference(obj) {
 	return !isNullish$1(obj) && Object.hasOwn(obj, "$ref");
 }
 function isDirectory(pathValue) {
-	return !nodePath.extname(pathValue);
+	return !path.extname(pathValue);
 }
 function isObject(x) {
 	return Object.prototype.toString.call(x) === "[object Object]";
@@ -450,8 +450,8 @@ async function dynamicImport(toImport, from = process.cwd(), takeDefault = true)
 	if (!toImport) return toImport;
 	try {
 		if (isString(toImport)) {
-			const filePath = nodePath.resolve(from, toImport);
-			const extension = nodePath.extname(filePath);
+			const filePath = path.resolve(from, toImport);
+			const extension = path.extname(filePath);
 			if (TS_MODULE_EXTENSIONS.has(extension)) {
 				const data = await createJiti(from, { interopDefault: true }).import(filePath);
 				if (takeDefault && (isObject(data) || isModule(data)) && data.default) return data.default;
@@ -476,14 +476,14 @@ function getExtension(path) {
 //#region src/utils/file.ts
 function getFileInfo(target = "", { backupFilename = "filename", extension = ".ts" } = {}) {
 	const isDir = isDirectory(target);
-	const filePath = isDir ? nodePath.join(target, backupFilename + extension) : target;
+	const filePath = isDir ? path.join(target, backupFilename + extension) : target;
 	return {
 		path: filePath,
 		pathWithoutExtension: filePath.replace(/\.[^/.]+$/, ""),
 		extension,
 		isDirectory: isDir,
-		dirname: nodePath.dirname(filePath),
-		filename: nodePath.basename(filePath, extension.startsWith(".") ? extension : `.${extension}`)
+		dirname: path.dirname(filePath),
+		filename: path.basename(filePath, extension.startsWith(".") ? extension : `.${extension}`)
 	};
 }
 async function removeFilesAndEmptyFolders(patterns, dir) {
@@ -691,13 +691,13 @@ function toUnix(value) {
 	return value;
 }
 function join(...args) {
-	return toUnix(nodePath.join(...args.map((a) => toUnix(a))));
+	return toUnix(path.join(...args.map((a) => toUnix(a))));
 }
 /**
 * Behaves exactly like `path.relative(from, to)`, but keeps the first meaningful "./"
 */
 function relativeSafe(from, to) {
-	return normalizeSafe(`./${toUnix(nodePath.relative(toUnix(from), toUnix(to)))}`);
+	return normalizeSafe(`./${toUnix(path.relative(toUnix(from), toUnix(to)))}`);
 }
 function getSchemaFileName(path) {
 	return path.replace(`.${getExtension(path)}`, "").slice(path.lastIndexOf("/") + 1);
@@ -705,13 +705,13 @@ function getSchemaFileName(path) {
 function normalizeSafe(value) {
 	let result;
 	value = toUnix(value);
-	result = toUnix(nodePath.normalize(value));
+	result = toUnix(path.normalize(value));
 	if (value.startsWith("./") && !result.startsWith("./") && !result.startsWith("..")) result = "./" + result;
 	else if (value.startsWith("//") && !result.startsWith("//")) result = value.startsWith("//./") ? "//." + result : "/" + result;
 	return result;
 }
 function joinSafe(...values) {
-	let result = toUnix(nodePath.join(...values.map((v) => toUnix(v))));
+	let result = toUnix(path.join(...values.map((v) => toUnix(v))));
 	if (values.length > 0) {
 		const firstValue = toUnix(values[0]);
 		if (firstValue.startsWith("./") && !result.startsWith("./") && !result.startsWith("..")) result = "./" + result;
@@ -742,14 +742,14 @@ function joinSafe(...values) {
 * @returns The relative import path string.
 */
 function getRelativeImportPath(importerFilePath, exporterFilePath, includeFileExtension = false) {
-	if (!nodePath.isAbsolute(importerFilePath)) throw new Error(`'importerFilePath' is not an absolute path. "${importerFilePath}"`);
-	if (!nodePath.isAbsolute(exporterFilePath)) throw new Error(`'exporterFilePath' is not an absolute path. "${exporterFilePath}"`);
-	const importerDir = nodePath.dirname(importerFilePath);
-	const relativePath = nodePath.relative(importerDir, exporterFilePath);
-	let posixPath = nodePath.posix.join(...relativePath.split(nodePath.sep));
+	if (!path.isAbsolute(importerFilePath)) throw new Error(`'importerFilePath' is not an absolute path. "${importerFilePath}"`);
+	if (!path.isAbsolute(exporterFilePath)) throw new Error(`'exporterFilePath' is not an absolute path. "${exporterFilePath}"`);
+	const importerDir = path.dirname(importerFilePath);
+	const relativePath = path.relative(importerDir, exporterFilePath);
+	let posixPath = path.posix.join(...relativePath.split(path.sep));
 	if (!posixPath.startsWith("./") && !posixPath.startsWith("../")) posixPath = `./${posixPath}`;
 	if (!includeFileExtension) {
-		const ext = nodePath.extname(posixPath);
+		const ext = path.extname(posixPath);
 		if (ext && posixPath.endsWith(ext)) posixPath = posixPath.slice(0, -ext.length);
 	}
 	return posixPath;
@@ -758,20 +758,20 @@ function getRelativeImportPath(importerFilePath, exporterFilePath, includeFileEx
 //#region src/utils/resolve-version.ts
 function resolveInstalledVersion(packageName, fromDir) {
 	try {
-		const require = createRequire(nodePath.join(fromDir, "noop.js"));
+		const require = createRequire(path.join(fromDir, "noop.js"));
 		try {
 			return require(`${packageName}/package.json`).version;
 		} catch (directError) {
 			if (directError instanceof Error && "code" in directError && directError.code === "ERR_PACKAGE_PATH_NOT_EXPORTED") {
 				const entryPath = require.resolve(packageName);
-				let dir = nodePath.dirname(entryPath);
-				while (dir !== nodePath.parse(dir).root) {
-					const pkgPath = nodePath.join(dir, "package.json");
+				let dir = path.dirname(entryPath);
+				while (dir !== path.parse(dir).root) {
+					const pkgPath = path.join(dir, "package.json");
 					if (existsSync(pkgPath)) {
 						const pkgData = JSON.parse(readFileSync(pkgPath, "utf8"));
 						if (pkgData.name === packageName) return pkgData.version;
 					}
-					dir = nodePath.dirname(dir);
+					dir = path.dirname(dir);
 				}
 				return;
 			}
@@ -1038,12 +1038,20 @@ function replaceSpecialCharacters(key) {
 function getEnumNames(schemaObject) {
 	const names = schemaObject?.["x-enumNames"] ?? schemaObject?.["x-enumnames"] ?? schemaObject?.["x-enum-varnames"];
 	if (!names) return;
-	return names.map((name) => jsStringEscape(name));
+	if (Array.isArray(names)) return names.map((name) => jsStringEscape(name));
+	if (typeof names === "object") return (schemaObject?.enum ?? []).map((enumVal) => {
+		const key = String(enumVal);
+		return key in names ? jsStringEscape(names[key]) : void 0;
+	});
 }
 function getEnumDescriptions(schemaObject) {
 	const descriptions = schemaObject?.["x-enumDescriptions"] ?? schemaObject?.["x-enumdescriptions"] ?? schemaObject?.["x-enum-descriptions"];
 	if (!descriptions) return;
-	return descriptions.map((description) => jsStringEscape(description));
+	if (Array.isArray(descriptions)) return descriptions.map((description) => jsStringEscape(description));
+	if (typeof descriptions === "object") return (schemaObject?.enum ?? []).map((enumVal) => {
+		const key = String(enumVal);
+		return key in descriptions ? jsStringEscape(descriptions[key]) : void 0;
+	});
 }
 function getEnum(value, enumName, names, enumGenerationType, descriptions, enumNamingConvention) {
 	if (enumGenerationType === EnumGeneration.CONST) return getTypeConstEnum(value, enumName, names, descriptions, enumNamingConvention);
@@ -1535,7 +1543,7 @@ function getArray({ schema, name, context, formDataContext }) {
 			formDataContext
 		});
 		return {
-			value: `${schema.readOnly === true && !context.output.override.suppressReadonlyModifier ? "readonly " : ""}${resolvedObject.value.includes("|") ? `(${resolvedObject.value})[]` : `${resolvedObject.value}[]`}`,
+			value: `${schema.readOnly === true && !context.output.override.suppressReadonlyModifier ? "readonly " : ""}${resolvedObject.value.includes("|") || resolvedObject.value.includes("&") ? `(${resolvedObject.value})[]` : `${resolvedObject.value}[]`}`,
 			imports: resolvedObject.imports,
 			schemas: resolvedObject.schemas,
 			dependencies: resolvedObject.dependencies,
@@ -2100,30 +2108,59 @@ function getKey(key) {
 }
 //#endregion
 //#region src/getters/object.ts
+function getPropertyNamesEnumKeyType(item) {
+	if (!("propertyNames" in item) || !item.propertyNames) return;
+	const propertyNames = item.propertyNames;
+	if (Array.isArray(propertyNames.enum)) {
+		const enumValues = propertyNames.enum.filter((val) => isString(val));
+		if (enumValues.length > 0) return {
+			value: enumValues.map((val) => `'${escape(val)}'`).join(" | "),
+			imports: [],
+			dependencies: []
+		};
+	}
+	if (isString(propertyNames.const)) return {
+		value: `'${escape(propertyNames.const)}'`,
+		imports: [],
+		dependencies: []
+	};
+}
 /**
-* Extract enum values from propertyNames schema (OpenAPI 3.1)
-* Handles both `enum` and `const` (treated as a single-element enum)
-* Returns undefined if propertyNames has neither
+* Resolve a narrowed key type from OpenAPI 3.1 propertyNames.
+* Supports inline enum/const and $ref string enums.
 */
-function getPropertyNamesEnum(item) {
-	if (!("propertyNames" in item) || !item.propertyNames) return;
+function getPropertyNamesKeyType(item, context) {
+	const inlineKeyType = getPropertyNamesEnumKeyType(item);
+	if (inlineKeyType) return inlineKeyType;
 	const propertyNames = item.propertyNames;
-	if (Array.isArray(propertyNames.enum)) return propertyNames.enum.filter((val) => isString(val));
-	if (isString(propertyNames.const)) return [propertyNames.const];
+	if (!propertyNames || !isReference(propertyNames)) return;
+	const resolvedValue = resolveValue({
+		schema: propertyNames,
+		context
+	});
+	const resolvedConst = resolvedValue.originalSchema.const;
+	const isStringConst = resolvedValue.type === "string" && isString(resolvedConst);
+	if (!resolvedValue.isEnum && !isStringConst) return;
+	return {
+		value: resolvedValue.value,
+		imports: resolvedValue.imports,
+		dependencies: resolvedValue.dependencies
+	};
 }
 /**
 * Generate index signature key type based on propertyNames enum or const
 * Returns union type string like "'foo' | 'bar'", "'x'", or 'string' if neither
 */
 function getIndexSignatureKey(item) {
-	const enumValues = getPropertyNamesEnum(item);
-	if (enumValues && enumValues.length > 0) return enumValues.map((val) => `'${val}'`).join(" | ");
-	return "string";
+	return getPropertyNamesEnumKeyType(item)?.value ?? "string";
 }
-function getPropertyNamesRecordType(item, valueType) {
-	const enumValues = getPropertyNamesEnum(item);
-	if (!enumValues || enumValues.length === 0) return;
-	return `Partial<Record<${enumValues.map((val) => `'${val}'`).join(" | ")}, ${valueType}>>`;
+function getPropertyNamesRecordType(item, valueType, context) {
+	const keyType = getPropertyNamesKeyType(item, context);
+	if (!keyType) return;
+	return {
+		...keyType,
+		value: `Partial<Record<${keyType.value}, ${valueType}>>`
+	};
 }
 /**
 * Return the output type from an object
@@ -2177,7 +2214,7 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 	if (itemProperties && Object.entries(itemProperties).length > 0) {
 		const entries = Object.entries(itemProperties);
 		if (context.output.propertySortOrder === PropertySortOrder.ALPHABETICAL) entries.sort((a, b) => {
-			return a[0].localeCompare(b[0]);
+			return a[0].localeCompare(b[0], "en", { numeric: true });
 		});
 		const acc = {
 			imports: [],
@@ -2249,11 +2286,13 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 			if (entries.length - 1 === index) {
 				const additionalProps = schemaItem.additionalProperties;
 				if (additionalProps) if (additionalProps === true) {
-					const recordType = getPropertyNamesRecordType(schemaItem, "unknown");
+					const recordType = getPropertyNamesRecordType(schemaItem, "unknown", context);
 					if (recordType) {
 						acc.value += "\n}";
-						acc.value += ` & ${recordType}`;
+						acc.value += ` & ${recordType.value}`;
 						acc.useTypeAlias = true;
+						acc.imports.push(...recordType.imports);
+						acc.dependencies.push(...recordType.dependencies);
 					} else {
 						const keyType = getIndexSignatureKey(schemaItem);
 						acc.value += `\n  [key: ${keyType}]: unknown;\n }`;
@@ -2264,15 +2303,19 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 						name,
 						context
 					});
-					const recordType = getPropertyNamesRecordType(schemaItem, resolvedValue.value);
+					const recordType = getPropertyNamesRecordType(schemaItem, resolvedValue.value, context);
 					if (recordType) {
 						acc.value += "\n}";
-						acc.value += ` & ${recordType}`;
+						acc.value += ` & ${recordType.value}`;
 						acc.useTypeAlias = true;
+						acc.imports.push(...recordType.imports);
+						acc.dependencies.push(...recordType.dependencies);
 					} else {
 						const keyType = getIndexSignatureKey(schemaItem);
 						acc.value += `\n  [key: ${keyType}]: ${resolvedValue.value};\n}`;
 					}
+					acc.imports.push(...resolvedValue.imports);
+					acc.schemas.push(...resolvedValue.schemas);
 					acc.dependencies.push(...resolvedValue.dependencies);
 				}
 				else acc.value += "\n}";
@@ -2285,17 +2328,17 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 	const readOnlyFlag = schemaItem.readOnly;
 	if (outerAdditionalProps) {
 		if (outerAdditionalProps === true) {
-			const recordType = getPropertyNamesRecordType(schemaItem, "unknown");
+			const recordType = getPropertyNamesRecordType(schemaItem, "unknown", context);
 			if (recordType) return {
-				value: recordType + nullable,
-				imports: [],
+				value: recordType.value + nullable,
+				imports: recordType.imports,
 				schemas: [],
 				isEnum: false,
 				type: "object",
 				isRef: false,
 				hasReadonlyProps: readOnlyFlag ?? false,
 				useTypeAlias: true,
-				dependencies: []
+				dependencies: recordType.dependencies
 			};
 			return {
 				value: `{ [key: ${getIndexSignatureKey(schemaItem)}]: unknown }` + nullable,
@@ -2314,17 +2357,17 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 			name,
 			context
 		});
-		const recordType = getPropertyNamesRecordType(schemaItem, resolvedValue.value);
+		const recordType = getPropertyNamesRecordType(schemaItem, resolvedValue.value, context);
 		if (recordType) return {
-			value: recordType + nullable,
-			imports: resolvedValue.imports,
+			value: recordType.value + nullable,
+			imports: [...recordType.imports, ...resolvedValue.imports],
 			schemas: resolvedValue.schemas,
 			isEnum: false,
 			type: "object",
 			isRef: false,
 			hasReadonlyProps: resolvedValue.hasReadonlyProps,
 			useTypeAlias: true,
-			dependencies: resolvedValue.dependencies
+			dependencies: [...recordType.dependencies, ...resolvedValue.dependencies]
 		};
 		return {
 			value: `{[key: ${getIndexSignatureKey(schemaItem)}]: ${resolvedValue.value}}` + nullable,
@@ -2359,17 +2402,17 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 		};
 	}
 	const keyType = itemType === "object" ? getIndexSignatureKey(schemaItem) : "string";
-	const recordType = getPropertyNamesRecordType(schemaItem, "unknown");
+	const recordType = getPropertyNamesRecordType(schemaItem, "unknown", context);
 	if (itemType === "object" && recordType) return {
-		value: recordType + nullable,
-		imports: [],
+		value: recordType.value + nullable,
+		imports: recordType.imports,
 		schemas: [],
 		isEnum: false,
 		type: "object",
 		isRef: false,
 		hasReadonlyProps: readOnlyFlag ?? false,
 		useTypeAlias: true,
-		dependencies: []
+		dependencies: recordType.dependencies
 	};
 	return {
 		value: (itemType === "object" ? `{ [key: ${keyType}]: unknown }` : "unknown") + nullable,
@@ -3066,7 +3109,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)),
+		isBlob: groupedByStatus.success.some((t) => !!t.contentType && isBinaryContentType(t.contentType) || t.value === "Blob" && !t.isRef),
 		types: groupedByStatus,
 		contentTypes,
 		schemas,
@@ -3203,7 +3246,7 @@ function generateImports({ imports, namingConvention = NamingConvention.CAMEL_CA
 		...imp,
 		importPath: imp.importPath ?? `./${conventionName(imp.name, namingConvention)}`
 	})), (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)).map(([, group]) => {
+	return Object.entries(grouped).toSorted(([a], [b]) => a.localeCompare(b, "en", { numeric: true })).map(([, group]) => {
 		const sample = group[0];
 		if (!sample.default && !sample.namespaceImport && !sample.syntheticDefaultImport && !sample.values && !sample.isConstant) return `import type { ${[...new Set(group.map(({ name, alias }) => `${name}${alias ? ` as ${alias}` : ""}`))].toSorted().join(", ")} } from '${sample.importPath}';`;
 		const { name, values, alias, isConstant, importPath } = sample;
@@ -3274,18 +3317,18 @@ function addDependency({ implementation, exports, dependency, projectName, isAll
 		});
 		if (types.length > 0) {
 			let uniqueTypes = types;
-			if (values.length > 0) {
-				uniqueTypes = types.filter((t) => !values.some((v) => v.name === t.name && (v.alias ?? "") === (t.alias ?? "")));
-				dep += "\n";
+			if (values.length > 0) uniqueTypes = types.filter((t) => !values.some((v) => v.name === t.name && (v.alias ?? "") === (t.alias ?? "")));
+			if (uniqueTypes.length > 0) {
+				if (values.length > 0) dep += "\n";
+				dep += generateDependency({
+					deps: uniqueTypes,
+					isAllowSyntheticDefaultImports,
+					dependency,
+					projectName,
+					key,
+					onlyTypes: true
+				});
 			}
-			dep += generateDependency({
-				deps: uniqueTypes,
-				isAllowSyntheticDefaultImports,
-				dependency,
-				projectName,
-				key,
-				onlyTypes: true
-			});
 		}
 		return dep;
 	}).join("\n") + "\n";
@@ -3650,10 +3693,9 @@ function filterParams(
 */
 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,";
-	if (body.implementation) return `\n      ${body.implementation},`;
-	return "";
+	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 }) {
 	const isRequestOptions = requestOptions !== false;
@@ -3700,7 +3742,7 @@ 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 }) {
-	const bodyOptions = getIsBodyVerb(verb) ? generateBodyOptions(body, isFormData, isFormUrlEncoded) : "";
+	const bodyIdentifier = getIsBodyVerb(verb) ? generateBodyOptions(body, isFormData, isFormUrlEncoded) : void 0;
 	const axiosOptions = generateAxiosOptions({
 		response,
 		angularObserve,
@@ -3721,11 +3763,11 @@ function generateOptions({ route, body, angularObserve, angularParamsRef, header
 	const isRawOptionsArgument = trimmedAxiosOptions === "options" || trimmedAxiosOptions.startsWith("(") && trimmedAxiosOptions.endsWith(")") || trimmedAxiosOptions.startsWith("{") && trimmedAxiosOptions.endsWith("}");
 	const optionsArgument = axiosOptions ? isRawOptionsArgument ? axiosOptions : `{${axiosOptions}}` : "";
 	if (verb === Verbs.DELETE) {
-		if (!bodyOptions) return `\n      \`${route}\`${optionsArgument ? `,${optionsArgument}` : ""}\n    `;
+		if (!bodyIdentifier) return `\n      \`${route}\`${optionsArgument ? `,${optionsArgument}` : ""}\n    `;
 		const deleteBodyOptions = isRawOptionsArgument ? `...${optionsArgument}` : axiosOptions;
-		return `\n      \`${route}\`,{${isAngular ? "body" : "data"}:${bodyOptions} ${axiosOptions ? deleteBodyOptions : ""}}\n    `;
+		return `\n      \`${route}\`,{${`${isAngular ? "body" : "data"}: ${bodyIdentifier}`}${axiosOptions ? `,${deleteBodyOptions}` : ""}}\n    `;
 	}
-	const bodyOrOptions = getIsBodyVerb(verb) ? bodyOptions || "undefined," : "";
+	const bodyOrOptions = getIsBodyVerb(verb) ? `\n      ${bodyIdentifier ?? "undefined"},` : "";
 	return `\n      \`${route}\`${bodyOrOptions || optionsArgument ? "," : ""}${bodyOrOptions}${optionsArgument}\n    `;
 }
 function generateBodyMutatorConfig(body, isFormData, isFormUrlEncoded) {
@@ -4323,8 +4365,8 @@ function getSchema({ schema: { imports, model }, header, namingConvention = Nami
 	file += model;
 	return file;
 }
-function getPath(path, name, fileExtension) {
-	return nodePath.join(path, `${name}${fileExtension}`);
+function getPath(path$1, name, fileExtension) {
+	return path.join(path$1, `${name}${fileExtension}`);
 }
 function writeModelInline(acc, model) {
 	return acc + `${model}\n`;
@@ -4373,12 +4415,12 @@ async function writeSchemas({ schemaPath, schemas, target, namingConvention, fil
 		});
 	}
 	if (indexFiles) {
-		const schemaFilePath = nodePath.join(schemaPath, `index.ts`);
+		const schemaFilePath = path.join(schemaPath, `index.ts`);
 		await fs$1.ensureFile(schemaFilePath);
 		const ext = fileExtension.endsWith(".ts") ? fileExtension.slice(0, -3) : fileExtension;
 		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)).join("\n")}\n`);
+			await writeGeneratedFile(schemaFilePath, `${header}\n${[...conventionNamesSet].map((schemaName) => `export * from './${schemaName}${ext}';`).toSorted((a, b) => a.localeCompare(b, "en", { numeric: true })).join("\n")}\n`);
 		} catch (error) {
 			throw new Error(`Oups... 🍻. An Error occurred while writing schema index file ${schemaFilePath} => ${String(error)}`, { cause: error });
 		}
@@ -4644,8 +4686,8 @@ async function writeSplitMode({ builder, output, projectName, header, needSchema
 			isAllowSyntheticDefaultImports,
 			options: isFunction(output.mock) ? void 0 : output.mock
 		});
-		const schemasPath = output.schemas ? void 0 : nodePath.join(dirname, filename + ".schemas" + extension);
-		if (schemasPath && needSchema) await writeGeneratedFile(schemasPath, generateSchemasInline ? header + generateSchemasInline() : header + generateModelsInline(builder.schemas));
+		const schemasPath = !output.schemas && needSchema ? path.join(dirname, filename + ".schemas" + extension) : void 0;
+		if (schemasPath) await writeGeneratedFile(schemasPath, generateSchemasInline ? header + generateSchemasInline() : header + generateModelsInline(builder.schemas));
 		if (mutators) implementationData += generateMutatorImports({
 			mutators,
 			implementation
@@ -4666,9 +4708,9 @@ async function writeSplitMode({ builder, output, projectName, header, needSchema
 		implementationData += `\n${implementation}`;
 		mockData += `\n${implementationMock}`;
 		const implementationFilename = filename + (OutputClient.ANGULAR === output.client ? ".service" : "") + extension;
-		const implementationPath = nodePath.join(dirname, implementationFilename);
+		const implementationPath = path.join(dirname, implementationFilename);
 		await writeGeneratedFile(implementationPath, implementationData);
-		const mockPath = output.mock ? nodePath.join(dirname, filename + "." + getMockFileExtensionByTypeName(output.mock) + extension) : void 0;
+		const mockPath = output.mock ? path.join(dirname, filename + "." + getMockFileExtensionByTypeName(output.mock) + extension) : void 0;
 		if (mockPath) await writeGeneratedFile(mockPath, mockData);
 		return [
 			implementationPath,
@@ -4803,7 +4845,7 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 	const target = generateTargetForTags(builder, output);
 	const isAllowSyntheticDefaultImports = isSyntheticDefaultImportsAllow(output.tsconfig);
 	const mockOption = output.mock && !isFunction(output.mock) ? output.mock : void 0;
-	const indexFilePath = mockOption?.indexMockFiles ? nodePath.join(dirname, "index." + getMockFileExtensionByTypeName(mockOption) + extension) : void 0;
+	const indexFilePath = mockOption?.indexMockFiles ? path.join(dirname, "index." + getMockFileExtensionByTypeName(mockOption) + extension) : void 0;
 	if (indexFilePath) await fs$1.outputFile(indexFilePath, "");
 	const tagEntries = Object.entries(target);
 	const generatedFilePathsArray = await Promise.all(tagEntries.map(async ([tag, target]) => {
@@ -4811,19 +4853,19 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 			const { imports, implementation, implementationMock, importsMock, mutators, clientMutators, formData, fetchReviver, formUrlEncoded, paramsSerializer } = target;
 			let implementationData = header;
 			let mockData = header;
-			const importerPath = nodePath.join(dirname, tag, tag + extension);
+			const importerPath = path.join(dirname, tag, tag + extension);
 			const relativeSchemasPath = output.schemas ? getRelativeImportPath(importerPath, getFileInfo(isString(output.schemas) ? output.schemas : output.schemas.path, { extension: output.fileExtension }).dirname) : "../" + filename + ".schemas" + extension.replace(/\.ts$/, "");
 			const tagNames = new Set(tagEntries.map(([t]) => t));
 			const serviceSuffix = OutputClient.ANGULAR === output.client ? ".service" : "";
 			const importsForBuilder = generateImportsForBuilder(output, imports.map((imp) => {
 				if (!imp.importPath) return imp;
 				if (!imp.importPath.startsWith(".")) return imp;
-				const resolvedPath = nodePath.resolve(dirname, imp.importPath);
-				const targetBasename = nodePath.basename(resolvedPath);
+				const resolvedPath = path.resolve(dirname, imp.importPath);
+				const targetBasename = path.basename(resolvedPath);
 				let targetFile;
 				if (tagNames.has(targetBasename)) {
 					const tagFilename = targetBasename + serviceSuffix + extension;
-					targetFile = nodePath.join(resolvedPath, tagFilename);
+					targetFile = path.join(resolvedPath, tagFilename);
 				} else targetFile = resolvedPath + extension;
 				const adjustedPath = getRelativeImportPath(importerPath, targetFile);
 				return {
@@ -4853,8 +4895,8 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 				isAllowSyntheticDefaultImports,
 				options: isFunction(output.mock) ? void 0 : output.mock
 			});
-			const schemasPath = output.schemas ? void 0 : nodePath.join(dirname, filename + ".schemas" + extension);
-			if (schemasPath && needSchema) await writeGeneratedFile(schemasPath, generateSchemasInline ? header + generateSchemasInline() : header + generateModelsInline(builder.schemas));
+			const schemasPath = !output.schemas && needSchema ? path.join(dirname, filename + ".schemas" + extension) : void 0;
+			if (schemasPath) await writeGeneratedFile(schemasPath, generateSchemasInline ? header + generateSchemasInline() : header + generateModelsInline(builder.schemas));
 			if (mutators) implementationData += generateMutatorImports({
 				mutators,
 				implementation,
@@ -4891,9 +4933,9 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 			implementationData += `\n${implementation}`;
 			mockData += `\n${implementationMock}`;
 			const implementationFilename = tag + (OutputClient.ANGULAR === output.client ? ".service" : "") + extension;
-			const implementationPath = nodePath.join(dirname, tag, implementationFilename);
+			const implementationPath = path.join(dirname, tag, implementationFilename);
 			await writeGeneratedFile(implementationPath, implementationData);
-			const mockPath = output.mock ? nodePath.join(dirname, tag, tag + "." + getMockFileExtensionByTypeName(output.mock) + extension) : void 0;
+			const mockPath = output.mock ? path.join(dirname, tag, tag + "." + getMockFileExtensionByTypeName(output.mock) + extension) : void 0;
 			if (mockPath) await writeGeneratedFile(mockPath, mockData);
 			return [
 				implementationPath,
@@ -4962,8 +5004,8 @@ async function writeTagsMode({ 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) await writeGeneratedFile(schemasPath, generateSchemasInline ? header + generateSchemasInline() : header + generateModelsInline(builder.schemas));
+			const schemasPath = !output.schemas && needSchema ? path.join(dirname, filename + ".schemas" + extension) : void 0;
+			if (schemasPath) await writeGeneratedFile(schemasPath, generateSchemasInline ? header + generateSchemasInline() : header + generateModelsInline(builder.schemas));
 			if (mutators) data += generateMutatorImports({
 				mutators,
 				implementation
@@ -4987,7 +5029,7 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema,
 				data += "\n\n";
 				data += implementationMock;
 			}
-			const implementationPath = nodePath.join(dirname, `${kebab(tag)}${extension}`);
+			const implementationPath = path.join(dirname, `${kebab(tag)}${extension}`);
 			await writeGeneratedFile(implementationPath, data);
 			return [implementationPath, ...schemasPath ? [schemasPath] : []];
 		} catch (error) {