@orval/core 8.6.1 → 8.7.0

package/dist/index.mjs

@@ -17,6 +17,11 @@ import { Parser } from "acorn";
 import { build } from "esbuild";
 
 //#region src/types.ts
+const SupportedFormatter = {
+	PRETTIER: "prettier",
+	BIOME: "biome",
+	OXFMT: "oxfmt"
+};
 const PropertySortOrder = {
 	ALPHABETICAL: "Alphabetical",
 	SPECIFICATION: "Specification"
@@ -281,37 +286,19 @@ function compareVersions(firstVersion, secondVersions, operator = ">=") {
 
 //#endregion
 //#region src/utils/content-type.ts
+const binaryApplicationTypes = new Set(["application/octet-stream", "application/pdf"]);
 /**
-* Determine if a content type is binary (vs text-based).
+* Determine if a content type is binary.
+* Only known binary types return true. Unknown types default to false (non-binary)
+* so that schema type information is preserved rather than being overridden with Blob.
 */
 function isBinaryContentType(contentType) {
-	if (contentType === "application/octet-stream") return true;
-	if (contentType.startsWith("image/")) return true;
-	if (contentType.startsWith("audio/")) return true;
-	if (contentType.startsWith("video/")) return true;
-	if (contentType.startsWith("font/")) return true;
-	if (contentType.startsWith("text/")) return false;
-	if ([
-		"+json",
-		"-json",
-		"+xml",
-		"-xml",
-		"+yaml",
-		"-yaml",
-		"+rss",
-		"-rss",
-		"+csv",
-		"-csv"
-	].some((suffix) => contentType.includes(suffix))) return false;
-	return !new Set([
-		"application/json",
-		"application/xml",
-		"application/yaml",
-		"application/x-www-form-urlencoded",
-		"application/javascript",
-		"application/ecmascript",
-		"application/graphql"
-	]).has(contentType);
+	const baseType = contentType.split(";")[0].trim();
+	if (baseType.startsWith("image/")) return true;
+	if (baseType.startsWith("audio/")) return true;
+	if (baseType.startsWith("video/")) return true;
+	if (baseType.startsWith("font/")) return true;
+	return binaryApplicationTypes.has(baseType);
 }
 /**
 * Determine if a form-data field should be treated as a file (binary or text).
@@ -566,6 +553,17 @@ function getIsBodyVerb(verb) {
 //#endregion
 //#region src/utils/logger.ts
 const log = console.log;
+let _warningCount = 0;
+function logWarning(message) {
+	_warningCount++;
+	log(styleText("yellow", message));
+}
+function getWarningCount() {
+	return _warningCount;
+}
+function resetWarnings() {
+	_warningCount = 0;
+}
 let _verbose = false;
 function setVerbose(v) {
 	_verbose = v;
@@ -595,7 +593,7 @@ function logError(err, tag) {
 	].filter(Boolean).join(" ")));
 }
 function mismatchArgsMessage(mismatchArgs) {
-	log(styleText("yellow", `${mismatchArgs.join(", ")} ${mismatchArgs.length === 1 ? "is" : "are"} not defined in your configuration!`));
+	logWarning(`${mismatchArgs.join(", ")} ${mismatchArgs.length === 1 ? "is" : "are"} not defined in your configuration!`);
 }
 function createSuccessMessage(backend) {
 	log(`🎉 ${backend ? `${styleText("green", backend)} - ` : ""}Your OpenAPI spec has been converted into ready to use orval!`);
@@ -1389,7 +1387,8 @@ function resolveValue({ schema, name, context, formDataContext }) {
 			}
 		}).hasReadonlyProps;
 		const isAnyOfNullable = schemaObject.anyOf?.some((anyOfItem) => !isReference(anyOfItem) && (anyOfItem.type === "null" || Array.isArray(anyOfItem.type) && anyOfItem.type.includes("null")));
-		const nullable = Array.isArray(schemaObject.type) && schemaObject.type.includes("null") || schemaObject.nullable === true || isAnyOfNullable ? " | null" : "";
+		const schemaType = schemaObject.type;
+		const nullable = Array.isArray(schemaType) && schemaType.includes("null") || schemaObject.nullable === true || isAnyOfNullable ? " | null" : "";
 		return {
 			value: resolvedImport.name + nullable,
 			imports: [{
@@ -1595,6 +1594,8 @@ const getSchemaAnyOf = (s) => s.anyOf;
 const getSchemaItems = (s) => s.items;
 const getSchemaRequired = (s) => s.required;
 const getSchemaProperties = (s) => s.properties;
+const resolveSchemaRef = (schema, context) => resolveRef(schema, context);
+const resolveResponseOrRequestRef = (schema, context) => resolveRef(schema, context);
 const formDataContentTypes = new Set(["multipart/form-data"]);
 const formUrlEncodedContentTypes = new Set(["application/x-www-form-urlencoded"]);
 function getResReqContentTypes({ mediaType, propName, context, isFormData, contentType }) {
@@ -1618,7 +1619,7 @@ function getResReqContentTypes({ mediaType, propName, context, isFormData, conte
 function getResReqTypes(responsesOrRequests, name, context, defaultType = "unknown", uniqueKey = (item) => item.value) {
 	return uniqueBy(responsesOrRequests.filter(([, res]) => Boolean(res)).map(([key, res]) => {
 		if (isReference(res)) {
-			const { schema: bodySchema, imports: [{ name, schemaName }] } = resolveRef(res, context);
+			const { schema: bodySchema, imports: [{ name, schemaName }] } = resolveResponseOrRequestRef(res, context);
 			const firstEntry = Object.entries(bodySchema.content ?? {}).at(0);
 			if (!firstEntry) return [{
 				value: name,
@@ -1706,7 +1707,7 @@ function getResReqTypes(responsesOrRequests, name, context, defaultType = "unkno
 			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);
+				const { imports } = resolveSchemaRef(mediaType.schema, context);
 				if (imports[0]?.name) effectivePropName = imports[0].name;
 			}
 			const isFormData = formDataContentTypes.has(contentType);
@@ -1836,14 +1837,14 @@ function getDefaultContentType(contentTypes) {
 	return contentTypes[0];
 }
 function getFormDataAdditionalImports({ schemaObject, context }) {
-	const { schema } = resolveRef(schemaObject, context);
+	const { schema } = resolveSchemaRef(schemaObject, context);
 	if (schema.type !== "object") return [];
 	const combinedSchemas = getSchemaOneOf(schema) ?? getSchemaAnyOf(schema);
 	if (!combinedSchemas) return [];
-	return combinedSchemas.map((subSchema) => resolveRef(subSchema, context).imports[0]).filter(Boolean);
+	return combinedSchemas.map((subSchema) => resolveSchemaRef(subSchema, context).imports[0]).filter(Boolean);
 }
 function getSchemaFormDataAndUrlEncoded({ name, schemaObject, context, isRequestBodyOptional, isUrlEncoded, isRef, encoding }) {
-	const { schema, imports } = resolveRef(schemaObject, context);
+	const { schema, imports } = resolveSchemaRef(schemaObject, context);
 	const propName = camel(!isRef && isReference(schemaObject) ? imports[0].name : name);
 	const additionalImports = [];
 	const variableName = isUrlEncoded ? "formUrlEncoded" : "formData";
@@ -1853,7 +1854,7 @@ function getSchemaFormDataAndUrlEncoded({ name, schemaObject, context, isRequest
 		if (combinedSchemas) {
 			const shouldCast = !!getSchemaOneOf(schema) || !!getSchemaAnyOf(schema);
 			const combinedSchemasFormData = combinedSchemas.map((subSchema) => {
-				const { schema: combinedSchema, imports } = resolveRef(subSchema, context);
+				const { schema: combinedSchema, imports } = resolveSchemaRef(subSchema, context);
 				let newPropName = propName;
 				let newPropDefinition = "";
 				if (shouldCast && imports[0]) {
@@ -1889,7 +1890,7 @@ function getSchemaFormDataAndUrlEncoded({ name, schemaObject, context, isRequest
 		let valueStr = "value";
 		const schemaItems = getSchemaItems(schema);
 		if (schemaItems) {
-			const { schema: itemSchema } = resolveRef(schemaItems, context);
+			const { schema: itemSchema } = resolveSchemaRef(schemaItems, context);
 			if (itemSchema.type === "object" || itemSchema.type === "array") valueStr = "JSON.stringify(value)";
 			else if (itemSchema.type === "number" || itemSchema.type === "integer" || itemSchema.type === "boolean") valueStr = "value.toString()";
 		}
@@ -1902,7 +1903,7 @@ function resolveSchemaPropertiesToFormData({ schema, variableName, propName, con
 	let formDataValues = "";
 	const schemaProps = getSchemaProperties(schema) ?? {};
 	for (const [key, value] of Object.entries(schemaProps)) {
-		const { schema: property } = resolveRef(value, context);
+		const { schema: property } = resolveSchemaRef(value, context);
 		if (property.readOnly) continue;
 		let formDataValue = "";
 		const partContentType = (depth === 0 ? encoding?.[key] : void 0)?.contentType;
@@ -1929,7 +1930,7 @@ function resolveSchemaPropertiesToFormData({ schema, variableName, propName, con
 			let hasNonPrimitiveChild = false;
 			const propertyItems = getSchemaItems(property);
 			if (propertyItems) {
-				const { schema: itemSchema } = resolveRef(propertyItems, context);
+				const { schema: itemSchema } = resolveSchemaRef(propertyItems, context);
 				if (itemSchema.type === "object" || itemSchema.type === "array") if (context.output.override.formData.arrayHandling === FormDataArrayHandling.EXPLODE) {
 					hasNonPrimitiveChild = true;
 					const resolvedValue = resolveSchemaPropertiesToFormData({
@@ -1997,8 +1998,7 @@ function resolveSchemaPropertiesToFormData({ schema, variableName, propName, con
 
 //#endregion
 //#region src/getters/body.ts
-function getBody({ requestBody, operationName, context, contentType }) {
-	const filteredBodyTypes = filterByContentType(getResReqTypes([[context.output.override.components.requestBodies.suffix, requestBody]], operationName, context), contentType);
+function buildBody(filteredBodyTypes, requestBody, operationName, context) {
 	const imports = filteredBodyTypes.flatMap(({ imports }) => imports);
 	const schemas = filteredBodyTypes.flatMap(({ schemas }) => schemas);
 	const definition = filteredBodyTypes.map(({ value }) => value).join(" | ");
@@ -2036,6 +2036,40 @@ function getBody({ requestBody, operationName, context, contentType }) {
 		}
 	};
 }
+function getBody({ requestBody, operationName, context, contentType }) {
+	return buildBody(filterByContentType(getResReqTypes([[context.output.override.components.requestBodies.suffix, requestBody]], operationName, context), contentType), requestBody, operationName, context);
+}
+/**
+* Returns per-content-type bodies when `splitByContentType` is enabled.
+* Each entry includes a `contentTypeSuffix` for generating distinct function names.
+*/
+function getBodiesByContentType({ requestBody, operationName, context, contentType }) {
+	const filteredBodyTypes = filterByContentType(getResReqTypes([[context.output.override.components.requestBodies.suffix, requestBody]], operationName, context, void 0, (item) => `${item.value}::${item.contentType}`), contentType);
+	if (filteredBodyTypes.length <= 1) return [{
+		...buildBody(filteredBodyTypes, requestBody, operationName, context),
+		contentTypeSuffix: ""
+	}];
+	return filteredBodyTypes.map((bodyType) => {
+		const suffix = getContentTypeSuffix(bodyType.contentType);
+		return {
+			...buildBody([bodyType], requestBody, operationName, context),
+			contentTypeSuffix: suffix
+		};
+	});
+}
+const CONTENT_TYPE_SUFFIX_MAP = {
+	"application/json": "Json",
+	"multipart/form-data": "FormData",
+	"application/x-www-form-urlencoded": "UrlEncoded",
+	"text/plain": "Text",
+	"application/xml": "Xml",
+	"text/xml": "Xml",
+	"application/octet-stream": "Blob"
+};
+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
@@ -2405,7 +2439,9 @@ function getScalar({ item, name, context, formDataContext }) {
 			};
 		}
 		case "boolean": {
-			let value = "boolean" + nullable;
+			let value = "boolean";
+			if (enumItems && !(enumItems.includes(true) && enumItems.includes(false))) value = enumItems.map((enumItem) => `${enumItem}`).join(" | ");
+			value += nullable;
 			if (schemaConst !== void 0) value = schemaConst;
 			return {
 				value,
@@ -2739,12 +2775,21 @@ function resolveDiscriminators(schemas, context) {
 					hasProperty: false,
 					value: void 0
 				};
-				const mergedEnumValues = [...((enumProperty.hasProperty && Array.isArray(enumProperty.value) ? enumProperty.value : void 0) ?? []).filter((value) => value !== mappingKey), mappingKey];
+				const enumValues = enumProperty.hasProperty && Array.isArray(enumProperty.value) ? enumProperty.value : void 0;
+				const propertyType = schemaProperty?.type ?? "string";
+				let typedMappingKey = mappingKey;
+				if (propertyType === "boolean") typedMappingKey = mappingKey === "true";
+				else if (propertyType === "number" || propertyType === "integer") {
+					const parsed = Number(mappingKey);
+					if (!Number.isNaN(parsed)) typedMappingKey = parsed;
+				}
+				const mergedEnumValues = [...(enumValues ?? []).filter((value) => value !== typedMappingKey), typedMappingKey];
 				const mergedProperty = {
 					...schemaProperty,
-					type: "string",
+					type: propertyType,
 					enum: mergedEnumValues
 				};
+				delete mergedProperty.const;
 				subTypeSchema.properties = {
 					...subTypeSchema.properties,
 					[propertyName]: mergedProperty
@@ -2777,8 +2822,10 @@ function getParameters({ parameters, context }) {
 		header: []
 	};
 	for (const p of parameters) if (isReference(p)) {
-		const { schema: parameter, imports } = resolveRef(p, context);
-		if (parameter.in === "path" || parameter.in === "query" || parameter.in === "header") result[parameter.in].push({
+		const { schema, imports } = resolveRef(p, context);
+		const parameter = schema;
+		const location = parameter.in;
+		if (location === "path" || location === "query" || location === "header") result[location].push({
 			parameter,
 			imports
 		});
@@ -3028,7 +3075,7 @@ function getResponse({ responses, operationName, context, contentType }) {
 			success: success || (defaultType ?? "unknown"),
 			errors: errors || (defaultType ?? "unknown")
 		},
-		isBlob: success === "Blob",
+		isBlob: groupedByStatus.success.some((t) => !!t.contentType && isBinaryContentType(t.contentType)),
 		types: groupedByStatus,
 		contentTypes,
 		schemas,
@@ -3038,7 +3085,18 @@ function getResponse({ responses, operationName, context, contentType }) {
 
 //#endregion
 //#region src/getters/route.ts
-const TEMPLATE_TAG_IN_PATH_REGEX = /\/([\w]+)(?:\$\{)/g;
+function isBaseUrlRuntime(baseUrl) {
+	return isObject(baseUrl) && "runtime" in baseUrl && typeof baseUrl.runtime === "string";
+}
+/**
+* Wraps a runtime expression for generated URL template literals.
+* Pass the expression only (e.g. `process.env.API_BASE_URL`), not a `${...}` fragment.
+*/
+function runtimeExpressionToUrlPrefix(expression) {
+	const t = expression.trim();
+	if (!t) return "";
+	return "${" + t + "}";
+}
 const hasParam = (path) => /[^{]*{[\w*_-]*}.*/.test(path);
 const getRoutePath = (path) => {
 	const matches = /([^{]*){?([\w*_-]*)}?(.*)/.exec(path);
@@ -3068,6 +3126,7 @@ function getFullRoute(route, servers, baseUrl) {
 	const getBaseUrl = () => {
 		if (!baseUrl) return "";
 		if (isString(baseUrl)) return baseUrl;
+		if (isBaseUrlRuntime(baseUrl)) return runtimeExpressionToUrlPrefix(baseUrl.runtime);
 		if (baseUrl.getBaseUrlFromSpecification) {
 			if (!servers) throw new Error("Orval is configured to use baseUrl from the specifications 'servers' field, but there exist no servers in the specification.");
 			const server = servers.at(Math.min(baseUrl.index ?? 0, servers.length - 1));
@@ -3095,8 +3154,22 @@ function getFullRoute(route, servers, baseUrl) {
 	}
 	return fullRoute;
 }
+/**
+* Returns `GeneratorImport` entries for {@link BaseUrlRuntime.imports} when `baseUrl` is a runtime config.
+*/
+function getBaseUrlRuntimeImports(baseUrl) {
+	if (!baseUrl) return [];
+	if (!isBaseUrlRuntime(baseUrl)) return [];
+	return baseUrl.imports ?? [];
+}
 function getRouteAsArray(route) {
-	return route.replaceAll(TEMPLATE_TAG_IN_PATH_REGEX, "/$1/${").split("/").filter((i) => i !== "").map((i) => i.includes("${") ? i.replace(TEMPLATE_TAG_REGEX, "$1") : `'${i}'`).join(",").replace(",,", "");
+	return route.split("/").filter((i) => i !== "").flatMap((segment) => {
+		if (!segment.includes("${")) return [`'${segment}'`];
+		return segment.split(/(\$\{.+?\})/g).filter(Boolean).map((part) => {
+			const match = /^\$\{(.+?)\}$/.exec(part);
+			return match ? match[1] : `'${part}'`;
+		});
+	}).join(",");
 }
 
 //#endregion
@@ -3435,7 +3508,7 @@ function removeComments(file) {
 const getAngularFilteredParamsExpression = (paramsExpression, requiredNullableParamKeys = [], preserveRequiredNullables = false) => {
 	const filteredParamValueType = `string | number | boolean${preserveRequiredNullables ? " | null" : ""} | Array<string | number | boolean>`;
 	const preserveNullableBranch = preserveRequiredNullables ? `    } else if (value === null && requiredNullableParamKeys.has(key)) {
-      filteredParams[key] = value;
+      filteredParams[key] = null;
 ` : "";
 	return `(() => {
   const requiredNullableParamKeys = new Set<string>(${JSON.stringify(requiredNullableParamKeys)});
@@ -3505,7 +3578,7 @@ function filterParams(
       value === null &&
       requiredNullableKeys.has(key)
     ) {
-      filteredParams[key] = value;
+      filteredParams[key] = null;
     } else if (
       value != null &&
       (typeof value === 'string' ||
@@ -3855,43 +3928,15 @@ function generateSchemaDefinitions(schemaName, schema, context, suffix) {
 
 //#endregion
 //#region src/generators/verbs-options.ts
-async function generateVerbOptions({ verb, output, operation, route, pathRoute, verbParameters = [], context }) {
-	const { responses, requestBody, parameters: operationParameters, tags: rawTags, deprecated: rawDeprecated, description: rawDescription, summary: rawSummary } = operation;
-	const tags = rawTags ?? [];
-	const deprecated = rawDeprecated;
-	const description = rawDescription;
-	const summary = rawSummary;
-	const operationId = getOperationId(operation, route, verb);
-	const overrideOperation = output.override.operations[operationId];
-	let overrideTag = {};
-	for (const [tag, options] of Object.entries(output.override.tags)) if (tags.includes(tag) && options) overrideTag = mergeDeep(overrideTag, options);
-	const override = mergeDeep(mergeDeep(output.override, overrideTag), overrideOperation ?? {});
-	const overrideOperationName = overrideOperation?.operationName ?? output.override.operationName;
-	const operationName = overrideOperationName ? overrideOperationName(operation, route, verb) : sanitize(camel(operationId), { es5keyword: true });
+async function buildVerbOption({ verb, output, operation, route, pathRoute, verbParameters = [], context, body, operationName, operationId, override, tags, deprecated, description, summary }) {
 	const response = getResponse({
-		responses: responses ?? {},
+		responses: operation.responses ?? {},
 		operationName,
 		context,
 		contentType: override.contentType
 	});
-	const body = requestBody ? getBody({
-		requestBody,
-		operationName,
-		context,
-		contentType: override.contentType
-	}) : {
-		originalSchema: {},
-		definition: "",
-		implementation: "",
-		imports: [],
-		schemas: [],
-		formData: "",
-		formUrlEncoded: "",
-		contentType: "",
-		isOptional: false
-	};
 	const parameters = getParameters({
-		parameters: [...verbParameters, ...operationParameters ?? []],
+		parameters: [...verbParameters, ...operation.parameters ?? []],
 		context
 	});
 	const queryParams = getQueryParams({
@@ -3980,6 +4025,83 @@ async function generateVerbOptions({ verb, output, operation, route, pathRoute,
 	const transformer = await dynamicImport(override.transformer, context.workspace);
 	return transformer ? transformer(verbOption) : verbOption;
 }
+async function generateVerbOptions({ verb, output, operation, route, pathRoute, verbParameters = [], context }) {
+	const { requestBody, tags: rawTags, deprecated: rawDeprecated, description: rawDescription, summary: rawSummary } = operation;
+	const tags = rawTags ?? [];
+	const deprecated = rawDeprecated;
+	const description = rawDescription;
+	const summary = rawSummary;
+	const operationId = getOperationId(operation, route, verb);
+	const overrideOperation = output.override.operations[operationId];
+	let overrideTag = {};
+	for (const [tag, options] of Object.entries(output.override.tags)) if (tags.includes(tag) && options) overrideTag = mergeDeep(overrideTag, options);
+	const override = mergeDeep(mergeDeep(output.override, overrideTag), overrideOperation ?? {});
+	const overrideOperationName = overrideOperation?.operationName ?? output.override.operationName;
+	const operationName = overrideOperationName ? overrideOperationName(operation, route, verb) : sanitize(camel(operationId), { es5keyword: true });
+	if (override.splitByContentType && requestBody) {
+		const bodies = getBodiesByContentType({
+			requestBody,
+			operationName,
+			context,
+			contentType: override.contentType
+		});
+		const results = [];
+		for (const bodyEntry of bodies) {
+			const { contentTypeSuffix, ...body } = bodyEntry;
+			const verbOption = await buildVerbOption({
+				verb,
+				output,
+				operation,
+				route,
+				pathRoute,
+				verbParameters,
+				context,
+				body,
+				operationName: contentTypeSuffix ? `${operationName}With${contentTypeSuffix}` : operationName,
+				operationId,
+				override,
+				tags,
+				deprecated,
+				description,
+				summary
+			});
+			results.push(verbOption);
+		}
+		return results;
+	}
+	return [await buildVerbOption({
+		verb,
+		output,
+		operation,
+		route,
+		pathRoute,
+		verbParameters,
+		context,
+		body: requestBody ? getBody({
+			requestBody,
+			operationName,
+			context,
+			contentType: override.contentType
+		}) : {
+			originalSchema: {},
+			definition: "",
+			implementation: "",
+			imports: [],
+			schemas: [],
+			formData: "",
+			formUrlEncoded: "",
+			contentType: "",
+			isOptional: false
+		},
+		operationName,
+		operationId,
+		override,
+		tags,
+		deprecated,
+		description,
+		summary
+	})];
+}
 function generateVerbsOptions({ verbs, input, output, route, pathRoute, context }) {
 	return asyncReduce(_filteredVerbs(verbs, input.filters), async (acc, [verb, operation]) => {
 		if (isVerb(verb)) {
@@ -3992,7 +4114,7 @@ function generateVerbsOptions({ verbs, input, output, route, pathRoute, context
 				operation,
 				context
 			});
-			acc.push(verbOptions);
+			acc.push(...verbOptions);
 		}
 		return acc;
 	}, []);
@@ -4210,7 +4332,7 @@ async function writeSchemas({ schemaPath, schemas, target, namingConvention, fil
 		});
 	}
 	if (indexFiles) {
-		const schemaFilePath = nodePath.join(schemaPath, `index${fileExtension}`);
+		const schemaFilePath = nodePath.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)));
@@ -4229,7 +4351,7 @@ function generateImportsForBuilder(output, imports, relativeSchemasPath) {
 	let schemaImports;
 	if (output.indexFiles) schemaImports = isZodSchemaOutput ? [{
 		exports: imports.filter((i) => !i.importPath),
-		dependency: joinSafe(relativeSchemasPath, "index.zod")
+		dependency: relativeSchemasPath
 	}] : [{
 		exports: imports.filter((i) => !i.importPath),
 		dependency: relativeSchemasPath
@@ -4376,7 +4498,7 @@ interface TypedResponse<T> extends Response {
 
 //#endregion
 //#region src/writers/single-mode.ts
-async function writeSingleMode({ builder, output, projectName, header, needSchema }) {
+async function writeSingleMode({ builder, output, projectName, header, needSchema, generateSchemasInline }) {
 	try {
 		const { path } = getFileInfo(output.target, {
 			backupFilename: conventionName(builder.info.title ?? "filename", output.namingConvention),
@@ -4438,7 +4560,7 @@ async function writeSingleMode({ builder, output, projectName, header, needSchem
 			data += getTypedResponse();
 			data += "\n";
 		}
-		if (!output.schemas && needSchema) data += generateModelsInline(builder.schemas);
+		if (!output.schemas && needSchema) data += generateSchemasInline ? generateSchemasInline() : generateModelsInline(builder.schemas);
 		data += `${implementation.trim()}\n`;
 		if (output.mock) {
 			data += "\n\n";
@@ -4454,7 +4576,7 @@ async function writeSingleMode({ builder, output, projectName, header, needSchem
 
 //#endregion
 //#region src/writers/split-mode.ts
-async function writeSplitMode({ builder, output, projectName, header, needSchema }) {
+async function writeSplitMode({ builder, output, projectName, header, needSchema, generateSchemasInline }) {
 	try {
 		const { path: targetPath, filename, dirname, extension } = getFileInfo(output.target, {
 			backupFilename: conventionName(builder.info.title ?? "filename", output.namingConvention),
@@ -4463,7 +4585,7 @@ async function writeSplitMode({ builder, output, projectName, header, needSchema
 		const { imports, implementation, implementationMock, importsMock, mutators, clientMutators, formData, formUrlEncoded, paramsSerializer, fetchReviver } = generateTarget(builder, output);
 		let implementationData = header;
 		let mockData = header;
-		const relativeSchemasPath = output.schemas ? getRelativeImportPath(targetPath, getFileInfo(isString(output.schemas) ? output.schemas : output.schemas.path, { extension: output.fileExtension }).dirname) : "./" + filename + ".schemas";
+		const relativeSchemasPath = output.schemas ? getRelativeImportPath(targetPath, getFileInfo(isString(output.schemas) ? output.schemas : output.schemas.path, { extension: output.fileExtension }).dirname) : "./" + filename + ".schemas" + extension.replace(/\.ts$/, "");
 		const isAllowSyntheticDefaultImports = isSyntheticDefaultImportsAllow(output.tsconfig);
 		const importsForBuilder = generateImportsForBuilder(output, imports, relativeSchemasPath);
 		implementationData += builder.imports({
@@ -4489,7 +4611,7 @@ async function writeSplitMode({ builder, output, projectName, header, needSchema
 			options: isFunction(output.mock) ? void 0 : output.mock
 		});
 		const schemasPath = output.schemas ? void 0 : nodePath.join(dirname, filename + ".schemas" + extension);
-		if (schemasPath && needSchema) await writeGeneratedFile(schemasPath, header + generateModelsInline(builder.schemas));
+		if (schemasPath && needSchema) await writeGeneratedFile(schemasPath, generateSchemasInline ? header + generateSchemasInline() : header + generateModelsInline(builder.schemas));
 		if (mutators) implementationData += generateMutatorImports({
 			mutators,
 			implementation
@@ -4641,7 +4763,7 @@ function generateTargetForTags(builder, options) {
 
 //#endregion
 //#region src/writers/split-tags-mode.ts
-async function writeSplitTagsMode({ builder, output, projectName, header, needSchema }) {
+async function writeSplitTagsMode({ builder, output, projectName, header, needSchema, generateSchemasInline }) {
 	const { filename, dirname, extension } = getFileInfo(output.target, {
 		backupFilename: conventionName(builder.info.title ?? "filename", output.namingConvention),
 		extension: output.fileExtension
@@ -4658,8 +4780,25 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 			let implementationData = header;
 			let mockData = header;
 			const importerPath = nodePath.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";
-			const importsForBuilder = generateImportsForBuilder(output, imports, relativeSchemasPath);
+			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);
+				let targetFile;
+				if (tagNames.has(targetBasename)) {
+					const tagFilename = targetBasename + serviceSuffix + extension;
+					targetFile = nodePath.join(resolvedPath, tagFilename);
+				} else targetFile = resolvedPath + extension;
+				const adjustedPath = getRelativeImportPath(importerPath, targetFile);
+				return {
+					...imp,
+					importPath: adjustedPath
+				};
+			}), relativeSchemasPath);
 			implementationData += builder.imports({
 				client: output.client,
 				implementation,
@@ -4683,7 +4822,7 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 				options: isFunction(output.mock) ? void 0 : output.mock
 			});
 			const schemasPath = output.schemas ? void 0 : nodePath.join(dirname, filename + ".schemas" + extension);
-			if (schemasPath && needSchema) await writeGeneratedFile(schemasPath, header + generateModelsInline(builder.schemas));
+			if (schemasPath && needSchema) await writeGeneratedFile(schemasPath, generateSchemasInline ? header + generateSchemasInline() : header + generateModelsInline(builder.schemas));
 			if (mutators) implementationData += generateMutatorImports({
 				mutators,
 				implementation,
@@ -4745,7 +4884,7 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 
 //#endregion
 //#region src/writers/tags-mode.ts
-async function writeTagsMode({ builder, output, projectName, header, needSchema }) {
+async function writeTagsMode({ builder, output, projectName, header, needSchema, generateSchemasInline }) {
 	const { path: targetPath, filename, dirname, extension } = getFileInfo(output.target, {
 		backupFilename: conventionName(builder.info.title ?? "filename", output.namingConvention),
 		extension: output.fileExtension
@@ -4756,7 +4895,7 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema
 		try {
 			const { imports, implementation, implementationMock, importsMock, mutators, clientMutators, formData, formUrlEncoded, fetchReviver, paramsSerializer } = target;
 			let data = header;
-			const schemasPathRelative = output.schemas ? getRelativeImportPath(targetPath, getFileInfo(isString(output.schemas) ? output.schemas : output.schemas.path, { extension: output.fileExtension }).dirname) : "./" + filename + ".schemas";
+			const schemasPathRelative = output.schemas ? getRelativeImportPath(targetPath, getFileInfo(isString(output.schemas) ? output.schemas : output.schemas.path, { extension: output.fileExtension }).dirname) : "./" + filename + ".schemas" + extension.replace(/\.ts$/, "");
 			const normalizedImports = imports.filter((imp) => {
 				const searchWords = [imp.alias, imp.name].filter((part) => Boolean(part?.length)).map((part) => escapeRegExp(part)).join("|");
 				if (!searchWords) return false;
@@ -4793,7 +4932,7 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema
 				});
 			}
 			const schemasPath = output.schemas ? void 0 : nodePath.join(dirname, filename + ".schemas" + extension);
-			if (schemasPath && needSchema) await writeGeneratedFile(schemasPath, header + generateModelsInline(builder.schemas));
+			if (schemasPath && needSchema) await writeGeneratedFile(schemasPath, generateSchemasInline ? header + generateSchemasInline() : header + generateModelsInline(builder.schemas));
 			if (mutators) data += generateMutatorImports({
 				mutators,
 				implementation
@@ -4827,5 +4966,5 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema
 }
 
 //#endregion
-export { BODY_TYPE_NAME, EnumGeneration, ErrorWithTag, FormDataArrayHandling, GetterPropType, LogLevels, NamingConvention, OutputClient, OutputHttpClient, OutputMockType, OutputMode, PropertySortOrder, RefComponentSuffix, SchemaType, TEMPLATE_TAG_REGEX, URL_REGEX, VERBS_WITH_BODY, Verbs, _filteredVerbs, addDependency, asyncReduce, camel, combineSchemas, compareVersions, conventionName, count, createDebugger, createLogger, createSuccessMessage, createTypeAliasIfNeeded, dedupeUnionType, dynamicImport, escape, escapeRegExp, filterByContentType, fixCrossDirectoryImports, fixRegularSchemaImports, generalJSTypes, generalJSTypesWithArray, generateAxiosOptions, generateBodyMutatorConfig, generateBodyOptions, generateComponentDefinition, generateDependencyImports, generateFormDataAndUrlEncodedFunction, generateImports, generateModelInline, generateModelsInline, generateMutator, generateMutatorConfig, generateMutatorImports, generateMutatorRequestOptions, generateOptions, generateParameterDefinition, generateQueryParamsAxiosConfig, generateSchemasDefinition, generateTarget, generateTargetForTags, generateVerbImports, generateVerbOptions, generateVerbsOptions, getAngularFilteredParamsCallExpression, getAngularFilteredParamsExpression, getAngularFilteredParamsHelperBody, getArray, getBody, getCombinedEnumValue, getDefaultContentType, getEnum, getEnumDescriptions, getEnumImplementation, getEnumNames, getEnumUnionFromSchema, getExtension, getFileInfo, getFormDataFieldFileType, getFullRoute, getIsBodyVerb, getKey, getMockFileExtensionByTypeName, getNumberWord, getObject, getOperationId, getOrvalGeneratedTypes, getParameters, getParams, getParamsInPath, getPropertySafe, getProps, getQueryParams, getRefInfo, getResReqTypes, getResponse, getResponseTypeCategory, getRoute, getRouteAsArray, getScalar, getSuccessResponseType, getTypedResponse, isBinaryContentType, isBoolean, isDirectory, isFunction, isModule, isNullish, isNumber, isNumeric, isObject, isReference, isSchema, isString, isStringLike, isSyntheticDefaultImportsAllow, isUrl, isVerb, isVerbose, jsDoc, jsStringEscape, kebab, keyValuePairsToJsDoc, log, logError, logVerbose, mergeDeep, mismatchArgsMessage, pascal, removeFilesAndEmptyFolders, resolveDiscriminators, resolveExampleRefs, resolveInstalledVersion, resolveInstalledVersions, resolveObject, resolveRef, resolveValue, sanitize, setVerbose, snake, sortByPriority, splitSchemasByType, startMessage, stringify, toObjectString, path_exports as upath, upper, writeModelInline, writeModelsInline, writeSchema, writeSchemas, writeSingleMode, writeSplitMode, writeSplitTagsMode, writeTagsMode };
+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