@orval/core 8.0.3 → 8.1.0

package/dist/index.d.mts

@@ -99,6 +99,11 @@ type NormalizedOverrideOutput = {
   suppressReadonlyModifier?: boolean;
   jsDoc: NormalizedJsDocOptions;
   aliasCombinedTypes: boolean;
+  /**
+   * When enabled, optional properties will be typed as `T | null` instead of just `T`.
+   * @default false
+   */
+  useNullForOptional?: boolean;
 };
 type NormalizedMutator = {
   path: string;
@@ -386,6 +391,11 @@ type OverrideOutput = {
   suppressReadonlyModifier?: boolean;
   jsDoc?: JsDocOptions;
   aliasCombinedTypes?: boolean;
+  /**
+   * When enabled, optional properties will be typed as `T | null` instead of just `T`.
+   * @default false
+   */
+  useNullForOptional?: boolean;
 };
 type JsDocOptions = {
   filter?: (schema: Record<string, any>) => {
@@ -654,6 +664,8 @@ interface PackageJson {
   dependencies?: Record<string, string>;
   devDependencies?: Record<string, string>;
   peerDependencies?: Record<string, string>;
+  catalog?: Record<string, string>;
+  catalogs?: Record<string, Record<string, string>>;
 }
 type GeneratorSchema = {
   name: string;
@@ -924,6 +936,7 @@ declare const SchemaType: {
 };
 type ScalarValue = {
   value: string;
+  useTypeAlias?: boolean;
   isEnum: boolean;
   hasReadonlyProps: boolean;
   type: SchemaType;
@@ -1356,6 +1369,18 @@ declare function getEnumNames(schemaObject: OpenApiSchemaObject | undefined): st
 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;
+type CombinedEnumInput = {
+  value: string;
+  isRef: boolean;
+  schema: OpenApiSchemaObject | undefined;
+};
+type CombinedEnumValue = {
+  value: string;
+  valueImports: string[];
+  hasNull: boolean;
+};
+declare function getEnumUnionFromSchema(schema: OpenApiSchemaObject | undefined): any;
+declare function getCombinedEnumValue(inputs: CombinedEnumInput[]): CombinedEnumValue;
 //#endregion
 //#region src/getters/keys.d.ts
 declare function getKey(key: string): string;
@@ -1860,6 +1885,11 @@ declare function escape(str: string | null, char?: string): string | undefined;
  * @param input String to escape
  */
 declare function jsStringEscape(input: string): string;
+/**
+ * Deduplicates a TypeScript union type string.
+ * Handles types like "A | B | B" → "A | B" and "null | null" → "null".
+ */
+declare function dedupeUnionType(unionType: string): string;
 //#endregion
 //#region src/utils/tsconfig.d.ts
 declare function isSyntheticDefaultImportsAllow(config?: Tsconfig): boolean;
@@ -1963,5 +1993,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, 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 };
+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, dedupeUnionType, 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, getCombinedEnumValue, getDefaultContentType, getEnum, getEnumDescriptions, getEnumImplementation, getEnumNames, getEnumUnionFromSchema, getExtension, getFileInfo, getFormDataFieldFileType, getFullRoute, getIsBodyVerb, getKey, getMockFileExtensionByTypeName, getNumberWord, getObject, getOperationId, getOrvalGeneratedTypes, getParameters, getParams, getParamsInPath, getPropertySafe, getProps, getQueryParams, getRefInfo, getResReqTypes, getResponse, getResponseTypeCategory, getRoute, getRouteAsArray, getScalar, 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

@@ -810,6 +810,14 @@ function jsStringEscape(input) {
 		}
 	});
 }
+/**
+* Deduplicates a TypeScript union type string.
+* Handles types like "A | B | B" → "A | B" and "null | null" → "null".
+*/
+function dedupeUnionType(unionType) {
+	const parts = unionType.split("|").map((part) => part.trim());
+	return [...new Set(parts)].join(" | ");
+}
 
 //#endregion
 //#region src/utils/tsconfig.ts
@@ -895,6 +903,76 @@ const toNumberKey = (value) => {
 const getUnion = (value, enumName) => {
 	return `export type ${enumName} = ${value};`;
 };
+function getEnumUnionFromSchema(schema) {
+	if (!schema?.enum) return "";
+	return schema.enum.filter((val) => val !== null).map((val) => isString(val) ? `'${escape(val)}'` : `${val}`).join(" | ");
+}
+const stripNullUnion = (value) => value.replace(/\s*\|\s*null/g, "").trim();
+const isSpreadableEnumRef = (schema, refName) => {
+	if (!schema?.enum || !refName) return false;
+	if (!getEnumUnionFromSchema(schema)) return false;
+	const type = schema.type;
+	if (type === "boolean" || Array.isArray(type) && type.includes("boolean")) return false;
+	return /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(refName);
+};
+const buildInlineEnum = (schema, enumValue) => {
+	const names = getEnumNames(schema);
+	const descriptions = getEnumDescriptions(schema);
+	return getEnumImplementation(enumValue ?? getEnumUnionFromSchema(schema), names, descriptions);
+};
+function getCombinedEnumValue(inputs) {
+	const valueImports = [];
+	const hasNull = inputs.some((input) => {
+		if (input.value.includes("| null")) return true;
+		const schema = input.schema;
+		if (!schema) return false;
+		if (schema.nullable === true) return true;
+		if (Array.isArray(schema.type) && schema.type.includes("null")) return true;
+		return schema.enum?.includes(null) ?? false;
+	});
+	const addValueImport = (name) => {
+		if (!valueImports.includes(name)) valueImports.push(name);
+	};
+	if (inputs.length === 1) {
+		const input = inputs[0];
+		if (input.isRef) {
+			const refName = stripNullUnion(input.value);
+			if (isSpreadableEnumRef(input.schema, refName)) {
+				addValueImport(refName);
+				return {
+					value: refName,
+					valueImports,
+					hasNull
+				};
+			}
+			return {
+				value: `{${buildInlineEnum(input.schema)}} as const`,
+				valueImports,
+				hasNull
+			};
+		}
+		return {
+			value: `{${buildInlineEnum(input.schema, stripNullUnion(input.value))}} as const`,
+			valueImports,
+			hasNull
+		};
+	}
+	return {
+		value: `{${inputs.map((input) => {
+			if (input.isRef) {
+				const refName = stripNullUnion(input.value);
+				if (isSpreadableEnumRef(input.schema, refName)) {
+					addValueImport(refName);
+					return `...${refName},`;
+				}
+				return buildInlineEnum(input.schema);
+			}
+			return buildInlineEnum(input.schema, stripNullUnion(input.value));
+		}).join("")}} as const`,
+		valueImports,
+		hasNull
+	};
+}
 
 //#endregion
 //#region src/getters/ref.ts
@@ -1461,13 +1539,20 @@ function combineSchemas({ name, schema, separator: separator$1, context, nullabl
 		examples: resolveExampleRefs(schema.examples, context),
 		requiredProperties: separator$1 === "allOf" ? schema.required ?? [] : []
 	});
-	if (resolvedData.isEnum.every(Boolean) && name && items.length > 1 && separator$1 !== "oneOf") {
-		const newEnum = `export const ${pascal(name)} = ${getCombineEnumValue(resolvedData)}`;
+	if (resolvedData.isEnum.every(Boolean) && name && items.length > 1 && context.output.override.enumGenerationType !== EnumGeneration.UNION) {
+		const { value: combinedEnumValue, valueImports, hasNull } = getCombinedEnumValue(resolvedData.values.map((value, index) => ({
+			value,
+			isRef: resolvedData.isRef[index],
+			schema: resolvedData.originalSchema[index]
+		})));
+		const newEnum = `export const ${pascal(name)} = ${combinedEnumValue}`;
+		const valueImportSet = new Set(valueImports);
+		const typeSuffix = `${nullable}${hasNull && !nullable.includes("null") ? " | null" : ""}`;
 		return {
-			value: `typeof ${pascal(name)}[keyof typeof ${pascal(name)}] ${nullable}`,
+			value: `typeof ${pascal(name)}[keyof typeof ${pascal(name)}]${typeSuffix}`,
 			imports: [{ name: pascal(name) }],
 			schemas: [...resolvedData.schemas, {
-				imports: resolvedData.imports.map((toImport) => ({
+				imports: resolvedData.imports.filter((toImport) => valueImportSet.has(toImport.alias ?? toImport.name)).map((toImport) => ({
 					...toImport,
 					values: true
 				})),
@@ -1500,12 +1585,12 @@ function combineSchemas({ name, schema, separator: separator$1, context, nullabl
 		});
 	}
 	return {
-		value: combineValues({
+		value: dedupeUnionType(combineValues({
 			resolvedData,
 			separator: separator$1,
 			resolvedValue,
 			context
-		}) + nullable,
+		}) + nullable),
 		imports: resolvedValue ? [...resolvedData.imports, ...resolvedValue.imports] : resolvedData.imports,
 		schemas: resolvedValue ? [...resolvedData.schemas, ...resolvedValue.schemas] : resolvedData.schemas,
 		dependencies: resolvedValue ? [...resolvedData.dependencies, ...resolvedValue.dependencies] : resolvedData.dependencies,
@@ -1517,16 +1602,6 @@ function combineSchemas({ name, schema, separator: separator$1, context, nullabl
 		examples: resolveExampleRefs(schema.examples, context)
 	};
 }
-const getCombineEnumValue = ({ values, isRef, originalSchema }) => {
-	if (values.length === 1) {
-		if (isRef[0]) return values[0];
-		return `{${getEnumImplementation(values[0])}} as const`;
-	}
-	return `{${values.map((e, i) => {
-		if (isRef[i]) return `...${e},`;
-		return getEnumImplementation(e, getEnumNames(originalSchema[i]), getEnumDescriptions(originalSchema[i]));
-	}).join("")}} as const`;
-};
 
 //#endregion
 //#region src/getters/keys.ts
@@ -1552,6 +1627,11 @@ function getIndexSignatureKey(item) {
 	if (enumValues && enumValues.length > 0) return enumValues.map((val) => `'${val}'`).join(" | ");
 	return "string";
 }
+function getPropertyNamesRecordType(item, valueType) {
+	const enumValues = getPropertyNamesEnum(item);
+	if (!enumValues || enumValues.length === 0) return;
+	return `Partial<Record<${enumValues.map((val) => `'${val}'`).join(" | ")}, ${valueType}>>`;
+}
 /**
 * Return the output type from an object
 *
@@ -1635,23 +1715,39 @@ function getObject({ item, name, context, nullable, propertyOverrides }) {
 				imports: aliasedImports
 			});
 			const propValue = needsValueImport ? alias : constLiteral ?? alias;
-			acc.value += `\n  ${doc ? `${doc}  ` : ""}${isReadOnly && !context.output.override.suppressReadonlyModifier ? "readonly " : ""}${getKey(key)}${isRequired ? "" : "?"}: ${propValue};`;
+			const finalPropValue = isRequired ? propValue : context.output.override.useNullForOptional === true ? `${propValue} | null` : propValue;
+			acc.value += `\n  ${doc ? `${doc}  ` : ""}${isReadOnly && !context.output.override.suppressReadonlyModifier ? "readonly " : ""}${getKey(key)}${isRequired ? "" : "?"}: ${finalPropValue};`;
 			acc.schemas.push(...resolvedValue.schemas);
 			acc.dependencies.push(...resolvedValue.dependencies);
 			if (arr.length - 1 === index) {
-				if (item.additionalProperties) {
-					const keyType$1 = getIndexSignatureKey(item);
-					if (isBoolean(item.additionalProperties)) acc.value += `\n  [key: ${keyType$1}]: unknown;\n }`;
-					else {
-						const resolvedValue$1 = resolveValue({
-							schema: item.additionalProperties,
-							name,
-							context
-						});
+				if (item.additionalProperties) if (isBoolean(item.additionalProperties)) {
+					const recordType$1 = getPropertyNamesRecordType(item, "unknown");
+					if (recordType$1) {
+						acc.value += "\n}";
+						acc.value += ` & ${recordType$1}`;
+						acc.useTypeAlias = true;
+					} else {
+						const keyType$1 = getIndexSignatureKey(item);
+						acc.value += `\n  [key: ${keyType$1}]: unknown;\n }`;
+					}
+				} else {
+					const resolvedValue$1 = resolveValue({
+						schema: item.additionalProperties,
+						name,
+						context
+					});
+					const recordType$1 = getPropertyNamesRecordType(item, resolvedValue$1.value);
+					if (recordType$1) {
+						acc.value += "\n}";
+						acc.value += ` & ${recordType$1}`;
+						acc.useTypeAlias = true;
+					} else {
+						const keyType$1 = getIndexSignatureKey(item);
 						acc.value += `\n  [key: ${keyType$1}]: ${resolvedValue$1.value};\n}`;
-						acc.dependencies.push(...resolvedValue$1.dependencies);
 					}
-				} else acc.value += "\n}";
+					acc.dependencies.push(...resolvedValue$1.dependencies);
+				}
+				else acc.value += "\n}";
 				acc.value += nullable;
 			}
 			return acc;
@@ -1664,36 +1760,64 @@ function getObject({ item, name, context, nullable, propertyOverrides }) {
 			isRef: false,
 			schema: {},
 			hasReadonlyProps: false,
+			useTypeAlias: false,
 			dependencies: [],
 			example: item.example,
 			examples: resolveExampleRefs(item.examples, context)
 		});
 	}
 	if (item.additionalProperties) {
-		const keyType$1 = getIndexSignatureKey(item);
-		if (isBoolean(item.additionalProperties)) return {
-			value: `{ [key: ${keyType$1}]: unknown }` + nullable,
-			imports: [],
-			schemas: [],
-			isEnum: false,
-			type: "object",
-			isRef: false,
-			hasReadonlyProps: item.readOnly || false,
-			dependencies: []
-		};
+		if (isBoolean(item.additionalProperties)) {
+			const recordType$2 = getPropertyNamesRecordType(item, "unknown");
+			if (recordType$2) return {
+				value: recordType$2 + nullable,
+				imports: [],
+				schemas: [],
+				isEnum: false,
+				type: "object",
+				isRef: false,
+				hasReadonlyProps: item.readOnly || false,
+				useTypeAlias: true,
+				dependencies: []
+			};
+			return {
+				value: `{ [key: ${getIndexSignatureKey(item)}]: unknown }` + nullable,
+				imports: [],
+				schemas: [],
+				isEnum: false,
+				type: "object",
+				isRef: false,
+				hasReadonlyProps: item.readOnly || false,
+				useTypeAlias: false,
+				dependencies: []
+			};
+		}
 		const resolvedValue = resolveValue({
 			schema: item.additionalProperties,
 			name,
 			context
 		});
+		const recordType$1 = getPropertyNamesRecordType(item, resolvedValue.value);
+		if (recordType$1) return {
+			value: recordType$1 + nullable,
+			imports: resolvedValue.imports ?? [],
+			schemas: resolvedValue.schemas ?? [],
+			isEnum: false,
+			type: "object",
+			isRef: false,
+			hasReadonlyProps: resolvedValue.hasReadonlyProps,
+			useTypeAlias: true,
+			dependencies: resolvedValue.dependencies
+		};
 		return {
-			value: `{[key: ${keyType$1}]: ${resolvedValue.value}}` + nullable,
+			value: `{[key: ${getIndexSignatureKey(item)}]: ${resolvedValue.value}}` + nullable,
 			imports: resolvedValue.imports ?? [],
 			schemas: resolvedValue.schemas ?? [],
 			isEnum: false,
 			type: "object",
 			isRef: false,
 			hasReadonlyProps: resolvedValue.hasReadonlyProps,
+			useTypeAlias: false,
 			dependencies: resolvedValue.dependencies
 		};
 	}
@@ -1709,6 +1833,18 @@ function getObject({ item, name, context, nullable, propertyOverrides }) {
 		dependencies: []
 	};
 	const keyType = item.type === "object" ? getIndexSignatureKey(item) : "string";
+	const recordType = getPropertyNamesRecordType(item, "unknown");
+	if (item.type === "object" && recordType) return {
+		value: recordType + nullable,
+		imports: [],
+		schemas: [],
+		isEnum: false,
+		type: "object",
+		isRef: false,
+		hasReadonlyProps: item.readOnly || false,
+		useTypeAlias: true,
+		dependencies: []
+	};
 	return {
 		value: (item.type === "object" ? `{ [key: ${keyType}]: unknown }` : "unknown") + nullable,
 		imports: [],
@@ -1717,6 +1853,7 @@ function getObject({ item, name, context, nullable, propertyOverrides }) {
 		type: "object",
 		isRef: false,
 		hasReadonlyProps: item.readOnly || false,
+		useTypeAlias: false,
 		dependencies: []
 	};
 }
@@ -2240,7 +2377,7 @@ function resolveDiscriminators(schemas, context) {
 //#endregion
 //#region src/getters/operation.ts
 function getOperationId(operation, route, verb) {
-	if (operation.operationId) return operation.operationId;
+	if (isString(operation.operationId)) return operation.operationId;
 	return pascal([verb, ...route.split("/").map((p) => sanitize(p, {
 		dash: true,
 		underscore: "-",
@@ -2331,10 +2468,10 @@ function getParams({ route, pathParams = [], operationId, context, output }) {
 function getProps({ body, queryParams, params, operationName, headers, context }) {
 	const bodyProp = {
 		name: body.implementation,
-		definition: `${body.implementation}${body.isOptional ? "?" : ""}: ${body.definition}`,
-		implementation: `${body.implementation}${body.isOptional ? "?" : ""}: ${body.definition}`,
+		definition: `${body.implementation}${body.isOptional && !context.output.optionsParamRequired ? "?" : ""}: ${body.definition}`,
+		implementation: `${body.implementation}${body.isOptional && !context.output.optionsParamRequired ? "?" : ""}: ${body.definition}`,
 		default: false,
-		required: !body.isOptional,
+		required: !body.isOptional || context.output.optionsParamRequired,
 		type: GetterPropType.BODY
 	};
 	const queryParamsProp = {
@@ -2342,15 +2479,15 @@ function getProps({ body, queryParams, params, operationName, headers, context }
 		definition: getQueryParamDefinition(queryParams, context),
 		implementation: getQueryParamDefinition(queryParams, context),
 		default: false,
-		required: isUndefined(queryParams?.isOptional) ? !context.output.allParamsOptional : !queryParams?.isOptional && !context.output.allParamsOptional,
+		required: isUndefined(queryParams?.isOptional) ? !context.output.allParamsOptional || context.output.optionsParamRequired : !queryParams?.isOptional && !context.output.allParamsOptional || context.output.optionsParamRequired,
 		type: GetterPropType.QUERY_PARAM
 	};
 	const headersProp = {
 		name: "headers",
-		definition: `headers${headers?.isOptional ? "?" : ""}: ${headers?.schema.name}`,
-		implementation: `headers${headers?.isOptional ? "?" : ""}: ${headers?.schema.name}`,
+		definition: `headers${headers?.isOptional && !context.output.optionsParamRequired ? "?" : ""}: ${headers?.schema.name}`,
+		implementation: `headers${headers?.isOptional && !context.output.optionsParamRequired ? "?" : ""}: ${headers?.schema.name}`,
 		default: false,
-		required: isUndefined(headers?.isOptional) ? false : !headers?.isOptional,
+		required: isUndefined(headers?.isOptional) ? false : !headers?.isOptional || context.output.optionsParamRequired,
 		type: GetterPropType.HEADER
 	};
 	let paramGetterProps;
@@ -2358,7 +2495,7 @@ function getProps({ body, queryParams, params, operationName, headers, context }
 		const parameterTypeName = `${pascal(operationName)}PathParameters`;
 		const name = "pathParams";
 		const namedParametersTypeDefinition = `export type ${parameterTypeName} = {\n ${params.map((property) => property.definition).join(",\n    ")},\n }`;
-		const isOptional = params.every((param) => param.default);
+		const isOptional = context.output.optionsParamRequired || params.every((param) => param.default);
 		const implementation = `{ ${params.map((property) => property.default ? `${property.name} = ${property.default}` : property.name).join(", ")} }: ${parameterTypeName}${isOptional ? " = {}" : ""}`;
 		const destructured = `{ ${params.map((property) => property.name).join(", ")} }`;
 		paramGetterProps = [{
@@ -2389,7 +2526,7 @@ function getProps({ body, queryParams, params, operationName, headers, context }
 function getQueryParamDefinition(queryParams, context) {
 	let paramType = queryParams?.schema.name;
 	if (OutputClient.ANGULAR === context.output.client) paramType = `DeepNonNullable<${paramType}>`;
-	return `params${queryParams?.isOptional || context.output.allParamsOptional ? "?" : ""}: ${paramType}`;
+	return `params${(queryParams?.isOptional || context.output.allParamsOptional) && !context.output.optionsParamRequired ? "?" : ""}: ${paramType}`;
 }
 
 //#endregion
@@ -2498,8 +2635,8 @@ function getResponse({ responses, operationName, context, contentType }) {
 		success: [],
 		errors: []
 	});
-	const success = groupedByStatus.success.map(({ value, formData }) => formData ? "Blob" : value).join(" | ");
-	const errors = groupedByStatus.errors.map(({ value }) => value).join(" | ");
+	const success = dedupeUnionType(groupedByStatus.success.map(({ value, formData }) => formData ? "Blob" : value).join(" | "));
+	const errors = dedupeUnionType(groupedByStatus.errors.map(({ value }) => value).join(" | "));
 	const defaultType = filteredTypes.find(({ key }) => key === "default")?.value;
 	return {
 		imports,
@@ -3043,10 +3180,11 @@ function generateInterface({ name, schema, context }) {
 		context
 	});
 	const isEmptyObject = scalar.value === "{}";
+	const shouldUseTypeAlias = context?.output.override?.useTypeOverInterfaces || scalar.useTypeAlias;
 	let model = "";
 	model += jsDoc(schema);
 	if (isEmptyObject) model += "// eslint-disable-next-line @typescript-eslint/no-empty-interface\n";
-	if (scalar.type === "object" && !context?.output.override?.useTypeOverInterfaces) if (scalar.type === "object" && schema.properties && Object.values(schema.properties).length > 0 && Object.values(schema.properties).every((item) => "const" in item)) {
+	if (scalar.type === "object" && !shouldUseTypeAlias) if (scalar.type === "object" && schema.properties && Object.values(schema.properties).length > 0 && Object.values(schema.properties).every((item) => "const" in item)) {
 		const mappedScalarValue = scalar.value.replaceAll(";", ",").replaceAll("?:", ":");
 		model += `export const ${name}Value = ${mappedScalarValue} as const;\nexport type ${name} = typeof ${name}Value;\n`;
 	} else {
@@ -3198,7 +3336,7 @@ function generateSchemaDefinitions(schemaName, schema, context, suffix) {
 async function generateVerbOptions({ verb, output, operation, route, pathRoute, verbParameters = [], context }) {
 	const { responses, requestBody, parameters: operationParameters, tags = [], deprecated, description, summary } = operation;
 	const operationId = getOperationId(operation, route, verb);
-	const overrideOperation = output.override.operations[operation.operationId];
+	const overrideOperation = output.override.operations[operationId];
 	const overrideTag = Object.entries(output.override.tags).reduce((acc, [tag, options]) => tags.includes(tag) && options ? mergeDeep(acc, options) : acc, {});
 	const override = mergeDeep(mergeDeep(output.override, overrideTag), overrideOperation);
 	const overrideOperationName = overrideOperation?.operationName ?? output.override.operationName;
@@ -3518,7 +3656,13 @@ async function writeSchemas({ schemaPath, schemas, target, namingConvention, fil
 		const ext = fileExtension.endsWith(".ts") ? fileExtension.slice(0, -3) : fileExtension;
 		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")}`;
+			const currentExports = [...conventionNamesSet].map((schemaName) => `export * from './${schemaName}${ext}';`).toSorted((a, b) => a.localeCompare(b));
+			const existingExports = (await fs$1.readFile(schemaFilePath, "utf8")).match(/export\s+\*\s+from\s+['"][^'"]+['"]/g)?.map((statement) => {
+				const match = statement.match(/export\s+\*\s+from\s+['"]([^'"]+)['"]/);
+				if (!match) return void 0;
+				return `export * from '${match[1]}';`;
+			}).filter((statement) => Boolean(statement)) ?? [];
+			const fileContent = `${header}\n${[...new Set([...existingExports, ...currentExports])].toSorted((a, b) => a.localeCompare(b)).join("\n")}`;
 			await fs$1.writeFile(schemaFilePath, fileContent, { encoding: "utf8" });
 		} catch (error) {
 			throw new Error(`Oups... 🍻. An Error occurred while writing schema index file ${schemaFilePath} => ${error}`);
@@ -4104,5 +4248,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, 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 };
+export { BODY_TYPE_NAME, EnumGeneration, ErrorWithTag, FormDataArrayHandling, GetterPropType, LogLevels, NamingConvention, OutputClient, OutputHttpClient, OutputMockType, OutputMode, PropertySortOrder, RefComponentSuffix, SchemaType, TEMPLATE_TAG_REGEX, URL_REGEX, VERBS_WITH_BODY, Verbs, _filteredVerbs, addDependency, asyncReduce, camel, combineSchemas, compareVersions, conventionName, count, createDebugger, createLogger, createSuccessMessage, createTypeAliasIfNeeded, dedupeUnionType, dynamicImport, escape, 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, getCombinedEnumValue, getDefaultContentType, getEnum, getEnumDescriptions, getEnumImplementation, getEnumNames, getEnumUnionFromSchema, getExtension, getFileInfo, getFormDataFieldFileType, getFullRoute, getIsBodyVerb, getKey, getMockFileExtensionByTypeName, getNumberWord, getObject, getOperationId, getOrvalGeneratedTypes, getParameters, getParams, getParamsInPath, getPropertySafe, getProps, getQueryParams, getRefInfo, getResReqTypes, getResponse, getResponseTypeCategory, getRoute, getRouteAsArray, getScalar, 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