@orval/core 8.0.1 → 8.0.3

package/dist/index.d.mts

@@ -25,6 +25,7 @@ type NormalizedOutputOptions = {
   workspace?: string;
   target: string;
   schemas?: string | SchemaOptions;
+  operationSchemas?: string;
   namingConvention: NamingConvention;
   fileExtension: string;
   mode: OutputMode;
@@ -181,6 +182,12 @@ type OutputOptions = {
   workspace?: string;
   target: string;
   schemas?: string | SchemaOptions;
+  /**
+   * Separate path for operation-derived types (params, bodies, responses).
+   * When set, types matching operation patterns (e.g., *Params, *Body) are written here
+   * while regular schema types remain in the `schemas` path.
+   */
+  operationSchemas?: string;
   namingConvention?: NamingConvention;
   fileExtension?: string;
   mode?: OutputMode;
@@ -1153,6 +1160,7 @@ interface GenerateAxiosOptions {
   headers?: GeneratorSchema;
   requestOptions?: object | boolean;
   hasSignal: boolean;
+  hasSignalParam?: boolean;
   isVue: boolean;
   isAngular: boolean;
   paramsSerializer?: GeneratorMutator;
@@ -1165,6 +1173,7 @@ declare function generateAxiosOptions({
   headers,
   requestOptions,
   hasSignal,
+  hasSignalParam,
   isVue,
   isAngular,
   paramsSerializer,
@@ -1183,6 +1192,7 @@ interface GenerateOptionsOptions {
   isAngular?: boolean;
   isExactOptionalPropertyTypes: boolean;
   hasSignal: boolean;
+  hasSignalParam?: boolean;
   isVue?: boolean;
   paramsSerializer?: GeneratorMutator;
   paramsSerializerOptions?: ParamsSerializerOptions;
@@ -1200,6 +1210,7 @@ declare function generateOptions({
   isAngular,
   isExactOptionalPropertyTypes,
   hasSignal,
+  hasSignalParam,
   isVue,
   paramsSerializer,
   paramsSerializerOptions
@@ -1216,6 +1227,7 @@ interface GenerateMutatorConfigOptions {
   isFormData: boolean;
   isFormUrlEncoded: boolean;
   hasSignal: boolean;
+  hasSignalParam?: boolean;
   isExactOptionalPropertyTypes: boolean;
   isVue?: boolean;
 }
@@ -1229,6 +1241,7 @@ declare function generateMutatorConfig({
   isFormData,
   isFormUrlEncoded,
   hasSignal,
+  hasSignalParam,
   isExactOptionalPropertyTypes,
   isVue
 }: GenerateMutatorConfigOptions): string;
@@ -1339,8 +1352,8 @@ declare function combineSchemas({
 declare function resolveDiscriminators(schemas: OpenApiSchemasObject, context: ContextSpec): OpenApiSchemasObject;
 //#endregion
 //#region src/getters/enum.d.ts
-declare function getEnumNames(schemaObject: OpenApiSchemaObject | undefined): any;
-declare function getEnumDescriptions(schemaObject: OpenApiSchemaObject | undefined): any;
+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;
 //#endregion
@@ -1852,6 +1865,21 @@ declare function jsStringEscape(input: string): string;
 declare function isSyntheticDefaultImportsAllow(config?: Tsconfig): boolean;
 //#endregion
 //#region src/writers/schemas.d.ts
+/**
+ * Split schemas into regular and operation types.
+ */
+declare function splitSchemasByType(schemas: GeneratorSchema[]): {
+  regularSchemas: GeneratorSchema[];
+  operationSchemas: GeneratorSchema[];
+};
+/**
+ * Fix imports in operation schemas that reference regular schemas.
+ */
+declare function fixCrossDirectoryImports(operationSchemas: GeneratorSchema[], regularSchemaNames: Set<string>, schemaPath: string, operationSchemaPath: string, namingConvention: NamingConvention): void;
+/**
+ * Fix imports in regular schemas that reference operation schemas.
+ */
+declare function fixRegularSchemaImports(regularSchemas: GeneratorSchema[], operationSchemaNames: Set<string>, schemaPath: string, operationSchemaPath: string, namingConvention: NamingConvention): void;
 declare function writeModelInline(acc: string, model: string): string;
 declare function writeModelsInline(array: GeneratorSchema[]): string;
 interface WriteSchemaOptions {
@@ -1935,5 +1963,5 @@ declare function generateTargetForTags(builder: WriteSpecBuilder, options: Norma
 declare function getOrvalGeneratedTypes(): string;
 declare function getTypedResponse(): string;
 //#endregion
-export { AngularOptions, BODY_TYPE_NAME, BaseUrlFromConstant, BaseUrlFromSpec, ClientBuilder, ClientDependenciesBuilder, ClientExtraFilesBuilder, ClientFileBuilder, ClientFooterBuilder, ClientGeneratorsBuilder, ClientHeaderBuilder, ClientMockBuilder, ClientMockGeneratorBuilder, ClientMockGeneratorImplementation, ClientTitleBuilder, Config, ConfigExternal, ConfigFn, ContextSpec, DeepNonNullable, EnumGeneration, ErrorWithTag, FetchOptions, FormDataArrayHandling, FormDataType, GenerateMockImports, GenerateVerbOptionsParams, GenerateVerbsOptionsParams, GeneratorApiBuilder, GeneratorApiOperations, GeneratorApiResponse, GeneratorClient, GeneratorClientExtra, GeneratorClientFooter, GeneratorClientHeader, GeneratorClientImports, GeneratorClientTitle, GeneratorClients, GeneratorDependency, GeneratorImport, GeneratorMutator, GeneratorMutatorParsingInfo, GeneratorOperation, GeneratorOperations, GeneratorOptions, GeneratorSchema, GeneratorTarget, GeneratorTargetFull, GeneratorVerbOptions, GeneratorVerbsOptions, GetterBody, GetterParam, GetterParameters, GetterParams, GetterProp, GetterPropType, GetterProps, GetterQueryParam, GetterResponse, GlobalMockOptions, GlobalOptions, HonoOptions, Hook, HookCommand, HookFunction, HookOption, HooksOptions, ImportOpenApi, InputFiltersOptions, InputOptions, InputTransformerFn, InvalidateTarget, JsDocOptions, LogLevel, LogLevels, LogOptions, LogType, Logger, LoggerOptions, MockData, MockDataArray, MockDataArrayFn, MockDataObject, MockDataObjectFn, MockOptions, MockProperties, MockPropertiesObject, MockPropertiesObjectFn, MutationInvalidatesConfig, MutationInvalidatesRule, Mutator, MutatorObject, NamingConvention, NormalizedConfig, NormalizedFetchOptions, NormalizedFormDataType, NormalizedHonoOptions, NormalizedHookCommand, NormalizedHookOptions, NormalizedInputOptions, NormalizedJsDocOptions, NormalizedMutator, NormalizedOperationOptions, NormalizedOptions, NormalizedOutputOptions, NormalizedOverrideOutput, NormalizedParamsSerializerOptions, NormalizedQueryOptions, NormalizedSchemaOptions, NormalizedZodOptions, OpenApiComponentsObject, OpenApiDocument, OpenApiEncodingObject, OpenApiExampleObject, OpenApiInfoObject, OpenApiMediaTypeObject, OpenApiOperationObject, OpenApiParameterObject, OpenApiPathItemObject, OpenApiPathsObject, OpenApiReferenceObject, OpenApiRequestBodyObject, OpenApiResponseObject, OpenApiResponsesObject, OpenApiSchemaObject, OpenApiSchemaObjectType, OpenApiSchemasObject, OpenApiServerObject, OperationOptions, Options, OptionsExport, OptionsFn, OutputClient, OutputClientFunc, OutputDocsOptions, OutputHttpClient, OutputMockType, OutputMode, OutputOptions, OverrideInput, OverrideMockOptions, OverrideOutput, OverrideOutputContentType, PackageJson, ParamsSerializerOptions, PropertySortOrder, QueryOptions, RefComponentSuffix, RefInfo, ResReqTypesValue, ResolverValue, ResponseTypeCategory, ScalarValue, SchemaGenerationType, SchemaOptions, SchemaType, SwrOptions, TEMPLATE_TAG_REGEX, TsConfigTarget, Tsconfig, URL_REGEX, VERBS_WITH_BODY, Verbs, WriteModeProps, WriteSpecBuilder, ZodCoerceType, ZodDateTimeOptions, ZodOptions, ZodTimeOptions, _filteredVerbs, addDependency, asyncReduce, camel, combineSchemas, compareVersions, conventionName, count, createDebugger, createLogger, createSuccessMessage, createTypeAliasIfNeeded, dynamicImport, escape, generalJSTypes, generalJSTypesWithArray, generateAxiosOptions, generateBodyMutatorConfig, generateBodyOptions, generateComponentDefinition, generateDependencyImports, generateFormDataAndUrlEncodedFunction, generateImports, generateModelInline, generateModelsInline, generateMutator, generateMutatorConfig, generateMutatorImports, generateMutatorRequestOptions, generateOptions, generateParameterDefinition, generateQueryParamsAxiosConfig, generateSchemasDefinition, generateTarget, generateTargetForTags, generateVerbImports, generateVerbOptions, generateVerbsOptions, getArray, getBody, getDefaultContentType, getEnum, getEnumDescriptions, getEnumImplementation, getEnumNames, getExtension, getFileInfo, getFormDataFieldFileType, getFullRoute, getIsBodyVerb, getKey, getMockFileExtensionByTypeName, getNumberWord, getObject, getOperationId, getOrvalGeneratedTypes, getParameters, getParams, getParamsInPath, getPropertySafe, getProps, getQueryParams, getRefInfo, getResReqTypes, getResponse, getResponseTypeCategory, getRoute, getRouteAsArray, getScalar, getTypedResponse, isBinaryContentType, isBoolean, isDirectory, isFunction, isModule, isNull, isNumber, isNumeric, isObject, isReference, isSchema, isString, isSyntheticDefaultImportsAllow, isUndefined, isUrl, isVerb, jsDoc, jsStringEscape, kebab, keyValuePairsToJsDoc, log, logError, mergeDeep, mismatchArgsMessage, pascal, removeFilesAndEmptyFolders, resolveDiscriminators, resolveExampleRefs, resolveObject, resolveRef, resolveValue, sanitize, snake, sortByPriority, startMessage, stringify, toObjectString, path_d_exports as upath, upper, writeModelInline, writeModelsInline, writeSchema, writeSchemas, writeSingleMode, writeSplitMode, writeSplitTagsMode, writeTagsMode };
+export { AngularOptions, BODY_TYPE_NAME, BaseUrlFromConstant, BaseUrlFromSpec, ClientBuilder, ClientDependenciesBuilder, ClientExtraFilesBuilder, ClientFileBuilder, ClientFooterBuilder, ClientGeneratorsBuilder, ClientHeaderBuilder, ClientMockBuilder, ClientMockGeneratorBuilder, ClientMockGeneratorImplementation, ClientTitleBuilder, Config, ConfigExternal, ConfigFn, ContextSpec, DeepNonNullable, EnumGeneration, ErrorWithTag, FetchOptions, FormDataArrayHandling, FormDataType, GenerateMockImports, GenerateVerbOptionsParams, GenerateVerbsOptionsParams, GeneratorApiBuilder, GeneratorApiOperations, GeneratorApiResponse, GeneratorClient, GeneratorClientExtra, GeneratorClientFooter, GeneratorClientHeader, GeneratorClientImports, GeneratorClientTitle, GeneratorClients, GeneratorDependency, GeneratorImport, GeneratorMutator, GeneratorMutatorParsingInfo, GeneratorOperation, GeneratorOperations, GeneratorOptions, GeneratorSchema, GeneratorTarget, GeneratorTargetFull, GeneratorVerbOptions, GeneratorVerbsOptions, GetterBody, GetterParam, GetterParameters, GetterParams, GetterProp, GetterPropType, GetterProps, GetterQueryParam, GetterResponse, GlobalMockOptions, GlobalOptions, HonoOptions, Hook, HookCommand, HookFunction, HookOption, HooksOptions, ImportOpenApi, InputFiltersOptions, InputOptions, InputTransformerFn, InvalidateTarget, JsDocOptions, LogLevel, LogLevels, LogOptions, LogType, Logger, LoggerOptions, MockData, MockDataArray, MockDataArrayFn, MockDataObject, MockDataObjectFn, MockOptions, MockProperties, MockPropertiesObject, MockPropertiesObjectFn, MutationInvalidatesConfig, MutationInvalidatesRule, Mutator, MutatorObject, NamingConvention, NormalizedConfig, NormalizedFetchOptions, NormalizedFormDataType, NormalizedHonoOptions, NormalizedHookCommand, NormalizedHookOptions, NormalizedInputOptions, NormalizedJsDocOptions, NormalizedMutator, NormalizedOperationOptions, NormalizedOptions, NormalizedOutputOptions, NormalizedOverrideOutput, NormalizedParamsSerializerOptions, NormalizedQueryOptions, NormalizedSchemaOptions, NormalizedZodOptions, OpenApiComponentsObject, OpenApiDocument, OpenApiEncodingObject, OpenApiExampleObject, OpenApiInfoObject, OpenApiMediaTypeObject, OpenApiOperationObject, OpenApiParameterObject, OpenApiPathItemObject, OpenApiPathsObject, OpenApiReferenceObject, OpenApiRequestBodyObject, OpenApiResponseObject, OpenApiResponsesObject, OpenApiSchemaObject, OpenApiSchemaObjectType, OpenApiSchemasObject, OpenApiServerObject, OperationOptions, Options, OptionsExport, OptionsFn, OutputClient, OutputClientFunc, OutputDocsOptions, OutputHttpClient, OutputMockType, OutputMode, OutputOptions, OverrideInput, OverrideMockOptions, OverrideOutput, OverrideOutputContentType, PackageJson, ParamsSerializerOptions, PropertySortOrder, QueryOptions, RefComponentSuffix, RefInfo, ResReqTypesValue, ResolverValue, ResponseTypeCategory, ScalarValue, SchemaGenerationType, SchemaOptions, SchemaType, SwrOptions, TEMPLATE_TAG_REGEX, TsConfigTarget, Tsconfig, URL_REGEX, VERBS_WITH_BODY, Verbs, WriteModeProps, WriteSpecBuilder, ZodCoerceType, ZodDateTimeOptions, ZodOptions, ZodTimeOptions, _filteredVerbs, addDependency, asyncReduce, camel, combineSchemas, compareVersions, conventionName, count, createDebugger, createLogger, createSuccessMessage, createTypeAliasIfNeeded, dynamicImport, escape, fixCrossDirectoryImports, fixRegularSchemaImports, generalJSTypes, generalJSTypesWithArray, generateAxiosOptions, generateBodyMutatorConfig, generateBodyOptions, generateComponentDefinition, generateDependencyImports, generateFormDataAndUrlEncodedFunction, generateImports, generateModelInline, generateModelsInline, generateMutator, generateMutatorConfig, generateMutatorImports, generateMutatorRequestOptions, generateOptions, generateParameterDefinition, generateQueryParamsAxiosConfig, generateSchemasDefinition, generateTarget, generateTargetForTags, generateVerbImports, generateVerbOptions, generateVerbsOptions, getArray, getBody, getDefaultContentType, getEnum, getEnumDescriptions, getEnumImplementation, getEnumNames, getExtension, getFileInfo, getFormDataFieldFileType, getFullRoute, getIsBodyVerb, getKey, getMockFileExtensionByTypeName, getNumberWord, getObject, getOperationId, getOrvalGeneratedTypes, getParameters, getParams, getParamsInPath, getPropertySafe, getProps, getQueryParams, getRefInfo, getResReqTypes, getResponse, getResponseTypeCategory, getRoute, getRouteAsArray, getScalar, getTypedResponse, isBinaryContentType, isBoolean, isDirectory, isFunction, isModule, isNull, isNumber, isNumeric, isObject, isReference, isSchema, isString, isSyntheticDefaultImportsAllow, isUndefined, isUrl, isVerb, jsDoc, jsStringEscape, kebab, keyValuePairsToJsDoc, log, logError, mergeDeep, mismatchArgsMessage, pascal, removeFilesAndEmptyFolders, resolveDiscriminators, resolveExampleRefs, resolveObject, resolveRef, resolveValue, sanitize, snake, sortByPriority, splitSchemasByType, startMessage, stringify, toObjectString, path_d_exports as upath, upper, writeModelInline, writeModelsInline, writeSchema, writeSchemas, writeSingleMode, writeSplitMode, writeSplitTagsMode, writeTagsMode };
 //# sourceMappingURL=index.d.mts.map

package/dist/index.mjs

@@ -234,7 +234,7 @@ function joinSafe(...values) {
 * @param property
 */
 function isReference(obj) {
-	return Object.hasOwn(obj, "$ref");
+	return !isNull(obj) && Object.hasOwn(obj, "$ref");
 }
 function isDirectory(path$2) {
 	return !extname(path$2);
@@ -821,10 +821,14 @@ function isSyntheticDefaultImportsAllow(config) {
 //#endregion
 //#region src/getters/enum.ts
 function getEnumNames(schemaObject) {
-	return schemaObject?.["x-enumNames"] || schemaObject?.["x-enumnames"] || schemaObject?.["x-enum-varnames"];
+	const names = schemaObject?.["x-enumNames"] ?? schemaObject?.["x-enumnames"] ?? schemaObject?.["x-enum-varnames"];
+	if (!names) return;
+	return names.map((name) => jsStringEscape(name));
 }
 function getEnumDescriptions(schemaObject) {
-	return schemaObject?.["x-enumDescriptions"] || schemaObject?.["x-enumdescriptions"] || schemaObject?.["x-enum-descriptions"];
+	const descriptions = schemaObject?.["x-enumDescriptions"] ?? schemaObject?.["x-enumdescriptions"] ?? schemaObject?.["x-enum-descriptions"];
+	if (!descriptions) return;
+	return descriptions.map((description) => jsStringEscape(description));
 }
 function getEnum(value, enumName, names, enumGenerationType, descriptions, enumNamingConvention) {
 	if (enumGenerationType === EnumGeneration.CONST) return getTypeConstEnum(value, enumName, names, descriptions, enumNamingConvention);
@@ -1017,7 +1021,7 @@ function resolveValue({ schema, name, context }) {
 				parents: [...context.parents ?? [], refName]
 			}
 		}).hasReadonlyProps;
-		const nullable = Array.isArray(schemaObject.type) && schemaObject.type.includes("null") ? " | null" : "";
+		const nullable = Array.isArray(schemaObject.type) && schemaObject.type.includes("null") || schemaObject.nullable === true ? " | null" : "";
 		return {
 			value: resolvedImport.name + nullable,
 			imports: [{
@@ -1236,7 +1240,7 @@ function getImportAliasForRefOrValue({ context, imports, resolvedValue }) {
 * @ref https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.1.md#data-types
 */
 function getScalar({ item, name, context }) {
-	const nullable = isArray(item.type) && item.type.includes("null") ? " | null" : "";
+	const nullable = isArray(item.type) && item.type.includes("null") || item.nullable === true ? " | null" : "";
 	const enumItems = item.enum?.filter((enumItem) => enumItem !== null);
 	let itemType = item.type;
 	if (!itemType && item.items) {
@@ -1379,12 +1383,13 @@ function getScalar({ item, name, context }) {
 function combineValues({ resolvedData, resolvedValue, separator: separator$1, context }) {
 	if (resolvedData.isEnum.every(Boolean)) return `${resolvedData.values.join(` | `)}${resolvedValue ? ` | ${resolvedValue.value}` : ""}`;
 	if (separator$1 === "allOf") {
-		let resolvedDataValue = resolvedData.values.join(` & `);
+		let resolvedDataValue = resolvedData.values.map((v) => v.includes(" | ") ? `(${v})` : v).join(` & `);
 		if (resolvedData.originalSchema.length > 0 && resolvedValue) {
 			const discriminatedPropertySchemas = resolvedData.originalSchema.filter((s) => s?.discriminator && resolvedValue.value.includes(` ${s.discriminator.propertyName}:`));
 			if (discriminatedPropertySchemas.length > 0) resolvedDataValue = `Omit<${resolvedDataValue}, '${discriminatedPropertySchemas.map((s) => s.discriminator?.propertyName).join("' | '")}'>`;
 		}
-		const joined = `${resolvedDataValue}${resolvedValue ? ` & ${resolvedValue.value}` : ""}`;
+		const resolvedValueStr = resolvedValue?.value.includes(" | ") ? `(${resolvedValue.value})` : resolvedValue?.value;
+		const joined = `${resolvedDataValue}${resolvedValue ? ` & ${resolvedValueStr}` : ""}`;
 		const overrideRequiredProperties = resolvedData.requiredProperties.filter((prop$1) => !resolvedData.originalSchema.some((schema) => schema?.properties?.[prop$1] && schema.required?.includes(prop$1)));
 		if (overrideRequiredProperties.length > 0) return `${joined} & Required<Pick<${joined}, '${overrideRequiredProperties.join("' | '")}'>>`;
 		return joined;
@@ -1484,6 +1489,16 @@ function combineSchemas({ name, schema, separator: separator$1, context, nullabl
 		name,
 		context
 	});
+	else if (separator$1 === "allOf" && (schema.oneOf || schema.anyOf)) {
+		const siblingCombiner = schema.oneOf ? "oneOf" : "anyOf";
+		resolvedValue = combineSchemas({
+			schema: { [siblingCombiner]: schema[siblingCombiner] },
+			name,
+			separator: siblingCombiner,
+			context,
+			nullable: ""
+		});
+	}
 	return {
 		value: combineValues({
 			resolvedData,
@@ -1800,10 +1815,15 @@ function getResReqTypes(responsesOrRequests, name, context, defaultType = "unkno
 		if (res.content) return Object.entries(res.content).map(([contentType, mediaType], index, arr) => {
 			let propName = key ? pascal(name) + pascal(key) : void 0;
 			if (propName && arr.length > 1) propName = propName + pascal(getNumberWord(index + 1));
+			let effectivePropName = propName;
+			if (mediaType.schema && isReference(mediaType.schema)) {
+				const { imports } = resolveRef(mediaType.schema, context);
+				if (imports[0]?.name) effectivePropName = imports[0].name;
+			}
 			const isFormData = formDataContentTypes.has(contentType);
 			const resolvedValue = getResReqContentTypes({
 				mediaType,
-				propName,
+				propName: effectivePropName,
 				context,
 				isFormData,
 				contentType
@@ -1823,7 +1843,7 @@ function getResReqTypes(responsesOrRequests, name, context, defaultType = "unkno
 				return;
 			}
 			const isFormUrlEncoded = formUrlEncodedContentTypes.has(contentType);
-			if (!isFormData && !isFormUrlEncoded || !propName) return {
+			if (!isFormData && !isFormUrlEncoded || !effectivePropName) return {
 				...resolvedValue,
 				imports: resolvedValue.imports,
 				contentType,
@@ -1831,18 +1851,20 @@ function getResReqTypes(responsesOrRequests, name, context, defaultType = "unkno
 				examples: resolveExampleRefs(mediaType.examples, context)
 			};
 			const formData = isFormData ? getSchemaFormDataAndUrlEncoded({
-				name: propName,
+				name: effectivePropName,
 				schemaObject: mediaType.schema,
 				context,
 				isRequestBodyOptional: "required" in res && res.required === false,
+				isRef: true,
 				encoding: mediaType.encoding
 			}) : void 0;
 			const formUrlEncoded = isFormUrlEncoded ? getSchemaFormDataAndUrlEncoded({
-				name: propName,
+				name: effectivePropName,
 				schemaObject: mediaType.schema,
 				context,
 				isUrlEncoded: true,
 				isRequestBodyOptional: "required" in res && res.required === false,
+				isRef: true,
 				encoding: mediaType.encoding
 			}) : void 0;
 			const additionalImports = getFormDataAdditionalImports({
@@ -2871,18 +2893,20 @@ function generateBodyOptions(body, isFormData, isFormUrlEncoded) {
 	if (body.implementation) return `\n      ${body.implementation},`;
 	return "";
 }
-function generateAxiosOptions({ response, isExactOptionalPropertyTypes, queryParams, headers, requestOptions, hasSignal, isVue, isAngular, paramsSerializer, paramsSerializerOptions }) {
+function generateAxiosOptions({ response, isExactOptionalPropertyTypes, queryParams, headers, requestOptions, hasSignal, hasSignalParam = false, isVue, isAngular, paramsSerializer, paramsSerializerOptions }) {
 	const isRequestOptions = requestOptions !== false;
+	const signalVar = hasSignalParam ? "querySignal" : "signal";
+	const signalProp = hasSignalParam ? `signal: ${signalVar}` : "signal";
 	if (!queryParams && !headers && !response.isBlob && response.definition.success !== "string") {
 		if (isRequestOptions) return "options";
-		if (hasSignal) return isExactOptionalPropertyTypes ? "...(signal ? { signal } : {})" : "signal";
+		if (hasSignal) return isExactOptionalPropertyTypes ? `...(${signalVar} ? { ${signalProp} } : {})` : signalProp;
 		return "";
 	}
 	let value = "";
 	if (!isRequestOptions) {
 		if (queryParams) value += "\n        params,";
 		if (headers) value += "\n        headers,";
-		if (hasSignal) value += isExactOptionalPropertyTypes ? "\n        ...(signal ? { signal } : {})," : "\n        signal,";
+		if (hasSignal) value += isExactOptionalPropertyTypes ? `\n        ...(${signalVar} ? { ${signalProp} } : {}),` : `\n        ${signalProp},`;
 	}
 	if (!isObject(requestOptions) || !requestOptions.hasOwnProperty("responseType")) {
 		if (response.isBlob) value += `\n        responseType: 'blob',`;
@@ -2899,7 +2923,7 @@ function generateAxiosOptions({ response, isExactOptionalPropertyTypes, queryPar
 	if (!isAngular && queryParams && (paramsSerializer || paramsSerializerOptions?.qs)) value += paramsSerializer ? `\n        paramsSerializer: ${paramsSerializer.name},` : `\n        paramsSerializer: (params) => qs.stringify(params, ${JSON.stringify(paramsSerializerOptions.qs)}),`;
 	return value;
 }
-function generateOptions({ route, body, headers, queryParams, response, verb, requestOptions, isFormData, isFormUrlEncoded, isAngular, isExactOptionalPropertyTypes, hasSignal, isVue, paramsSerializer, paramsSerializerOptions }) {
+function generateOptions({ route, body, headers, queryParams, response, verb, requestOptions, isFormData, isFormUrlEncoded, isAngular, isExactOptionalPropertyTypes, hasSignal, hasSignalParam, isVue, paramsSerializer, paramsSerializerOptions }) {
 	const bodyOptions = getIsBodyVerb(verb) ? generateBodyOptions(body, isFormData, isFormUrlEncoded) : "";
 	const axiosOptions = generateAxiosOptions({
 		response,
@@ -2908,6 +2932,7 @@ function generateOptions({ route, body, headers, queryParams, response, verb, re
 		requestOptions,
 		isExactOptionalPropertyTypes,
 		hasSignal,
+		hasSignalParam,
 		isVue: isVue ?? false,
 		isAngular: isAngular ?? false,
 		paramsSerializer,
@@ -2933,11 +2958,13 @@ function generateQueryParamsAxiosConfig(response, isVue, queryParams) {
 	if (response.isBlob) value += `,\n        responseType: 'blob'`;
 	return value;
 }
-function generateMutatorConfig({ route, body, headers, queryParams, response, verb, isFormData, isFormUrlEncoded, hasSignal, isExactOptionalPropertyTypes, isVue }) {
+function generateMutatorConfig({ route, body, headers, queryParams, response, verb, isFormData, isFormUrlEncoded, hasSignal, hasSignalParam = false, isExactOptionalPropertyTypes, isVue }) {
 	const bodyOptions = getIsBodyVerb(verb) ? generateBodyMutatorConfig(body, isFormData, isFormUrlEncoded) : "";
 	const queryParamsOptions = generateQueryParamsAxiosConfig(response, isVue ?? false, queryParams);
 	const headerOptions = body.contentType ? `,\n      headers: {'Content-Type': '${body.contentType}', ${headers ? "...headers" : ""}}` : headers ? ",\n      headers" : "";
-	return `{url: \`${route}\`, method: '${verb.toUpperCase()}'${headerOptions}${bodyOptions}${queryParamsOptions}${hasSignal ? `, ${isExactOptionalPropertyTypes ? "...(signal ? { signal }: {})" : "signal"}` : ""}\n    }`;
+	const signalVar = hasSignalParam ? "querySignal" : "signal";
+	const signalProp = hasSignalParam ? `signal: ${signalVar}` : "signal";
+	return `{url: \`${route}\`, method: '${verb.toUpperCase()}'${headerOptions}${bodyOptions}${queryParamsOptions}${hasSignal ? `, ${isExactOptionalPropertyTypes ? `...(${signalVar} ? { ${signalProp} }: {})` : signalProp}` : ""}\n    }`;
 }
 function generateMutatorRequestOptions(requestOptions, hasSecondArgument) {
 	if (!hasSecondArgument) return isObject(requestOptions) ? `{${stringify(requestOptions)?.slice(1, -1)}}` : "";
@@ -3314,6 +3341,70 @@ function _filteredVerbs(verbs, filters) {
 
 //#endregion
 //#region src/writers/schemas.ts
+/**
+* Patterns to detect operation-derived types (params, bodies, responses).
+* These types are auto-generated from OpenAPI operations, not from component schemas.
+*/
+const OPERATION_TYPE_PATTERNS = [
+	/Params$/i,
+	/Body$/,
+	/Body(One|Two|Three|Four|Five|Item)$/,
+	/Parameter$/i,
+	/Query$/i,
+	/Header$/i,
+	/Response\d*$/i,
+	/^[1-5]\d{2}$/,
+	/\d{3}(One|Two|Three|Four|Five|Item)$/i,
+	/^(get|post|put|patch|delete|head|options)[A-Z].*\d{3}$/
+];
+/**
+* Check if a schema name matches operation type patterns.
+*/
+function isOperationType(schemaName) {
+	return OPERATION_TYPE_PATTERNS.some((pattern) => pattern.test(schemaName));
+}
+/**
+* Split schemas into regular and operation types.
+*/
+function splitSchemasByType(schemas) {
+	const regularSchemas = [];
+	const operationSchemas = [];
+	for (const schema of schemas) if (isOperationType(schema.name)) operationSchemas.push(schema);
+	else regularSchemas.push(schema);
+	return {
+		regularSchemas,
+		operationSchemas
+	};
+}
+/**
+* Fix cross-directory imports when schemas reference other schemas in a different directory.
+* Updates import paths to use correct relative paths between directories.
+*/
+function fixSchemaImports(schemas, targetSchemaNames, fromPath, toPath, namingConvention) {
+	const relativePath = relativeSafe(fromPath, toPath);
+	for (const schema of schemas) schema.imports = schema.imports.map((imp) => {
+		if (targetSchemaNames.has(imp.name)) {
+			const fileName = conventionName(imp.name, namingConvention);
+			return {
+				...imp,
+				importPath: joinSafe(relativePath, fileName)
+			};
+		}
+		return imp;
+	});
+}
+/**
+* Fix imports in operation schemas that reference regular schemas.
+*/
+function fixCrossDirectoryImports(operationSchemas, regularSchemaNames, schemaPath, operationSchemaPath, namingConvention) {
+	fixSchemaImports(operationSchemas, regularSchemaNames, operationSchemaPath, schemaPath, namingConvention);
+}
+/**
+* Fix imports in regular schemas that reference operation schemas.
+*/
+function fixRegularSchemaImports(regularSchemas, operationSchemaNames, schemaPath, operationSchemaPath, namingConvention) {
+	fixSchemaImports(regularSchemas, operationSchemaNames, schemaPath, operationSchemaPath, namingConvention);
+}
 function getSchemaKey(schemaPath, schemaName, namingConvention, fileExtension) {
 	return getPath(schemaPath, conventionName(schemaName, namingConvention), fileExtension).toLowerCase().replaceAll("\\", "/");
 }
@@ -3442,12 +3533,13 @@ function generateImportsForBuilder(output, imports, relativeSchemasPath) {
 	if (!output.indexFiles) return uniqueBy(imports, (x) => x.name).map((i) => {
 		const name = conventionName(i.schemaName || i.name, output.namingConvention);
 		const suffix = isZodSchemaOutput ? ".zod" : "";
+		const importExtension = output.fileExtension?.replace(/\.ts$/, "") || "";
 		return {
 			exports: isZodSchemaOutput ? [{
 				...i,
 				values: true
 			}] : [i],
-			dependency: joinSafe(relativeSchemasPath, `${name}${suffix}`)
+			dependency: joinSafe(relativeSchemasPath, `${name}${suffix}${importExtension}`)
 		};
 	});
 	else if (isZodSchemaOutput) return [{
@@ -4012,5 +4104,5 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema
 }
 
 //#endregion
-export { BODY_TYPE_NAME, EnumGeneration, ErrorWithTag, FormDataArrayHandling, GetterPropType, LogLevels, NamingConvention, OutputClient, OutputHttpClient, OutputMockType, OutputMode, PropertySortOrder, RefComponentSuffix, SchemaType, TEMPLATE_TAG_REGEX, URL_REGEX, VERBS_WITH_BODY, Verbs, _filteredVerbs, addDependency, asyncReduce, camel, combineSchemas, compareVersions, conventionName, count, createDebugger, createLogger, createSuccessMessage, createTypeAliasIfNeeded, dynamicImport, escape, generalJSTypes, generalJSTypesWithArray, generateAxiosOptions, generateBodyMutatorConfig, generateBodyOptions, generateComponentDefinition, generateDependencyImports, generateFormDataAndUrlEncodedFunction, generateImports, generateModelInline, generateModelsInline, generateMutator, generateMutatorConfig, generateMutatorImports, generateMutatorRequestOptions, generateOptions, generateParameterDefinition, generateQueryParamsAxiosConfig, generateSchemasDefinition, generateTarget, generateTargetForTags, generateVerbImports, generateVerbOptions, generateVerbsOptions, getArray, getBody, getDefaultContentType, getEnum, getEnumDescriptions, getEnumImplementation, getEnumNames, getExtension, getFileInfo, getFormDataFieldFileType, getFullRoute, getIsBodyVerb, getKey, getMockFileExtensionByTypeName, getNumberWord, getObject, getOperationId, getOrvalGeneratedTypes, getParameters, getParams, getParamsInPath, getPropertySafe, getProps, getQueryParams, getRefInfo, getResReqTypes, getResponse, getResponseTypeCategory, getRoute, getRouteAsArray, getScalar, getTypedResponse, isBinaryContentType, isBoolean, isDirectory, isFunction, isModule, isNull, isNumber, isNumeric, isObject, isReference, isSchema, isString, isSyntheticDefaultImportsAllow, isUndefined, isUrl, isVerb, jsDoc, jsStringEscape, kebab, keyValuePairsToJsDoc, log, logError, mergeDeep, mismatchArgsMessage, pascal, removeFilesAndEmptyFolders, resolveDiscriminators, resolveExampleRefs, resolveObject, resolveRef, resolveValue, sanitize, snake, sortByPriority, startMessage, stringify, toObjectString, path_exports as upath, upper, writeModelInline, writeModelsInline, writeSchema, writeSchemas, writeSingleMode, writeSplitMode, writeSplitTagsMode, writeTagsMode };
+export { BODY_TYPE_NAME, EnumGeneration, ErrorWithTag, FormDataArrayHandling, GetterPropType, LogLevels, NamingConvention, OutputClient, OutputHttpClient, OutputMockType, OutputMode, PropertySortOrder, RefComponentSuffix, SchemaType, TEMPLATE_TAG_REGEX, URL_REGEX, VERBS_WITH_BODY, Verbs, _filteredVerbs, addDependency, asyncReduce, camel, combineSchemas, compareVersions, conventionName, count, createDebugger, createLogger, createSuccessMessage, createTypeAliasIfNeeded, dynamicImport, escape, fixCrossDirectoryImports, fixRegularSchemaImports, generalJSTypes, generalJSTypesWithArray, generateAxiosOptions, generateBodyMutatorConfig, generateBodyOptions, generateComponentDefinition, generateDependencyImports, generateFormDataAndUrlEncodedFunction, generateImports, generateModelInline, generateModelsInline, generateMutator, generateMutatorConfig, generateMutatorImports, generateMutatorRequestOptions, generateOptions, generateParameterDefinition, generateQueryParamsAxiosConfig, generateSchemasDefinition, generateTarget, generateTargetForTags, generateVerbImports, generateVerbOptions, generateVerbsOptions, getArray, getBody, getDefaultContentType, getEnum, getEnumDescriptions, getEnumImplementation, getEnumNames, getExtension, getFileInfo, getFormDataFieldFileType, getFullRoute, getIsBodyVerb, getKey, getMockFileExtensionByTypeName, getNumberWord, getObject, getOperationId, getOrvalGeneratedTypes, getParameters, getParams, getParamsInPath, getPropertySafe, getProps, getQueryParams, getRefInfo, getResReqTypes, getResponse, getResponseTypeCategory, getRoute, getRouteAsArray, getScalar, getTypedResponse, isBinaryContentType, isBoolean, isDirectory, isFunction, isModule, isNull, isNumber, isNumeric, isObject, isReference, isSchema, isString, isSyntheticDefaultImportsAllow, isUndefined, isUrl, isVerb, jsDoc, jsStringEscape, kebab, keyValuePairsToJsDoc, log, logError, mergeDeep, mismatchArgsMessage, pascal, removeFilesAndEmptyFolders, resolveDiscriminators, resolveExampleRefs, resolveObject, resolveRef, resolveValue, sanitize, snake, sortByPriority, splitSchemasByType, startMessage, stringify, toObjectString, path_exports as upath, upper, writeModelInline, writeModelsInline, writeSchema, writeSchemas, writeSingleMode, writeSplitMode, writeSplitTagsMode, writeTagsMode };
 //# sourceMappingURL=index.mjs.map