@orval/core 8.0.0-rc.5 → 8.0.0

package/README.md

@@ -11,12 +11,10 @@
 
 ### Code Generation
 
-`orval` is able to generate client with appropriate type-signatures (TypeScript) from any valid OpenAPI v3 or Swagger v2 specification, either in `yaml` or `json` formats.
+`orval` generates type-safe JS clients (TypeScript) from any valid OpenAPI v3 or Swagger v2 specification, either in `yaml` or `json` formats.
 
 `Generate`, `valid`, `cache` and `mock` in your React, Vue, Svelte and Angular applications all with your OpenAPI specification.
 
-### Samples
-
 You can find below some samples
 
 - [react app](https://github.com/orval-labs/orval/tree/master/samples/react-app)

package/dist/index.d.mts

@@ -104,6 +104,7 @@ type NormalizedMutator = {
   name?: string;
   default: boolean;
   alias?: Record<string, string>;
+  external?: string[];
   extension?: string;
 };
 type NormalizedOperationOptions = {
@@ -224,6 +225,8 @@ declare const OutputClient: {
   readonly AXIOS: "axios";
   readonly AXIOS_FUNCTIONS: "axios-functions";
   readonly REACT_QUERY: "react-query";
+  readonly SOLID_START: "solid-start";
+  readonly SOLID_QUERY: "solid-query";
   readonly SVELTE_QUERY: "svelte-query";
   readonly VUE_QUERY: "vue-query";
   readonly SWR: "swr";
@@ -299,6 +302,7 @@ type MutatorObject = {
   name?: string;
   default?: boolean;
   alias?: Record<string, string>;
+  external?: string[];
   extension?: string;
 };
 type Mutator = string | MutatorObject;
@@ -473,6 +477,15 @@ type NormalizedZodOptions = {
   dateTimeOptions: ZodDateTimeOptions;
   timeOptions: ZodTimeOptions;
 };
+type InvalidateTarget = string | {
+  query: string;
+  params: string[] | Record<string, string>;
+};
+type MutationInvalidatesRule = {
+  onMutations: string[];
+  invalidates: InvalidateTarget[];
+};
+type MutationInvalidatesConfig = MutationInvalidatesRule[];
 type HonoOptions = {
   handlers?: string;
   compositeRoute?: string;
@@ -499,6 +512,7 @@ type NormalizedQueryOptions = {
   useOperationIdAsQueryKey?: boolean;
   signal?: boolean;
   version?: 3 | 4 | 5;
+  mutationInvalidates?: MutationInvalidatesConfig;
 };
 type QueryOptions = {
   useQuery?: boolean;
@@ -520,6 +534,7 @@ type QueryOptions = {
   useOperationIdAsQueryKey?: boolean;
   signal?: boolean;
   version?: 3 | 4 | 5;
+  mutationInvalidates?: MutationInvalidatesConfig;
 };
 type AngularOptions = {
   provideIn?: 'root' | 'any' | boolean;
@@ -527,6 +542,8 @@ type AngularOptions = {
 type SwrOptions = {
   useInfinite?: boolean;
   useSWRMutationForGet?: boolean;
+  useSuspense?: boolean;
+  generateErrorTypes?: boolean;
   swrOptions?: unknown;
   swrMutationOptions?: unknown;
   swrInfiniteOptions?: unknown;
@@ -648,6 +665,7 @@ type GeneratorImport = {
   values?: boolean;
   syntheticDefaultImport?: boolean;
   namespaceImport?: boolean;
+  importPath?: string;
 };
 type GeneratorDependency = {
   exports: GeneratorImport[];
@@ -1729,7 +1747,38 @@ declare const sortByPriority: <T>(arr: (T & {
 })[];
 //#endregion
 //#region src/utils/string.d.ts
+/**
+ * Converts data to a string representation suitable for code generation.
+ * Handles strings, numbers, booleans, functions, arrays, and objects.
+ *
+ * @param data - The data to stringify. Can be a string, array, object, number, boolean, function, null, or undefined.
+ * @returns A string representation of the data, or undefined if data is null or undefined.
+ * @example
+ * stringify('hello') // returns "'hello'"
+ * stringify(42) // returns "42"
+ * stringify([1, 2, 3]) // returns "[1, 2, 3]"
+ * stringify({ a: 1, b: 'test' }) // returns "{ a: 1, b: 'test', }"
+ */
 declare function stringify(data?: string | any[] | Record<string, any>): string | undefined;
+/**
+ * Sanitizes a string value by removing or replacing special characters and ensuring
+ * it conforms to JavaScript identifier naming rules if needed.
+ *
+ * @param value - The string value to sanitize.
+ * @param options - Configuration options for sanitization:
+ *   - `whitespace` - Replacement string for whitespace characters, or `true` to keep them.
+ *   - `underscore` - Replacement string for underscores, or `true` to keep them.
+ *   - `dot` - Replacement string for dots, or `true` to keep them.
+ *   - `dash` - Replacement string for dashes, or `true` to keep them.
+ *   - `es5keyword` - If true, prefixes the value with underscore if it's an ES5 keyword.
+ *   - `es5IdentifierName` - If true, ensures the value is a valid ES5 identifier name.
+ *   - `special` - If true, preserves special characters that would otherwise be removed.
+ * @returns The sanitized string value.
+ * @example
+ * sanitize('hello-world', { dash: '_' }) // returns "hello_world"
+ * sanitize('class', { es5keyword: true }) // returns "_class"
+ * sanitize('123abc', { es5IdentifierName: true }) // returns "N123abc"
+ */
 declare function sanitize(value: string, options?: {
   whitespace?: string | true;
   underscore?: string | true;
@@ -1739,8 +1788,40 @@ declare function sanitize(value: string, options?: {
   es5IdentifierName?: boolean;
   special?: boolean;
 }): string;
+/**
+ * Converts an array of objects to a comma-separated string representation.
+ * Optionally extracts a nested property from each object using a dot-notation path.
+ *
+ * @param props - Array of objects to convert to string.
+ * @param path - Optional dot-notation path to extract a property from each object (e.g., "user.name").
+ * @returns A comma-separated string of values, with each value on a new line indented.
+ * @example
+ * toObjectString([{ name: 'John' }, { name: 'Jane' }], 'name')
+ * // returns "John,\n    Jane,"
+ * toObjectString(['a', 'b', 'c'])
+ * // returns "a,\n    b,\n    c,"
+ */
 declare function toObjectString<T>(props: T[], path?: keyof T): string;
+/**
+ * Converts a number to its word representation by translating each digit to its word form.
+ *
+ * @param num - The number to convert to words.
+ * @returns A string containing the word representation of each digit concatenated together.
+ * @example
+ * getNumberWord(123) // returns "onetwothree"
+ * getNumberWord(42) // returns "fourtwo"
+ */
 declare function getNumberWord(num: number): string;
+/**
+ * Escapes a specific character in a string by prefixing it with a backslash.
+ *
+ * @param str - The string to escape, or null.
+ * @param char - The character to escape. Defaults to single quote (').
+ * @returns The escaped string, or null if the input is null.
+ * @example
+ * escape("don't") // returns "don\'t"
+ * escape('say "hello"', '"') // returns 'say \\"hello\\"'
+ */
 declare function escape(str: string | null, char?: string): string | undefined;
 /**
  * Escape all characters not included in SingleStringCharacters and
@@ -1840,5 +1921,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, JsDocOptions, LogLevel, LogLevels, LogOptions, LogType, Logger, LoggerOptions, MockData, MockDataArray, MockDataArrayFn, MockDataObject, MockDataObjectFn, MockOptions, MockProperties, MockPropertiesObject, MockPropertiesObjectFn, 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, 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 };
 //# sourceMappingURL=index.d.mts.map

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { t as __export } from "./chunk-C6wwvPpM.mjs";
-import { entries, isArray, isEmptyish, prop, unique, uniqueBy, uniqueWith } from "remeda";
+import { entries, groupBy, isArray, isEmptyish, prop, unique, uniqueBy, uniqueWith } from "remeda";
 import { keyword } from "esutils";
 import path from "node:path";
 import fs from "node:fs";
@@ -36,6 +36,8 @@ const OutputClient = {
 	AXIOS: "axios",
 	AXIOS_FUNCTIONS: "axios-functions",
 	REACT_QUERY: "react-query",
+	SOLID_START: "solid-start",
+	SOLID_QUERY: "solid-query",
 	SVELTE_QUERY: "svelte-query",
 	VUE_QUERY: "vue-query",
 	SWR: "swr",
@@ -674,6 +676,18 @@ const sortByPriority = (arr) => arr.sort((a, b) => {
 
 //#endregion
 //#region src/utils/string.ts
+/**
+* Converts data to a string representation suitable for code generation.
+* Handles strings, numbers, booleans, functions, arrays, and objects.
+*
+* @param data - The data to stringify. Can be a string, array, object, number, boolean, function, null, or undefined.
+* @returns A string representation of the data, or undefined if data is null or undefined.
+* @example
+* stringify('hello') // returns "'hello'"
+* stringify(42) // returns "42"
+* stringify([1, 2, 3]) // returns "[1, 2, 3]"
+* stringify({ a: 1, b: 'test' }) // returns "{ a: 1, b: 'test', }"
+*/
 function stringify(data) {
 	if (isUndefined(data) || isNull(data)) return;
 	if (isString(data)) return `'${data.replaceAll("'", String.raw`\'`)}'`;
@@ -687,6 +701,25 @@ function stringify(data) {
 		return acc + `${key}: ${strValue}, `;
 	}, "");
 }
+/**
+* Sanitizes a string value by removing or replacing special characters and ensuring
+* it conforms to JavaScript identifier naming rules if needed.
+*
+* @param value - The string value to sanitize.
+* @param options - Configuration options for sanitization:
+*   - `whitespace` - Replacement string for whitespace characters, or `true` to keep them.
+*   - `underscore` - Replacement string for underscores, or `true` to keep them.
+*   - `dot` - Replacement string for dots, or `true` to keep them.
+*   - `dash` - Replacement string for dashes, or `true` to keep them.
+*   - `es5keyword` - If true, prefixes the value with underscore if it's an ES5 keyword.
+*   - `es5IdentifierName` - If true, ensures the value is a valid ES5 identifier name.
+*   - `special` - If true, preserves special characters that would otherwise be removed.
+* @returns The sanitized string value.
+* @example
+* sanitize('hello-world', { dash: '_' }) // returns "hello_world"
+* sanitize('class', { es5keyword: true }) // returns "_class"
+* sanitize('123abc', { es5IdentifierName: true }) // returns "N123abc"
+*/
 function sanitize(value, options) {
 	const { whitespace = "", underscore = "", dot = "", dash = "", es5keyword = false, es5IdentifierName = false, special = false } = options ?? {};
 	let newValue = value;
@@ -700,6 +733,19 @@ function sanitize(value, options) {
 	else newValue = keyword.isIdentifierNameES5(newValue) ? newValue : `_${newValue}`;
 	return newValue;
 }
+/**
+* Converts an array of objects to a comma-separated string representation.
+* Optionally extracts a nested property from each object using a dot-notation path.
+*
+* @param props - Array of objects to convert to string.
+* @param path - Optional dot-notation path to extract a property from each object (e.g., "user.name").
+* @returns A comma-separated string of values, with each value on a new line indented.
+* @example
+* toObjectString([{ name: 'John' }, { name: 'Jane' }], 'name')
+* // returns "John,\n    Jane,"
+* toObjectString(['a', 'b', 'c'])
+* // returns "a,\n    b,\n    c,"
+*/
 function toObjectString(props, path$2) {
 	if (props.length === 0) return "";
 	return (typeof path$2 === "string" ? props.map((prop$1) => path$2.split(".").reduce((obj, key) => obj && typeof obj === "object" ? obj[key] : void 0, prop$1)) : props).join(",\n    ") + ",";
@@ -716,9 +762,28 @@ const NUMBERS = {
 	"8": "eight",
 	"9": "nine"
 };
+/**
+* Converts a number to its word representation by translating each digit to its word form.
+*
+* @param num - The number to convert to words.
+* @returns A string containing the word representation of each digit concatenated together.
+* @example
+* getNumberWord(123) // returns "onetwothree"
+* getNumberWord(42) // returns "fourtwo"
+*/
 function getNumberWord(num) {
 	return num.toString().split("").reduce((acc, n) => acc + NUMBERS[n], "");
 }
+/**
+* Escapes a specific character in a string by prefixing it with a backslash.
+*
+* @param str - The string to escape, or null.
+* @param char - The character to escape. Defaults to single quote (').
+* @returns The escaped string, or null if the input is null.
+* @example
+* escape("don't") // returns "don\'t"
+* escape('say "hello"', '"') // returns 'say \\"hello\\"'
+*/
 function escape(str, char = "'") {
 	return str?.replace(char, `\\${char}`);
 }
@@ -776,7 +841,6 @@ const getTypeConstEnum = (value, enumName, names, descriptions, enumNamingConven
 	enumValue += ";\n";
 	const implementation = getEnumImplementation(value, names, descriptions, enumNamingConvention);
 	enumValue += "\n\n";
-	enumValue += "// eslint-disable-next-line @typescript-eslint/no-redeclare\n";
 	enumValue += `export const ${enumName} = {\n${implementation}} as const;\n`;
 	return enumValue;
 };
@@ -944,12 +1008,13 @@ function resolveValue({ schema, name, context }) {
 		const { schema: schemaObject, imports } = resolveRef(schema, context);
 		const resolvedImport = imports[0];
 		let hasReadonlyProps = false;
-		if (!name || !context.parents?.includes(name)) hasReadonlyProps = getScalar({
+		const refName = resolvedImport.name;
+		if (!context.parents?.includes(refName)) hasReadonlyProps = getScalar({
 			item: schemaObject,
-			name: resolvedImport.name,
+			name: refName,
 			context: {
 				...context,
-				...name ? { parents: [...context.parents ?? [], name] } : {}
+				parents: [...context.parents ?? [], refName]
 			}
 		}).hasReadonlyProps;
 		const nullable = Array.isArray(schemaObject.type) && schemaObject.type.includes("null") ? " | null" : "";
@@ -1014,7 +1079,8 @@ function resolveObjectOriginal({ schema, propName, combined = false, context })
 		};
 	}
 	if (propName && resolvedValue.isEnum && !combined && !resolvedValue.isRef) {
-		const enumValue = getEnum(resolvedValue.value, propName, getEnumNames(resolvedValue.originalSchema), context.output.override.enumGenerationType, getEnumDescriptions(resolvedValue.originalSchema), context.output.override.namingConvention?.enum);
+		const enumGenerationType = context.output.override.enumGenerationType;
+		const enumValue = getEnum(resolvedValue.value, propName, getEnumNames(resolvedValue.originalSchema), enumGenerationType, getEnumDescriptions(resolvedValue.originalSchema), context.output.override.namingConvention?.enum);
 		return {
 			value: propName,
 			imports: [{ name: propName }],
@@ -1029,7 +1095,7 @@ function resolveObjectOriginal({ schema, propName, combined = false, context })
 			originalSchema: resolvedValue.originalSchema,
 			isRef: resolvedValue.isRef,
 			hasReadonlyProps: resolvedValue.hasReadonlyProps,
-			dependencies: resolvedValue.dependencies
+			dependencies: [...resolvedValue.dependencies, propName]
 		};
 	}
 	return resolvedValue;
@@ -1375,7 +1441,7 @@ function combineSchemas({ name, schema, separator: separator$1, context, nullabl
 		requiredProperties: separator$1 === "allOf" ? schema.required ?? [] : []
 	});
 	if (resolvedData.isEnum.every(Boolean) && name && items.length > 1 && separator$1 !== "oneOf") {
-		const newEnum = `// eslint-disable-next-line @typescript-eslint/no-redeclare\nexport const ${pascal(name)} = ${getCombineEnumValue(resolvedData)}`;
+		const newEnum = `export const ${pascal(name)} = ${getCombineEnumValue(resolvedData)}`;
 		return {
 			value: `typeof ${pascal(name)}[keyof typeof ${pascal(name)}] ${nullable}`,
 			imports: [{ name: pascal(name) }],
@@ -1516,17 +1582,28 @@ function getObject({ item, name, context, nullable, propertyOverrides }) {
 			if (!index) acc.value += "{";
 			const doc = jsDoc(schema, true, context);
 			acc.hasReadonlyProps ||= isReadOnly || false;
-			const aliasedImports = getAliasedImports({
+			const constValue = "const" in schema ? schema.const : void 0;
+			const hasConst = constValue !== void 0;
+			let constLiteral;
+			if (!hasConst) constLiteral = void 0;
+			else if (typeof constValue === "string") constLiteral = `'${escape(constValue)}'`;
+			else constLiteral = JSON.stringify(constValue);
+			const needsValueImport = hasConst && (resolvedValue.isEnum || resolvedValue.type === "enum");
+			const aliasedImports = needsValueImport ? resolvedValue.imports.map((imp) => ({
+				...imp,
+				isConstant: true
+			})) : hasConst ? [] : getAliasedImports({
 				name,
 				context,
 				resolvedValue
 			});
-			acc.imports.push(...aliasedImports);
-			const propValue = getImportAliasForRefOrValue({
+			if (aliasedImports.length > 0) acc.imports.push(...aliasedImports);
+			const alias = getImportAliasForRefOrValue({
 				context,
 				resolvedValue,
 				imports: aliasedImports
 			});
+			const propValue = needsValueImport ? alias : constLiteral ?? alias;
 			acc.value += `\n  ${doc ? `${doc}  ` : ""}${isReadOnly && !context.output.override.suppressReadonlyModifier ? "readonly " : ""}${getKey(key)}${isRequired ? "" : "?"}: ${propValue};`;
 			acc.schemas.push(...resolvedValue.schemas);
 			acc.dependencies.push(...resolvedValue.dependencies);
@@ -1657,9 +1734,9 @@ function getResReqTypes(responsesOrRequests, name, context, defaultType = "unkno
 				isEnum: false,
 				isRef: true,
 				hasReadonlyProps: false,
-				originalSchema: mediaType.schema,
-				example: mediaType.example,
-				examples: resolveExampleRefs(mediaType.examples, context),
+				originalSchema: mediaType?.schema,
+				example: mediaType?.example,
+				examples: resolveExampleRefs(mediaType?.examples, context),
 				key,
 				contentType
 			}];
@@ -2472,9 +2549,15 @@ function generateComponentDefinition(responses = {}, context, suffix) {
 //#region src/generators/imports.ts
 function generateImports({ imports, namingConvention = NamingConvention.CAMEL_CASE }) {
 	if (imports.length === 0) return "";
-	return uniqueWith(imports, (a, b) => a.name === b.name && a.default === b.default).toSorted().map(({ name, values, alias, isConstant }) => {
-		const fileName = conventionName(name, namingConvention);
-		return `import ${!values && !isConstant ? "type " : ""}{ ${name}${alias ? ` as ${alias}` : ""} } from './${fileName}';`;
+	const grouped = groupBy(uniqueWith(imports, (a, b) => a.name === b.name && a.default === b.default).map((imp) => ({
+		...imp,
+		importPath: imp.importPath ?? `./${conventionName(imp.name, namingConvention)}`
+	})), (imp) => !imp.default && !imp.namespaceImport && !imp.syntheticDefaultImport && !imp.values && !imp.isConstant ? `aggregate|${imp.importPath}` : `single|${imp.importPath}|${imp.name}|${imp.alias ?? ""}|${String(imp.default)}|${String(imp.namespaceImport)}|${String(imp.syntheticDefaultImport)}|${String(imp.values)}|${String(imp.isConstant)}`);
+	return Object.entries(grouped).toSorted(([a], [b]) => a.localeCompare(b)).map(([, group]) => {
+		const sample = group[0];
+		if (!sample.default && !sample.namespaceImport && !sample.syntheticDefaultImport && !sample.values && !sample.isConstant) return `import type { ${[...new Set(group.map(({ name: name$1, alias: alias$1 }) => `${name$1}${alias$1 ? ` as ${alias$1}` : ""}`))].toSorted().join(", ")} } from '${sample.importPath}';`;
+		const { name, values, alias, isConstant, importPath } = sample;
+		return `import ${!values && !isConstant ? "type " : ""}{ ${name}${alias ? ` as ${alias}` : ""} } from '${importPath}';`;
 	}).join("\n");
 }
 function generateMutatorImports({ mutators, implementation, oneMore }) {
@@ -2604,10 +2687,10 @@ function generateModelsInline(obj) {
 //#endregion
 //#region src/generators/mutator-info.ts
 async function getMutatorInfo(filePath, options) {
-	const { root = process.cwd(), namedExport = "default", alias, tsconfig } = options ?? {};
-	return parseFile(await bundleFile(root, path.resolve(filePath), alias, tsconfig?.compilerOptions), namedExport, getEcmaVersion(tsconfig?.compilerOptions?.target));
+	const { root = process.cwd(), namedExport = "default", alias, external, tsconfig } = options ?? {};
+	return parseFile(await bundleFile(root, path.resolve(filePath), alias, external, tsconfig?.compilerOptions), namedExport, getEcmaVersion(tsconfig?.compilerOptions?.target));
 }
-async function bundleFile(root, fileName, alias, compilerOptions) {
+async function bundleFile(root, fileName, alias, external, compilerOptions) {
 	const { text } = (await build({
 		absWorkingDir: root,
 		entryPoints: [fileName],
@@ -2623,7 +2706,8 @@ async function bundleFile(root, fileName, alias, compilerOptions) {
 		minifyWhitespace: false,
 		treeShaking: false,
 		keepNames: false,
-		alias
+		alias,
+		external: external || ["*"]
 	})).outputFiles[0];
 	return text;
 }
@@ -2723,6 +2807,7 @@ async function generateMutator({ output, mutator, name, workspace, tsconfig }) {
 		root: path.resolve(workspace),
 		namedExport: mutatorInfoName,
 		alias: mutator.alias,
+		external: mutator.external,
 		tsconfig
 	});
 	if (!mutatorInfo) throw new Error(chalk.red(`Your mutator file doesn't have the ${mutatorInfoName} exported function`));
@@ -3195,6 +3280,54 @@ function _filteredVerbs(verbs, filters) {
 
 //#endregion
 //#region src/writers/schemas.ts
+function getSchemaKey(schemaPath, schemaName, namingConvention, fileExtension) {
+	return getPath(schemaPath, conventionName(schemaName, namingConvention), fileExtension).toLowerCase().replaceAll("\\", "/");
+}
+function getSchemaGroups(schemaPath, schemas, namingConvention, fileExtension) {
+	return groupBy(schemas, (schema) => getSchemaKey(schemaPath, schema.name, namingConvention, fileExtension));
+}
+function getCanonicalMap(schemaGroups, schemaPath, namingConvention, fileExtension) {
+	const canonicalPathMap = /* @__PURE__ */ new Map();
+	for (const [key, groupSchemas] of Object.entries(schemaGroups)) {
+		const canonicalPath = getPath(schemaPath, conventionName(groupSchemas[0].name, namingConvention), fileExtension);
+		canonicalPathMap.set(key, {
+			importPath: canonicalPath,
+			name: groupSchemas[0].name
+		});
+	}
+	return canonicalPathMap;
+}
+function normalizeCanonicalImportPaths(schemas, canonicalPathMap, schemaPath, namingConvention, fileExtension) {
+	for (const schema of schemas) schema.imports = schema.imports.map((imp) => {
+		const resolvedImportKey = resolveImportKey(schemaPath, imp.importPath ?? `./${conventionName(imp.name, namingConvention)}`, fileExtension);
+		const canonical = canonicalPathMap.get(resolvedImportKey);
+		if (!canonical?.importPath) return imp;
+		const importPath = removeFileExtension(relativeSafe(schemaPath, canonical.importPath.replaceAll("\\", "/")), fileExtension);
+		return {
+			...imp,
+			importPath
+		};
+	});
+}
+function mergeSchemaGroup(schemas) {
+	const baseSchemaName = schemas[0].name;
+	const baseSchema = schemas[0].schema;
+	const mergedImports = [...new Map(schemas.flatMap((schema) => schema.imports).map((imp) => [JSON.stringify(imp), imp])).values()];
+	const mergedDependencies = [...new Set(schemas.flatMap((schema) => schema.dependencies ?? []))];
+	return {
+		name: baseSchemaName,
+		schema: baseSchema,
+		model: schemas.map((schema) => schema.model).join("\n"),
+		imports: mergedImports,
+		dependencies: mergedDependencies
+	};
+}
+function resolveImportKey(schemaPath, importPath, fileExtension) {
+	return join(schemaPath, `${importPath}${fileExtension}`).toLowerCase().replaceAll("\\", "/");
+}
+function removeFileExtension(path$2, fileExtension) {
+	return path$2.endsWith(fileExtension) ? path$2.slice(0, path$2.length - fileExtension.length) : path$2;
+}
 function getSchema({ schema: { imports, model }, target, header, namingConvention = NamingConvention.CAMEL_CASE }) {
 	let file = header;
 	file += generateImports({
@@ -3206,7 +3339,9 @@ function getSchema({ schema: { imports, model }, target, header, namingConventio
 	file += model;
 	return file;
 }
-const getPath = (path$2, name, fileExtension) => join(path$2, `/${name}${fileExtension}`);
+function getPath(path$2, name, fileExtension) {
+	return join(path$2, `/${name}${fileExtension}`);
+}
 function writeModelInline(acc, model) {
 	return acc + `${model}\n`;
 }
@@ -3229,28 +3364,34 @@ async function writeSchema({ path: path$2, schema, target, namingConvention, fil
 	}
 }
 async function writeSchemas({ schemaPath, schemas, target, namingConvention, fileExtension, header, indexFiles }) {
-	await Promise.all(schemas.map(async (schema) => {
+	const schemaGroups = getSchemaGroups(schemaPath, schemas, namingConvention, fileExtension);
+	normalizeCanonicalImportPaths(schemas, getCanonicalMap(schemaGroups, schemaPath, namingConvention, fileExtension), schemaPath, namingConvention, fileExtension);
+	for (const groupSchemas of Object.values(schemaGroups)) {
+		if (groupSchemas.length === 1) {
+			await writeSchema({
+				path: schemaPath,
+				schema: groupSchemas[0],
+				target,
+				namingConvention,
+				fileExtension,
+				header
+			});
+			continue;
+		}
 		await writeSchema({
 			path: schemaPath,
-			schema,
+			schema: mergeSchemaGroup(groupSchemas),
 			target,
 			namingConvention,
 			fileExtension,
 			header
 		});
-	}));
+	}
 	if (indexFiles) {
 		const schemaFilePath = join(schemaPath, `/index${fileExtension}`);
 		await fs$1.ensureFile(schemaFilePath);
 		const ext = fileExtension.endsWith(".ts") ? fileExtension.slice(0, -3) : fileExtension;
-		const conventionNamesSet = /* @__PURE__ */ new Set();
-		const duplicateNamesMap = /* @__PURE__ */ new Map();
-		for (const schema of schemas) {
-			const conventionNameValue = conventionName(schema.name, namingConvention);
-			if (conventionNamesSet.has(conventionNameValue)) duplicateNamesMap.set(conventionNameValue, (duplicateNamesMap.get(conventionNameValue) ?? 0) + 1);
-			else conventionNamesSet.add(conventionNameValue);
-		}
-		if (duplicateNamesMap.size > 0) throw new Error("Duplicate schema names detected (after naming convention):\n" + [...duplicateNamesMap].map((duplicate) => `  ${duplicate[1] + 1}x ${duplicate[0]}`).join("\n"));
+		const conventionNamesSet = new Set(Object.values(schemaGroups).map((group) => conventionName(group[0].name, namingConvention)));
 		try {
 			const fileContent = `${header}\n${[...conventionNamesSet].map((schemaName) => `export * from './${schemaName}${ext}';`).toSorted((a, b) => a.localeCompare(b)).join("\n")}`;
 			await fs$1.writeFile(schemaFilePath, fileContent, { encoding: "utf8" });