@orval/core 8.0.0 → 8.0.2

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;
@@ -1339,8 +1346,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
@@ -1544,6 +1551,20 @@ interface ResolveOptions {
   combined?: boolean;
   context: ContextSpec;
 }
+interface CreateTypeAliasOptions {
+  resolvedValue: ResolverValue;
+  propName: string | undefined;
+  context: ContextSpec;
+}
+/**
+ * Wraps inline object type in a type alias.
+ * E.g. `{ foo: string }` → value becomes `FooBody`, schema gets `export type FooBody = { foo: string };`
+ */
+declare function createTypeAliasIfNeeded({
+  resolvedValue,
+  propName,
+  context
+}: CreateTypeAliasOptions): ScalarValue | undefined;
 declare function resolveObject({
   schema,
   propName,
@@ -1838,6 +1859,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 {
@@ -1921,5 +1957,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, 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

@@ -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: [{
@@ -1046,41 +1050,57 @@ function resolveValue({ schema, name, context }) {
 
 //#endregion
 //#region src/resolvers/object.ts
+/**
+* Wraps inline object type in a type alias.
+* E.g. `{ foo: string }` → value becomes `FooBody`, schema gets `export type FooBody = { foo: string };`
+*/
+function createTypeAliasIfNeeded({ resolvedValue, propName, context }) {
+	if (!propName) return;
+	if (resolvedValue.isEnum || resolvedValue.type !== "object") return;
+	const aliasPattern = context.output.override.aliasCombinedTypes ? "{|&|\\|" : "{";
+	if (!new RegExp(aliasPattern).test(resolvedValue.value)) return;
+	const { originalSchema } = resolvedValue;
+	const doc = jsDoc(originalSchema);
+	const isConstant = "const" in originalSchema;
+	const constantIsString = "type" in originalSchema && (originalSchema.type === "string" || Array.isArray(originalSchema.type) && originalSchema.type.includes("string"));
+	const model = isConstant ? `${doc}export const ${propName} = ${constantIsString ? `'${originalSchema.const}'` : originalSchema.const} as const;\n` : `${doc}export type ${propName} = ${resolvedValue.value};\n`;
+	return {
+		value: propName,
+		imports: [{
+			name: propName,
+			isConstant
+		}],
+		schemas: [...resolvedValue.schemas, {
+			name: propName,
+			model,
+			imports: resolvedValue.imports,
+			dependencies: resolvedValue.dependencies
+		}],
+		isEnum: false,
+		type: "object",
+		isRef: resolvedValue.isRef,
+		hasReadonlyProps: resolvedValue.hasReadonlyProps,
+		dependencies: resolvedValue.dependencies
+	};
+}
 function resolveObjectOriginal({ schema, propName, combined = false, context }) {
 	const resolvedValue = resolveValue({
 		schema,
 		name: propName,
 		context
 	});
-	const doc = jsDoc(resolvedValue.originalSchema ?? {});
-	if (propName && !resolvedValue.isEnum && resolvedValue?.type === "object" && new RegExp(context.output.override.aliasCombinedTypes ? String.raw`{|&|\|` : "{").test(resolvedValue.value)) {
-		let model = "";
-		const isConstant = "const" in schema;
-		const constantIsString = "type" in schema && (schema.type === "string" || Array.isArray(schema.type) && schema.type.includes("string"));
-		model += isConstant ? `${doc}export const ${propName} = ${constantIsString ? `'${schema.const}'` : schema.const} as const;\n` : `${doc}export type ${propName} = ${resolvedValue.value};\n`;
-		return {
-			value: propName,
-			imports: [{
-				name: propName,
-				isConstant
-			}],
-			schemas: [...resolvedValue.schemas, {
-				name: propName,
-				model,
-				imports: resolvedValue.imports,
-				dependencies: resolvedValue.dependencies
-			}],
-			isEnum: false,
-			type: "object",
-			originalSchema: resolvedValue.originalSchema,
-			isRef: resolvedValue.isRef,
-			hasReadonlyProps: resolvedValue.hasReadonlyProps,
-			dependencies: resolvedValue.dependencies
-		};
-	}
+	const aliased = createTypeAliasIfNeeded({
+		resolvedValue,
+		propName,
+		context
+	});
+	if (aliased) return {
+		...aliased,
+		originalSchema: resolvedValue.originalSchema
+	};
 	if (propName && resolvedValue.isEnum && !combined && !resolvedValue.isRef) {
-		const enumGenerationType = context.output.override.enumGenerationType;
-		const enumValue = getEnum(resolvedValue.value, propName, getEnumNames(resolvedValue.originalSchema), enumGenerationType, getEnumDescriptions(resolvedValue.originalSchema), context.output.override.namingConvention?.enum);
+		const doc = jsDoc(resolvedValue.originalSchema ?? {});
+		const enumValue = getEnum(resolvedValue.value, propName, getEnumNames(resolvedValue.originalSchema), context.output.override.enumGenerationType, getEnumDescriptions(resolvedValue.originalSchema), context.output.override.namingConvention?.enum);
 		return {
 			value: propName,
 			imports: [{ name: propName }],
@@ -1220,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) {
@@ -1846,6 +1866,16 @@ function getResReqTypes(responsesOrRequests, name, context, defaultType = "unkno
 			...x,
 			key
 		}));
+		const swaggerSchema = "schema" in res ? res.schema : void 0;
+		if (swaggerSchema) return [{
+			...resolveObject({
+				schema: swaggerSchema,
+				propName: key ? pascal(name) + pascal(key) : void 0,
+				context
+			}),
+			contentType: "application/json",
+			key
+		}];
 		return [{
 			value: defaultType,
 			imports: [],
@@ -1951,13 +1981,21 @@ function resolveFormDataRootObject({ schemaOrRef, propName, context, encoding })
 		};
 	}
 	if (Object.keys(propertyOverrides).length === 0) return;
-	return getObject({
+	const result = getObject({
 		item: schema,
 		name: propName,
 		context,
 		nullable: "",
 		propertyOverrides
 	});
+	return createTypeAliasIfNeeded({
+		resolvedValue: {
+			...result,
+			originalSchema: schema
+		},
+		propName,
+		context
+	}) ?? result;
 }
 function getFormDataAdditionalImports({ schemaObject, context }) {
 	const { schema } = resolveRef(schemaObject, context);
@@ -3280,6 +3318,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: join(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("\\", "/");
 }
@@ -3978,5 +4080,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, 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