@orval/core 8.7.0 → 8.8.1

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { t as __exportAll } from "./chunk-C7Uep-_p.mjs";
+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";
@@ -15,7 +15,6 @@ import { isDereferenced } from "@scalar/openapi-types/helpers";
 import fs$1 from "fs-extra";
 import { Parser } from "acorn";
 import { build } from "esbuild";
-
 //#region src/types.ts
 const SupportedFormatter = {
 	PRETTIER: "prettier",
@@ -103,7 +102,6 @@ var ErrorWithTag = class extends Error {
 		this.tag = tag;
 	}
 };
-
 //#endregion
 //#region src/constants.ts
 const generalJSTypes = [
@@ -128,7 +126,6 @@ const VERBS_WITH_BODY = [
 ];
 const URL_REGEX = /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w.-]+)+[\w\-._~:/?#[\]@!$&'()*+,;=.]+$/;
 const TEMPLATE_TAG_REGEX = /\${(.+?)}/g;
-
 //#endregion
 //#region src/utils/assertion.ts
 /**
@@ -176,7 +173,6 @@ function isUrl(str) {
 		return false;
 	}
 }
-
 //#endregion
 //#region src/utils/async-reduce.ts
 async function asyncReduce(array, reducer, initValue) {
@@ -184,7 +180,6 @@ async function asyncReduce(array, reducer, initValue) {
 	for (const item of array) accumulate = await reducer(accumulate, item);
 	return accumulate;
 }
-
 //#endregion
 //#region src/utils/case.ts
 const unicodes = function(s, prefix = "") {
@@ -275,7 +270,6 @@ function conventionName(name, convention) {
 	}
 	return nameConventionTransform(name);
 }
-
 //#endregion
 //#region src/utils/compare-version.ts
 function compareVersions(firstVersion, secondVersions, operator = ">=") {
@@ -283,7 +277,6 @@ function compareVersions(firstVersion, secondVersions, operator = ">=") {
 	if (firstVersion.startsWith("catalog:")) return true;
 	return compare(firstVersion.replace(/(\s(.*))/, ""), secondVersions, operator);
 }
-
 //#endregion
 //#region src/utils/content-type.ts
 const binaryApplicationTypes = new Set(["application/octet-stream", "application/pdf"]);
@@ -346,7 +339,6 @@ function filterByContentType(items, filter) {
 		return shouldInclude && !shouldExclude;
 	});
 }
-
 //#endregion
 //#region src/utils/debug.ts
 const filter = process.env.ORVAL_DEBUG_FILTER;
@@ -361,7 +353,6 @@ function createDebugger(ns, options = {}) {
 		log(msg, ...args);
 	};
 }
-
 //#endregion
 //#region src/utils/doc.ts
 const search = String.raw`\*/`;
@@ -442,7 +433,6 @@ function keyValuePairsToJsDoc(keyValues) {
 	doc += " */\n";
 	return doc;
 }
-
 //#endregion
 //#region src/utils/dynamic-import.ts
 const TS_MODULE_EXTENSIONS = new Set([
@@ -473,13 +463,11 @@ async function dynamicImport(toImport, from = process.cwd(), takeDefault = true)
 		throw new Error(`Oups... 🍻. Path: ${String(toImport)} => ${String(error)}`, { cause: error });
 	}
 }
-
 //#endregion
 //#region src/utils/extension.ts
 function getExtension(path) {
 	return path.toLowerCase().includes(".yaml") || path.toLowerCase().includes(".yml") ? "yaml" : "json";
 }
-
 //#endregion
 //#region src/utils/file.ts
 function getFileInfo(target = "", { backupFilename = "filename", extension = ".ts" } = {}) {
@@ -512,7 +500,6 @@ async function removeFilesAndEmptyFolders(patterns, dir) {
 		if ((await fs.promises.readdir(directory)).length === 0) await fs.promises.rmdir(directory);
 	} catch {}
 }
-
 //#endregion
 //#region src/utils/file-extensions.ts
 function getMockFileExtensionByTypeName(mock) {
@@ -521,7 +508,6 @@ function getMockFileExtensionByTypeName(mock) {
 		default: return "msw";
 	}
 }
-
 //#endregion
 //#region src/utils/get-property-safe.ts
 /**
@@ -543,13 +529,11 @@ function getPropertySafe(obj, propertyName) {
 		value: void 0
 	};
 }
-
 //#endregion
 //#region src/utils/is-body-verb.ts
 function getIsBodyVerb(verb) {
 	return VERBS_WITH_BODY.includes(verb);
 }
-
 //#endregion
 //#region src/utils/logger.ts
 const log = console.log;
@@ -666,7 +650,6 @@ function createLogger(level = "info", options = {}) {
 	};
 	return logger;
 }
-
 //#endregion
 //#region src/utils/merge-deep.ts
 function mergeDeep(source, target) {
@@ -680,14 +663,12 @@ function mergeDeep(source, target) {
 	}
 	return acc;
 }
-
 //#endregion
 //#region src/utils/occurrence.ts
 function count(str = "", key) {
 	if (!str) return 0;
 	return (str.match(new RegExp(key, "g")) ?? []).length;
 }
-
 //#endregion
 //#region src/utils/path.ts
 var path_exports = /* @__PURE__ */ __exportAll({
@@ -697,7 +678,7 @@ var path_exports = /* @__PURE__ */ __exportAll({
 	joinSafe: () => joinSafe,
 	normalizeSafe: () => normalizeSafe,
 	relativeSafe: () => relativeSafe,
-	separator: () => separator,
+	separator: () => "/",
 	toUnix: () => toUnix
 });
 function toUnix(value) {
@@ -712,12 +693,11 @@ function join(...args) {
 * Behaves exactly like `path.relative(from, to)`, but keeps the first meaningful "./"
 */
 function relativeSafe(from, to) {
-	return normalizeSafe(`.${separator}${toUnix(nodePath.relative(toUnix(from), toUnix(to)))}`);
+	return normalizeSafe(`./${toUnix(nodePath.relative(toUnix(from), toUnix(to)))}`);
 }
 function getSchemaFileName(path) {
 	return path.replace(`.${getExtension(path)}`, "").slice(path.lastIndexOf("/") + 1);
 }
-const separator = "/";
 function normalizeSafe(value) {
 	let result;
 	value = toUnix(value);
@@ -770,7 +750,6 @@ function getRelativeImportPath(importerFilePath, exporterFilePath, includeFileEx
 	}
 	return posixPath;
 }
-
 //#endregion
 //#region src/utils/resolve-version.ts
 function resolveInstalledVersion(packageName, fromDir) {
@@ -811,7 +790,6 @@ function resolveInstalledVersions(packageJson, fromDir) {
 	}
 	return resolved;
 }
-
 //#endregion
 //#region src/utils/sort.ts
 const sortByPriority = (arr) => arr.toSorted((a, b) => {
@@ -822,7 +800,6 @@ const sortByPriority = (arr) => arr.toSorted((a, b) => {
 	if (b.required) return 1;
 	return 0;
 });
-
 //#endregion
 //#region src/utils/string.ts
 /**
@@ -1014,14 +991,12 @@ function dedupeUnionType(unionType) {
 	if (current.trim()) parts.push(current.trim());
 	return [...new Set(parts)].join(" | ");
 }
-
 //#endregion
 //#region src/utils/tsconfig.ts
 function isSyntheticDefaultImportsAllow(config) {
 	if (!config) return true;
 	return !!(config.compilerOptions?.allowSyntheticDefaultImports ?? config.compilerOptions?.esModuleInterop);
 }
-
 //#endregion
 //#region src/getters/enum.ts
 /**
@@ -1221,7 +1196,6 @@ function getCombinedEnumValue(inputs) {
 		hasNull
 	};
 }
-
 //#endregion
 //#region src/getters/ref.ts
 const RefComponentSuffix = {
@@ -1267,7 +1241,6 @@ function getRefInfo($ref, context) {
 		refPaths
 	};
 }
-
 //#endregion
 //#region src/resolvers/ref.ts
 const REF_NOT_FOUND_PREFIX = "Oops... 🍻. Ref not found";
@@ -1369,7 +1342,6 @@ function resolveExampleRefs(examples, context) {
 		return result;
 	})();
 }
-
 //#endregion
 //#region src/resolvers/value.ts
 function resolveValue({ schema, name, context, formDataContext }) {
@@ -1415,7 +1387,6 @@ function resolveValue({ schema, name, context, formDataContext }) {
 		isRef: false
 	};
 }
-
 //#endregion
 //#region src/resolvers/object.ts
 /**
@@ -1509,7 +1480,6 @@ function resolveObject({ schema, propName, combined = false, context, formDataCo
 	resolveObjectCacheMap.set(hashKey, result);
 	return result;
 }
-
 //#endregion
 //#region src/getters/array.ts
 /**
@@ -1584,7 +1554,6 @@ function getArray({ schema, name, context, formDataContext }) {
 	};
 	else throw new Error(`All arrays must have an \`items\` key defined (name=${name}, schema=${JSON.stringify(schema)})`);
 }
-
 //#endregion
 //#region src/getters/res-req-types.ts
 const getSchemaType = (s) => s.type;
@@ -1709,6 +1678,17 @@ function getResReqTypes(responsesOrRequests, name, context, defaultType = "unkno
 			if (mediaType.schema && isReference(mediaType.schema)) {
 				const { imports } = resolveSchemaRef(mediaType.schema, context);
 				if (imports[0]?.name) effectivePropName = imports[0].name;
+			} else if (mediaType.schema) {
+				const combinedRefs = getSchemaOneOf(mediaType.schema) ?? getSchemaAnyOf(mediaType.schema);
+				if (combinedRefs) {
+					const names = [];
+					for (const ref of combinedRefs) {
+						if (!isReference(ref)) continue;
+						const refName = resolveSchemaRef(ref, context).imports[0]?.name;
+						if (refName) names.push(refName);
+					}
+					if (names.length > 0) effectivePropName = names.join("");
+				}
 			}
 			const isFormData = formDataContentTypes.has(contentType);
 			const resolvedValue = getResReqContentTypes({
@@ -1846,26 +1826,45 @@ function getFormDataAdditionalImports({ schemaObject, context }) {
 function getSchemaFormDataAndUrlEncoded({ name, schemaObject, context, isRequestBodyOptional, isUrlEncoded, isRef, encoding }) {
 	const { schema, imports } = resolveSchemaRef(schemaObject, context);
 	const propName = camel(!isRef && isReference(schemaObject) ? imports[0].name : name);
-	const additionalImports = [];
 	const variableName = isUrlEncoded ? "formUrlEncoded" : "formData";
 	let form = isUrlEncoded ? `const ${variableName} = new URLSearchParams();\n` : `const ${variableName} = new FormData();\n`;
 	const combinedSchemas = getSchemaCombined(schema);
 	if (schema.type === "object" || schema.type === void 0 && combinedSchemas) {
-		if (combinedSchemas) {
-			const shouldCast = !!getSchemaOneOf(schema) || !!getSchemaAnyOf(schema);
+		if (combinedSchemas) if (!!getSchemaOneOf(schema) || !!getSchemaAnyOf(schema)) {
+			const directProperties = getSchemaProperties(schema);
+			const directKeys = directProperties ? Object.entries(directProperties).filter(([, value]) => !resolveSchemaRef(value, context).schema.readOnly).map(([key]) => key) : [];
+			const skipLine = directKeys.length > 0 ? `  if ([${directKeys.map((k) => JSON.stringify(k)).join(", ")}].includes(key)) return;\n` : "";
+			form += `Object.entries(${propName} ?? {}).forEach(([key, value]) => {\n`;
+			form += skipLine;
+			form += `  if (value !== undefined && value !== null) {\n`;
+			form += `    if ((typeof File !== 'undefined' && value instanceof File) || value instanceof Blob) {\n`;
+			form += `      ${variableName}.append(key, value);\n`;
+			form += `    } else if (typeof Buffer !== 'undefined' && Buffer.isBuffer(value)) {\n`;
+			form += `      ${variableName}.append(key, new Blob([Uint8Array.from(value)]));\n`;
+			form += `    } else if (Array.isArray(value)) {\n`;
+			form += `      value.forEach(v => {\n`;
+			form += `        if ((typeof File !== 'undefined' && v instanceof File) || v instanceof Blob) {\n`;
+			form += `          ${variableName}.append(key, v);\n`;
+			form += `        } else if (typeof Buffer !== 'undefined' && Buffer.isBuffer(v)) {\n`;
+			form += `          ${variableName}.append(key, new Blob([Uint8Array.from(v)]));\n`;
+			form += `        } else {\n`;
+			form += `          ${variableName}.append(key, typeof v === 'object' ? JSON.stringify(v) : String(v));\n`;
+			form += `        }\n`;
+			form += `      });\n`;
+			form += `    } else if (typeof value === 'object') {\n`;
+			form += `      ${variableName}.append(key, JSON.stringify(value));\n`;
+			form += `    } else {\n`;
+			form += `      ${variableName}.append(key, String(value));\n`;
+			form += `    }\n`;
+			form += `  }\n`;
+			form += `});\n`;
+		} else {
 			const combinedSchemasFormData = combinedSchemas.map((subSchema) => {
-				const { schema: combinedSchema, imports } = resolveSchemaRef(subSchema, context);
-				let newPropName = propName;
-				let newPropDefinition = "";
-				if (shouldCast && imports[0]) {
-					additionalImports.push(imports[0]);
-					newPropName = `${propName}${pascal(imports[0].name)}`;
-					newPropDefinition = `const ${newPropName} = (${propName} as ${imports[0].name}${isRequestBodyOptional ? " | undefined" : ""});\n`;
-				}
-				return newPropDefinition + resolveSchemaPropertiesToFormData({
+				const { schema: combinedSchema } = resolveSchemaRef(subSchema, context);
+				return resolveSchemaPropertiesToFormData({
 					schema: combinedSchema,
 					variableName,
-					propName: newPropName,
+					propName,
 					context,
 					isRequestBodyOptional,
 					encoding
@@ -1995,7 +1994,6 @@ function resolveSchemaPropertiesToFormData({ schema, variableName, propName, con
 	}
 	return formDataValues;
 }
-
 //#endregion
 //#region src/getters/body.ts
 function buildBody(filteredBodyTypes, requestBody, operationName, context) {
@@ -2070,7 +2068,6 @@ function getContentTypeSuffix(contentType) {
 	if (CONTENT_TYPE_SUFFIX_MAP[contentType]) return CONTENT_TYPE_SUFFIX_MAP[contentType];
 	return (contentType.split("/")[1] ?? contentType).split(/[-+.]/).map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join("");
 }
-
 //#endregion
 //#region src/getters/imports.ts
 function getAliasedImports({ name, resolvedValue, context }) {
@@ -2092,28 +2089,27 @@ function getImportAliasForRefOrValue({ context, imports, resolvedValue }) {
 	if (!context.output.schemas || !resolvedValue.isRef) return resolvedValue.value;
 	return imports.find((imp) => imp.name === resolvedValue.value)?.alias ?? resolvedValue.value;
 }
-
 //#endregion
 //#region src/getters/keys.ts
 function getKey(key) {
 	return keyword.isIdentifierNameES5(key) ? key : `'${key}'`;
 }
-
 //#endregion
 //#region src/getters/object.ts
 /**
 * Extract enum values from propertyNames schema (OpenAPI 3.1)
-* Returns undefined if propertyNames doesn't have an enum
+* Handles both `enum` and `const` (treated as a single-element enum)
+* Returns undefined if propertyNames has neither
 */
 function getPropertyNamesEnum(item) {
-	if ("propertyNames" in item && item.propertyNames && "enum" in item.propertyNames) {
-		const propertyNames = item.propertyNames;
-		if (Array.isArray(propertyNames.enum)) return propertyNames.enum.filter((val) => isString(val));
-	}
+	if (!("propertyNames" in item) || !item.propertyNames) return;
+	const propertyNames = item.propertyNames;
+	if (Array.isArray(propertyNames.enum)) return propertyNames.enum.filter((val) => isString(val));
+	if (isString(propertyNames.const)) return [propertyNames.const];
 }
 /**
-* Generate index signature key type based on propertyNames enum
-* Returns union type string like "'foo' | 'bar'" or 'string' if no enum
+* 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);
@@ -2383,7 +2379,6 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 		dependencies: []
 	};
 }
-
 //#endregion
 //#region src/getters/scalar.ts
 /**
@@ -2542,7 +2537,6 @@ function getScalar({ item, name, context, formDataContext }) {
 		}
 	}
 }
-
 //#endregion
 //#region src/getters/combine.ts
 const mergeableAllOfKeys = new Set([
@@ -2748,7 +2742,6 @@ function combineSchemas({ name, schema, separator, context, nullable, formDataCo
 		examples: resolveExampleRefs(schema.examples, context)
 	};
 }
-
 //#endregion
 //#region src/getters/discriminators.ts
 function resolveDiscriminators(schemas, context) {
@@ -2800,7 +2793,6 @@ function resolveDiscriminators(schemas, context) {
 	}
 	return transformedSchemas;
 }
-
 //#endregion
 //#region src/getters/operation.ts
 function getOperationId(operation, route, verb) {
@@ -2812,7 +2804,6 @@ function getOperationId(operation, route, verb) {
 		whitespace: "-"
 	}))].join("-"));
 }
-
 //#endregion
 //#region src/getters/parameters.ts
 function getParameters({ parameters, context }) {
@@ -2835,7 +2826,6 @@ function getParameters({ parameters, context }) {
 	});
 	return result;
 }
-
 //#endregion
 //#region src/getters/params.ts
 /**
@@ -2892,7 +2882,6 @@ function getParams({ route, pathParams = [], operationId, context, output }) {
 		};
 	});
 }
-
 //#endregion
 //#region src/getters/props.ts
 function getProps({ body, queryParams, params, operationName, headers, context }) {
@@ -2957,7 +2946,6 @@ function getQueryParamDefinition(queryParams, context) {
 	const paramType = queryParams?.schema.name;
 	return `params${(queryParams?.isOptional || context.output.allParamsOptional) && !context.output.optionsParamRequired ? "?" : ""}: ${paramType}`;
 }
-
 //#endregion
 //#region src/getters/query-params.ts
 const isOpenApiSchemaObject = (value) => {
@@ -3052,7 +3040,6 @@ function getQueryParams({ queryParams, operationName, context, suffix = "params"
 		requiredNullableKeys
 	};
 }
-
 //#endregion
 //#region src/getters/response.ts
 function getResponse({ responses, operationName, context, contentType }) {
@@ -3082,7 +3069,6 @@ function getResponse({ responses, operationName, context, contentType }) {
 		originalSchema: responses
 	};
 }
-
 //#endregion
 //#region src/getters/route.ts
 function isBaseUrlRuntime(baseUrl) {
@@ -3156,11 +3142,18 @@ function getFullRoute(route, servers, baseUrl) {
 }
 /**
 * Returns `GeneratorImport` entries for {@link BaseUrlRuntime.imports} when `baseUrl` is a runtime config.
+*
+* Defaults `values` to true so symbols in `runtime` emit as value imports in the
+* generated client. Set `values: false` explicitly only for unusual cases (e.g.
+* type-only symbols referenced from the expression).
 */
 function getBaseUrlRuntimeImports(baseUrl) {
 	if (!baseUrl) return [];
 	if (!isBaseUrlRuntime(baseUrl)) return [];
-	return baseUrl.imports ?? [];
+	return (baseUrl.imports ?? []).map((imp) => ({
+		...imp,
+		values: imp.values ?? true
+	}));
 }
 function getRouteAsArray(route) {
 	return route.split("/").filter((i) => i !== "").flatMap((segment) => {
@@ -3171,7 +3164,6 @@ function getRouteAsArray(route) {
 		});
 	}).join(",");
 }
-
 //#endregion
 //#region src/generators/component-definition.ts
 function generateComponentDefinition(responses = {}, context, suffix) {
@@ -3199,7 +3191,6 @@ function generateComponentDefinition(responses = {}, context, suffix) {
 	}
 	return generatorSchemas;
 }
-
 //#endregion
 //#region src/generators/imports.ts
 function generateImports({ imports, namingConvention = NamingConvention.CAMEL_CASE }) {
@@ -3334,7 +3325,6 @@ function generateVerbImports({ response, body, queryParams, props, headers, para
 		}];
 	});
 }
-
 //#endregion
 //#region src/generators/models-inline.ts
 function generateModelInline(acc, model) {
@@ -3346,7 +3336,6 @@ function generateModelsInline(obj) {
 	for (const { model } of schemas) result = generateModelInline(result, model);
 	return result;
 }
-
 //#endregion
 //#region src/generators/mutator-info.ts
 async function getMutatorInfo(filePath, options) {
@@ -3443,7 +3432,6 @@ function getEcmaVersion(target) {
 		return;
 	}
 }
-
 //#endregion
 //#region src/generators/mutator.ts
 const BODY_TYPE_NAME = "BodyType";
@@ -3461,7 +3449,7 @@ async function generateMutator({ output, mutator, name, workspace, tsconfig }) {
 	let rawFile = await fs$1.readFile(importPath, "utf8");
 	rawFile = removeComments(rawFile);
 	const hasErrorType = rawFile.includes("export type ErrorType") || rawFile.includes("export interface ErrorType");
-	const hasBodyType = rawFile.includes(`export type ${BODY_TYPE_NAME}`) || rawFile.includes(`export interface ${BODY_TYPE_NAME}`);
+	const hasBodyType = rawFile.includes(`export type BodyType`) || rawFile.includes(`export interface BodyType`);
 	const errorTypeName = mutator.default ? `${pascal(name)}ErrorType` : "ErrorType";
 	const bodyTypeName = mutator.default ? `${pascal(name)}${BODY_TYPE_NAME}` : BODY_TYPE_NAME;
 	const mutatorInfo = await getMutatorInfo(importPath, {
@@ -3489,7 +3477,6 @@ async function generateMutator({ output, mutator, name, workspace, tsconfig }) {
 function removeComments(file) {
 	return file.replaceAll(/\/\/.*|\/\*[\s\S]*?\*\//g, "");
 }
-
 //#endregion
 //#region src/generators/options.ts
 /**
@@ -3712,7 +3699,6 @@ function generateFormDataAndUrlEncodedFunction({ body, formData, formUrlEncoded,
 	}
 	return "";
 }
-
 //#endregion
 //#region src/generators/parameter-definition.ts
 function generateParameterDefinition(parameters = {}, context, suffix) {
@@ -3756,7 +3742,6 @@ function generateParameterDefinition(parameters = {}, context, suffix) {
 	}
 	return generatorSchemas;
 }
-
 //#endregion
 //#region src/generators/interface.ts
 /**
@@ -3796,7 +3781,6 @@ function generateInterface({ name, schema, context }) {
 		schema
 	}];
 }
-
 //#endregion
 //#region src/generators/schema-definition.ts
 /**
@@ -3925,7 +3909,6 @@ function generateSchemaDefinitions(schemaName, schema, context, suffix) {
 		schema
 	}];
 }
-
 //#endregion
 //#region src/generators/verbs-options.ts
 async function buildVerbOption({ verb, output, operation, route, pathRoute, verbParameters = [], context, body, operationName, operationId, override, tags, deprecated, description, summary }) {
@@ -4128,7 +4111,6 @@ function _filteredVerbs(verbs, filters) {
 		return filterMode === "exclude" ? !isMatch : isMatch;
 	});
 }
-
 //#endregion
 //#region src/writers/file.ts
 const TRAILING_WHITESPACE_RE = /[^\S\r\n]+$/gm;
@@ -4142,7 +4124,6 @@ const TRAILING_WHITESPACE_RE = /[^\S\r\n]+$/gm;
 async function writeGeneratedFile(filePath, content) {
 	await fs$1.outputFile(filePath, content.replaceAll(TRAILING_WHITESPACE_RE, ""));
 }
-
 //#endregion
 //#region src/writers/schemas.ts
 /**
@@ -4246,7 +4227,7 @@ function normalizeCanonicalImportPaths(schemas, canonicalPathMap, canonicalNameM
 		const canonicalByPath = canonicalPathMap.get(resolvedImportKey);
 		const canonical = canonicalByName ?? canonicalByPath;
 		if (!canonical?.importPath) return imp;
-		const importPath = removeFileExtension(relativeSafe(schemaPath, canonical.importPath.replaceAll("\\", "/")), fileExtension);
+		const importPath = removeTSExtension(relativeSafe(schemaPath, canonical.importPath.replaceAll("\\", "/")));
 		return {
 			...imp,
 			importPath
@@ -4269,8 +4250,8 @@ function mergeSchemaGroup(schemas) {
 function resolveImportKey(schemaPath, importPath, fileExtension) {
 	return join(schemaPath, `${importPath}${fileExtension}`).toLowerCase().replaceAll("\\", "/");
 }
-function removeFileExtension(path, fileExtension) {
-	return path.endsWith(fileExtension) ? path.slice(0, path.length - fileExtension.length) : path;
+function removeTSExtension(path) {
+	return path.endsWith(".ts") ? path.slice(0, -3) : path;
 }
 function getSchema({ schema: { imports, model }, header, namingConvention = NamingConvention.CAMEL_CASE }) {
 	let file = header;
@@ -4343,7 +4324,6 @@ async function writeSchemas({ schemaPath, schemas, target, namingConvention, fil
 		}
 	}
 }
-
 //#endregion
 //#region src/writers/generate-imports-for-builder.ts
 function generateImportsForBuilder(output, imports, relativeSchemasPath) {
@@ -4359,10 +4339,7 @@ function generateImportsForBuilder(output, imports, relativeSchemasPath) {
 	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}`);
+			const dependency = joinSafe(relativeSchemasPath, `${conventionName(isZodSchemaOutput ? schemaImport.name : schemaImport.schemaName ?? schemaImport.name, output.namingConvention)}${isZodSchemaOutput ? ".zod" : ""}${output.fileExtension.replace(/\.ts$/, "") || ""}`);
 			if (!importsByDependency.has(dependency)) importsByDependency.set(dependency, []);
 			importsByDependency.get(dependency)?.push(schemaImport);
 		}
@@ -4379,7 +4356,6 @@ function generateImportsForBuilder(output, imports, relativeSchemasPath) {
 	});
 	return [...schemaImports, ...otherImports];
 }
-
 //#endregion
 //#region src/writers/target.ts
 function generateTarget(builder, options) {
@@ -4456,7 +4432,6 @@ function generateTarget(builder, options) {
 		implementationMock: target.implementationMock.function + target.implementationMock.handler
 	};
 }
-
 //#endregion
 //#region src/writers/types.ts
 function getOrvalGeneratedTypes() {
@@ -4495,7 +4470,6 @@ interface TypedResponse<T> extends Response {
 }
 `;
 }
-
 //#endregion
 //#region src/writers/single-mode.ts
 async function writeSingleMode({ builder, output, projectName, header, needSchema, generateSchemasInline }) {
@@ -4518,7 +4492,7 @@ async function writeSingleMode({ builder, output, projectName, header, needSchem
 			if (!matchingImport) continue;
 			if (!!mockImport.values || !!mockImport.isConstant || !!mockImport.default || !!mockImport.namespaceImport || !!mockImport.syntheticDefaultImport) matchingImport.values = true;
 		}
-		const importsForBuilder = schemasPath ? generateImportsForBuilder(output, normalizedImports, schemasPath) : [];
+		const importsForBuilder = schemasPath ? generateImportsForBuilder(output, normalizedImports, schemasPath) : generateImportsForBuilder(output, normalizedImports.filter((imp) => !!imp.importPath), ".");
 		data += builder.imports({
 			client: output.client,
 			implementation,
@@ -4533,7 +4507,8 @@ async function writeSingleMode({ builder, output, projectName, header, needSchem
 			output
 		});
 		if (output.mock) {
-			const importsMockForBuilder = schemasPath ? generateImportsForBuilder(output, importsMock.filter((impMock) => !normalizedImports.some((imp) => imp.name === impMock.name && (imp.alias ?? "") === (impMock.alias ?? ""))), schemasPath) : [];
+			const filteredMockImports = importsMock.filter((impMock) => !normalizedImports.some((imp) => imp.name === impMock.name && (imp.alias ?? "") === (impMock.alias ?? "")));
+			const importsMockForBuilder = schemasPath ? generateImportsForBuilder(output, filteredMockImports, schemasPath) : generateImportsForBuilder(output, filteredMockImports.filter((imp) => !!imp.importPath), ".");
 			data += builder.importsMock({
 				implementation: implementationMock,
 				imports: importsMockForBuilder,
@@ -4573,7 +4548,6 @@ async function writeSingleMode({ builder, output, projectName, header, needSchem
 		throw new Error(`Oups... 🍻. An Error occurred while writing file => ${errorMsg}`, { cause: error });
 	}
 }
-
 //#endregion
 //#region src/writers/split-mode.ts
 async function writeSplitMode({ builder, output, projectName, header, needSchema, generateSchemasInline }) {
@@ -4645,7 +4619,6 @@ async function writeSplitMode({ builder, output, projectName, header, needSchema
 		throw new Error(`Oups... 🍻. An Error occurred while splitting => ${String(error)}`, { cause: error });
 	}
 }
-
 //#endregion
 //#region src/writers/target-tags.ts
 function addDefaultTagIfEmpty(operation) {
@@ -4760,7 +4733,6 @@ function generateTargetForTags(builder, options) {
 	};
 	return result;
 }
-
 //#endregion
 //#region src/writers/split-tags-mode.ts
 async function writeSplitTagsMode({ builder, output, projectName, header, needSchema, generateSchemasInline }) {
@@ -4881,7 +4853,6 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 	}
 	return [...new Set([...indexFilePath ? [indexFilePath] : [], ...generatedFilePathsArray.flat()])];
 }
-
 //#endregion
 //#region src/writers/tags-mode.ts
 async function writeTagsMode({ builder, output, projectName, header, needSchema, generateSchemasInline }) {
@@ -4964,7 +4935,7 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema,
 		}
 	}))).flat();
 }
-
 //#endregion
 export { BODY_TYPE_NAME, EnumGeneration, ErrorWithTag, FormDataArrayHandling, GetterPropType, LogLevels, NamingConvention, OutputClient, OutputHttpClient, OutputMockType, OutputMode, PropertySortOrder, RefComponentSuffix, SchemaType, SupportedFormatter, TEMPLATE_TAG_REGEX, URL_REGEX, VERBS_WITH_BODY, Verbs, _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, getBaseUrlRuntimeImports, getBodiesByContentType, getBody, getCombinedEnumValue, getDefaultContentType, getEnum, getEnumDescriptions, getEnumImplementation, getEnumNames, getEnumUnionFromSchema, getExtension, getFileInfo, getFormDataFieldFileType, getFullRoute, getIsBodyVerb, getKey, getMockFileExtensionByTypeName, getNumberWord, getObject, getOperationId, getOrvalGeneratedTypes, getParameters, getParams, getParamsInPath, getPropertySafe, getProps, getQueryParams, getRefInfo, getResReqTypes, getResponse, getResponseTypeCategory, getRoute, getRouteAsArray, getScalar, getSuccessResponseType, getTypedResponse, getWarningCount, isBinaryContentType, isBoolean, isDirectory, isFunction, isModule, isNullish, isNumber, isNumeric, isObject, isReference, isSchema, isString, isStringLike, isSyntheticDefaultImportsAllow, isUrl, isVerb, isVerbose, jsDoc, jsStringEscape, kebab, keyValuePairsToJsDoc, log, logError, logVerbose, logWarning, mergeDeep, mismatchArgsMessage, pascal, removeFilesAndEmptyFolders, resetWarnings, resolveDiscriminators, resolveExampleRefs, resolveInstalledVersion, resolveInstalledVersions, resolveObject, resolveRef, resolveValue, sanitize, setVerbose, snake, sortByPriority, splitSchemasByType, startMessage, stringify, toObjectString, path_exports as upath, upper, writeModelInline, writeModelsInline, writeSchema, writeSchemas, writeSingleMode, writeSplitMode, writeSplitTagsMode, writeTagsMode };
+
 //# sourceMappingURL=index.mjs.map