@orval/core 8.0.0-rc.0 → 8.0.0-rc.2

package/dist/{index.d.ts → index.d.mts}

@@ -1,4 +1,3 @@
-import { t as __export } from "./chunk-Bp6m_JJh.js";
 import { CompareOperator } from "compare-versions";
 import debug from "debug";
 import { ConvertInputOptions } from "swagger2openapi";
@@ -7,7 +6,6 @@ import { allLocales } from "@faker-js/faker";
 import { JSONSchema6, JSONSchema7 } from "json-schema";
 import { ComponentsObject, ExampleObject, InfoObject, OpenAPIObject, OperationObject, ParameterObject, PathItemObject, ReferenceObject, RequestBodyObject, ResponseObject, ResponsesObject, SchemaObject, SchemasObject } from "openapi3-ts/oas30";
 import { TypeDocOptions } from "typedoc";
-import { ValueIteratee } from "lodash";
 import { ServerObject } from "openapi3-ts/oas31";
 
 //#region src/types.d.ts
@@ -29,7 +27,7 @@ interface NormalizedOptions {
 }
 type NormalizedOutputOptions = {
   workspace?: string;
-  target?: string;
+  target: string;
   schemas?: string;
   namingConvention: NamingConvention;
   fileExtension: string;
@@ -60,8 +58,8 @@ type NormalizedOverrideOutput = {
   title?: (title: string) => string;
   transformer?: OutputTransformer;
   mutator?: NormalizedMutator;
-  operations: Record<string, NormalizedOperationOptions>;
-  tags: Record<string, NormalizedOperationOptions>;
+  operations: Record<string, NormalizedOperationOptions | undefined>;
+  tags: Record<string, NormalizedOperationOptions | undefined>;
   mock?: OverrideMockOptions;
   contentType?: OverrideOutputContentType;
   header: false | ((info: InfoObject) => string[] | string);
@@ -171,7 +169,7 @@ declare const EnumGeneration: {
 type EnumGeneration = (typeof EnumGeneration)[keyof typeof EnumGeneration];
 type OutputOptions = {
   workspace?: string;
-  target?: string;
+  target: string;
   schemas?: string;
   namingConvention?: NamingConvention;
   fileExtension?: string;
@@ -452,7 +450,7 @@ type NormalizedZodOptions = {
     body: boolean | ZodCoerceType[];
     response: boolean | ZodCoerceType[];
   };
-  preprocess: {
+  preprocess?: {
     param?: NormalizedMutator;
     query?: NormalizedMutator;
     header?: NormalizedMutator;
@@ -488,7 +486,7 @@ type NormalizedQueryOptions = {
   shouldSplitQueryKey?: boolean;
   useOperationIdAsQueryKey?: boolean;
   signal?: boolean;
-  version?: 4 | 5;
+  version?: 3 | 4 | 5;
 };
 type QueryOptions = {
   useQuery?: boolean;
@@ -509,7 +507,7 @@ type QueryOptions = {
   shouldSplitQueryKey?: boolean;
   useOperationIdAsQueryKey?: boolean;
   signal?: boolean;
-  version?: 4 | 5;
+  version?: 3 | 4 | 5;
 };
 type AngularOptions = {
   provideIn?: 'root' | 'any' | boolean;
@@ -517,9 +515,9 @@ type AngularOptions = {
 type SwrOptions = {
   useInfinite?: boolean;
   useSWRMutationForGet?: boolean;
-  swrOptions?: any;
-  swrMutationOptions?: any;
-  swrInfiniteOptions?: any;
+  swrOptions?: unknown;
+  swrMutationOptions?: unknown;
+  swrInfiniteOptions?: unknown;
 };
 type NormalizedFetchOptions = {
   includeHttpResponseReturnType: boolean;
@@ -562,7 +560,7 @@ interface HookOption {
 }
 type HookCommand = string | HookFunction | HookOption | (string | HookFunction | HookOption)[];
 type NormalizedHookCommand = HookCommand[];
-type HooksOptions<T$1 = HookCommand | NormalizedHookCommand> = Partial<Record<Hook, T$1>>;
+type HooksOptions<T = HookCommand | NormalizedHookCommand> = Partial<Record<Hook, T>>;
 type NormalizedHookOptions = HooksOptions<NormalizedHookCommand>;
 type Verbs = 'post' | 'put' | 'get' | 'patch' | 'delete' | 'head';
 declare const Verbs: {
@@ -589,8 +587,7 @@ interface ContextSpecs {
   output: NormalizedOutputOptions;
 }
 interface GlobalOptions {
-  projectName?: string;
-  watch?: boolean | string | (string | boolean)[];
+  watch?: boolean | string | string[];
   clean?: boolean | string[];
   prettier?: boolean;
   biome?: boolean;
@@ -1384,7 +1381,7 @@ interface RefInfo {
 declare const getRefInfo: ($ref: ReferenceObject["$ref"], context: ContextSpecs) => RefInfo;
 //#endregion
 //#region src/getters/res-req-types.d.ts
-declare const getResReqTypes: (responsesOrRequests: [string, ResponseObject | ReferenceObject | RequestBodyObject][], name: string, context: ContextSpecs, defaultType?: string, uniqueKey?: ValueIteratee<ResReqTypesValue>) => ResReqTypesValue[];
+declare const getResReqTypes: (responsesOrRequests: [string, ResponseObject | ReferenceObject | RequestBodyObject][], name: string, context: ContextSpecs, defaultType?: string, uniqueKey?: (item: ResReqTypesValue, index: number, data: ResReqTypesValue[]) => unknown) => ResReqTypesValue[];
 //#endregion
 //#region src/getters/response.d.ts
 declare const getResponse: ({
@@ -1498,7 +1495,7 @@ interface DebuggerOptions {
 declare function createDebugger(ns: string, options?: DebuggerOptions): debug.Debugger['log'];
 //#endregion
 //#region src/utils/deep-non-nullable.d.ts
-type DeepNonNullable<T$1> = T$1 extends Function ? T$1 : T$1 extends readonly (infer U)[] ? DeepNonNullable<NonNullable<U>>[] : T$1 extends object ? { [K in keyof T$1]: DeepNonNullable<NonNullable<T$1[K]>> } : NonNullable<T$1>;
+type DeepNonNullable<T> = T extends Function ? T : T extends readonly (infer U)[] ? DeepNonNullable<NonNullable<U>>[] : T extends object ? { [K in keyof T]: DeepNonNullable<NonNullable<T[K]>> } : NonNullable<T>;
 //#endregion
 //#region src/utils/doc.d.ts
 declare function jsDoc(schema: {
@@ -1547,6 +1544,24 @@ declare function removeFilesAndEmptyFolders(patterns: string[], dir: string): Pr
 //#region src/utils/file-extensions.d.ts
 declare const getMockFileExtensionByTypeName: (mock: GlobalMockOptions | ClientMockBuilder) => string;
 //#endregion
+//#region src/utils/get-property-safe.d.ts
+/**
+ * Type safe way to get arbitrary property from an object.
+ *
+ * @param obj - The object from which to retrieve the property.
+ * @param propertyName - The name of the property to retrieve.
+ * @returns Object with `hasProperty: true` and `value` of the property if it exists; otherwise `hasProperty: false` and undefined.
+ *
+ * @remarks Until TypeScript adds type-narrowing for Object.hasOwn we have to use this workaround
+ */
+declare function getPropertySafe<T extends object, K$1 extends keyof T>(obj: T, propertyName: K$1 | string): {
+  hasProperty: true;
+  value: T[K$1];
+} | {
+  hasProperty: false;
+  value: undefined;
+};
+//#endregion
 //#region src/utils/is-body-verb.d.ts
 declare const getIsBodyVerb: (verb: Verbs) => boolean;
 //#endregion
@@ -1594,7 +1609,7 @@ interface LoggerOptions {
 declare function createLogger(level?: LogLevel, options?: LoggerOptions): Logger;
 //#endregion
 //#region src/utils/merge-deep.d.ts
-declare function mergeDeep<T$1 extends Record<string, any>, U$1 extends Record<string, any>>(source: T$1, target: U$1): T$1 & U$1;
+declare function mergeDeep<T extends Record<string, any>, U$1 extends Record<string, any>>(source: T, target: U$1): T & U$1;
 //#endregion
 //#region src/utils/occurrence.d.ts
 declare const count: (str: string | undefined, key: string) => number;
@@ -1754,5 +1769,5 @@ declare const generateTargetForTags: (builder: WriteSpecsBuilder, options: Norma
 declare const getOrvalGeneratedTypes: () => string;
 declare const getTypedResponse: () => string;
 //#endregion
-export { AngularOptions, BODY_TYPE_NAME, BaseUrlFromConstant, BaseUrlFromSpec, ClientBuilder, ClientDependenciesBuilder, ClientExtraFilesBuilder, ClientFileBuilder, ClientFooterBuilder, ClientGeneratorsBuilder, ClientHeaderBuilder, ClientMockBuilder, ClientMockGeneratorBuilder, ClientMockGeneratorImplementation, ClientTitleBuilder, Config, ConfigExternal, ConfigFn, ContextSpecs, DeepNonNullable, EnumGeneration, ErrorWithTag, FetchOptions, FormDataArrayHandling, FormDataType, GenerateMockImports, 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, InputFiltersOption, 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, NormalizedZodOptions, OperationOptions, Options, OptionsExport, OptionsFn, OutputClient, OutputClientFunc, OutputDocsOptions, OutputHttpClient, OutputMockType, OutputMode, OutputOptions, OverrideInput, OverrideMockOptions, OverrideOutput, OverrideOutputContentType, PackageJson, ParamsSerializerOptions, PropertySortOrder, QueryOptions, RefComponentSuffix, RefInfo, ResReqTypesValue, ResolverValue, ScalarValue, SchemaType, SchemaWithConst, SwaggerParserOptions, SwrOptions, TEMPLATE_TAG_REGEX, TsConfigTarget, Tsconfig, URL_REGEX, VERBS_WITH_BODY, Verbs, WriteModeProps, WriteSpecsBuilder, 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, generateVerbsOptions, getArray, getBody, getEnum, getEnumDescriptions, getEnumImplementation, getEnumNames, getExtension, getFileInfo, getFullRoute, getIsBodyVerb, getKey, getMockFileExtensionByTypeName, getNumberWord, getObject, getOperationId, getOrvalGeneratedTypes, getParameters, getParams, getParamsInPath, getProps, getQueryParams, getRefInfo, getResReqTypes, getResponse, getRoute, getRouteAsArray, getScalar, getTypedResponse, ibmOpenapiValidator, ibmOpenapiValidatorErrors, ibmOpenapiValidatorWarnings, isBoolean, isDirectory, isFunction, isModule, isNull, isNumber, isNumeric, isObject, isReference, isRootKey$1 as isRootKey, isSchema, isString, isSyntheticDefaultImportsAllow, isUndefined, isUrl, isVerb, jsDoc, jsStringEscape, kebab, keyValuePairsToJsDoc, log, logError, mergeDeep, mismatchArgsMessage, openApiConverter, 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.ts.map
+export { AngularOptions, BODY_TYPE_NAME, BaseUrlFromConstant, BaseUrlFromSpec, ClientBuilder, ClientDependenciesBuilder, ClientExtraFilesBuilder, ClientFileBuilder, ClientFooterBuilder, ClientGeneratorsBuilder, ClientHeaderBuilder, ClientMockBuilder, ClientMockGeneratorBuilder, ClientMockGeneratorImplementation, ClientTitleBuilder, Config, ConfigExternal, ConfigFn, ContextSpecs, DeepNonNullable, EnumGeneration, ErrorWithTag, FetchOptions, FormDataArrayHandling, FormDataType, GenerateMockImports, 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, InputFiltersOption, 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, NormalizedZodOptions, OperationOptions, Options, OptionsExport, OptionsFn, OutputClient, OutputClientFunc, OutputDocsOptions, OutputHttpClient, OutputMockType, OutputMode, OutputOptions, OverrideInput, OverrideMockOptions, OverrideOutput, OverrideOutputContentType, PackageJson, ParamsSerializerOptions, PropertySortOrder, QueryOptions, RefComponentSuffix, RefInfo, ResReqTypesValue, ResolverValue, ScalarValue, SchemaType, SchemaWithConst, SwaggerParserOptions, SwrOptions, TEMPLATE_TAG_REGEX, TsConfigTarget, Tsconfig, URL_REGEX, VERBS_WITH_BODY, Verbs, WriteModeProps, WriteSpecsBuilder, 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, generateVerbsOptions, getArray, getBody, getEnum, getEnumDescriptions, getEnumImplementation, getEnumNames, getExtension, getFileInfo, getFullRoute, getIsBodyVerb, getKey, getMockFileExtensionByTypeName, getNumberWord, getObject, getOperationId, getOrvalGeneratedTypes, getParameters, getParams, getParamsInPath, getPropertySafe, getProps, getQueryParams, getRefInfo, getResReqTypes, getResponse, getRoute, getRouteAsArray, getScalar, getTypedResponse, ibmOpenapiValidator, ibmOpenapiValidatorErrors, ibmOpenapiValidatorWarnings, isBoolean, isDirectory, isFunction, isModule, isNull, isNumber, isNumeric, isObject, isReference, isRootKey$1 as isRootKey, isSchema, isString, isSyntheticDefaultImportsAllow, isUndefined, isUrl, isVerb, jsDoc, jsStringEscape, kebab, keyValuePairsToJsDoc, log, logError, mergeDeep, mismatchArgsMessage, openApiConverter, 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.js → index.mjs}

@@ -1,5 +1,5 @@
-import { t as __export } from "./chunk-Bp6m_JJh.js";
-import isEmpty from "lodash.isempty";
+import { t as __export } from "./chunk-jass6xSI.mjs";
+import { isEmptyish, unique, uniqueBy, uniqueWith } from "remeda";
 import { keyword } from "esutils";
 import path from "node:path";
 import fs from "node:fs";
@@ -12,9 +12,6 @@ import chalk from "chalk";
 import { convertObj } from "swagger2openapi";
 import ibmOpenapiRuleset from "@ibm-cloud/openapi-ruleset";
 import stoplight from "@stoplight/spectral-core";
-import uniqBy from "lodash.uniqby";
-import uniq from "lodash.uniq";
-import uniqWith from "lodash.uniqwith";
 import fs$1 from "fs-extra";
 import { Parser } from "acorn";
 import { build } from "esbuild";
@@ -522,6 +519,28 @@ const getMockFileExtensionByTypeName = (mock) => {
 	}
 };
 
+//#endregion
+//#region src/utils/get-property-safe.ts
+/**
+* Type safe way to get arbitrary property from an object.
+*
+* @param obj - The object from which to retrieve the property.
+* @param propertyName - The name of the property to retrieve.
+* @returns Object with `hasProperty: true` and `value` of the property if it exists; otherwise `hasProperty: false` and undefined.
+*
+* @remarks Until TypeScript adds type-narrowing for Object.hasOwn we have to use this workaround
+*/
+function getPropertySafe(obj, propertyName) {
+	if (Object.hasOwn(obj, propertyName)) return {
+		hasProperty: true,
+		value: obj[propertyName]
+	};
+	return {
+		hasProperty: false,
+		value: void 0
+	};
+}
+
 //#endregion
 //#region src/utils/is-body-verb.ts
 const getIsBodyVerb = (verb) => VERBS_WITH_BODY.includes(verb);
@@ -1170,8 +1189,8 @@ const getResReqContentTypes = ({ mediaType, propName, context }) => {
 		context
 	});
 };
-const getResReqTypes = (responsesOrRequests, name, context, defaultType = "unknown", uniqueKey = "value") => {
-	return uniqBy(responsesOrRequests.filter(([_, res]) => Boolean(res)).map(([key, res]) => {
+const getResReqTypes = (responsesOrRequests, name, context, defaultType = "unknown", uniqueKey = (item) => item.value) => {
+	return uniqueBy(responsesOrRequests.filter(([_, res]) => Boolean(res)).map(([key, res]) => {
 		if (isReference(res)) {
 			const { schema: bodySchema, imports: [{ name: name$1, specKey, schemaName }] } = resolveRef(res, context);
 			const [contentType, mediaType] = Object.entries(bodySchema.content ?? {})[0] ?? [];
@@ -1516,6 +1535,23 @@ const getKey = (key) => {
 //#endregion
 //#region src/getters/object.ts
 /**
+* Extract enum values from propertyNames schema (OpenAPI 3.1)
+* Returns undefined if propertyNames doesn't have an enum
+*/
+const getPropertyNamesEnum = (item) => {
+	const schema31 = item;
+	if ("propertyNames" in schema31 && schema31.propertyNames && "enum" in schema31.propertyNames && Array.isArray(schema31.propertyNames.enum)) return schema31.propertyNames.enum.filter((val) => typeof val === "string");
+};
+/**
+* Generate index signature key type based on propertyNames enum
+* Returns union type string like "'foo' | 'bar'" or 'string' if no enum
+*/
+const getIndexSignatureKey = (item) => {
+	const enumValues = getPropertyNamesEnum(item);
+	if (enumValues && enumValues.length > 0) return enumValues.map((val) => `'${val}'`).join(" | ");
+	return "string";
+};
+/**
 * Return the output type from an object
 *
 * @param item item with type === "object"
@@ -1593,16 +1629,18 @@ const getObject = ({ item, name, context, nullable }) => {
 			acc.value += `\n  ${doc ? `${doc}  ` : ""}${isReadOnly && !context.output.override.suppressReadonlyModifier ? "readonly " : ""}${getKey(key)}${isRequired ? "" : "?"}: ${propValue};`;
 			acc.schemas.push(...resolvedValue.schemas);
 			if (arr.length - 1 === index) {
-				if (item.additionalProperties) if (isBoolean(item.additionalProperties)) acc.value += `\n  [key: string]: unknown;\n }`;
-				else {
-					const resolvedValue$1 = resolveValue({
-						schema: item.additionalProperties,
-						name,
-						context
-					});
-					acc.value += `\n  [key: string]: ${resolvedValue$1.value};\n}`;
-				}
-				else acc.value += "\n}";
+				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
+						});
+						acc.value += `\n  [key: ${keyType$1}]: ${resolvedValue$1.value};\n}`;
+					}
+				} else acc.value += "\n}";
 				acc.value += nullable;
 			}
 			return acc;
@@ -1620,8 +1658,9 @@ const getObject = ({ item, name, context, nullable }) => {
 		});
 	}
 	if (item.additionalProperties) {
+		const keyType$1 = getIndexSignatureKey(item);
 		if (isBoolean(item.additionalProperties)) return {
-			value: `{ [key: string]: unknown }` + nullable,
+			value: `{ [key: ${keyType$1}]: unknown }` + nullable,
 			imports: [],
 			schemas: [],
 			isEnum: false,
@@ -1635,7 +1674,7 @@ const getObject = ({ item, name, context, nullable }) => {
 			context
 		});
 		return {
-			value: `{[key: string]: ${resolvedValue.value}}` + nullable,
+			value: `{[key: ${keyType$1}]: ${resolvedValue.value}}` + nullable,
 			imports: resolvedValue.imports ?? [],
 			schemas: resolvedValue.schemas ?? [],
 			isEnum: false,
@@ -1654,8 +1693,9 @@ const getObject = ({ item, name, context, nullable }) => {
 		isRef: false,
 		hasReadonlyProps: item.readOnly || false
 	};
+	const keyType = item.type === "object" ? getIndexSignatureKey(item) : "string";
 	return {
-		value: (item.type === "object" ? "{ [key: string]: unknown }" : "unknown") + nullable,
+		value: (item.type === "object" ? `{ [key: ${keyType}]: unknown }` : "unknown") + nullable,
 		imports: [],
 		schemas: [],
 		isEnum: false,
@@ -1717,7 +1757,7 @@ const getScalar = ({ item, name, context }) => {
 			};
 		}
 		case "array": {
-			const { value,...rest } = getArray({
+			const { value, ...rest } = getArray({
 				schema: item,
 				name,
 				context
@@ -1782,7 +1822,7 @@ const getScalar = ({ item, name, context }) => {
 				example: item.example,
 				examples: resolveExampleRefs(item.examples, context)
 			};
-			const { value,...rest } = getObject({
+			const { value, ...rest } = getObject({
 				item,
 				name,
 				context,
@@ -1820,7 +1860,7 @@ const combineValues = ({ resolvedData, resolvedValue, separator: separator$1, co
 				values.push(resolvedData.values[i]);
 				continue;
 			}
-			const missingProperties = uniq(resolvedData.allProperties.filter((p) => !Object.keys(subSchema.properties).includes(p)));
+			const missingProperties = unique(resolvedData.allProperties.filter((p) => !Object.keys(subSchema.properties).includes(p)));
 			values.push(`${resolvedData.values[i]}${missingProperties.length > 0 ? ` & {${missingProperties.map((p) => `${p}?: never`).join("; ")}}` : ""}`);
 		}
 	}
@@ -1874,7 +1914,7 @@ const 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) {
+	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)}`;
 		return {
 			value: `typeof ${pascal(name)}[keyof typeof ${pascal(name)}] ${nullable}`,
@@ -2298,7 +2338,7 @@ const getRouteAsArray = (route) => route.replaceAll(TEMPLATE_TAG_IN_PATH_REGEX,
 //#endregion
 //#region src/generators/component-definition.ts
 const generateComponentDefinition = (responses = {}, context, suffix) => {
-	if (isEmpty(responses)) return [];
+	if (isEmptyish(responses)) return [];
 	return Object.entries(responses).reduce((acc, [name, response]) => {
 		const allResponseTypes = getResReqTypes([[suffix, response]], name, context, "void");
 		const imports = allResponseTypes.flatMap(({ imports: imports$1 }) => imports$1);
@@ -2326,7 +2366,7 @@ const generateComponentDefinition = (responses = {}, context, suffix) => {
 //#region src/generators/imports.ts
 const generateImports = ({ imports = [], target, isRootKey: isRootKey$1, specsName, specKey: currentSpecKey, namingConvention = NamingConvention.CAMEL_CASE }) => {
 	if (imports.length === 0) return "";
-	return uniqWith(imports, (a, b) => a.name === b.name && a.default === b.default && a.specKey === b.specKey).sort().map(({ specKey, name, values, alias, isConstant }) => {
+	return uniqueWith(imports, (a, b) => a.name === b.name && a.default === b.default && a.specKey === b.specKey).sort().map(({ specKey, name, values, alias, isConstant }) => {
 		const isSameSpecKey = currentSpecKey === specKey;
 		const fileName = conventionName(name, namingConvention);
 		if (specKey && !isSameSpecKey) {
@@ -2338,7 +2378,7 @@ const generateImports = ({ imports = [], target, isRootKey: isRootKey$1, specsNa
 	}).join("\n");
 };
 const generateMutatorImports = ({ mutators, implementation, oneMore }) => {
-	return uniqWith(mutators, (a, b) => a.name === b.name && a.default === b.default).reduce((acc, mutator) => {
+	return uniqueWith(mutators, (a, b) => a.name === b.name && a.default === b.default).reduce((acc, mutator) => {
 		const path$2 = `${oneMore ? "../" : ""}${mutator.path}`;
 		const importDefault = mutator.default ? mutator.name : `{ ${mutator.name} }`;
 		acc += `import ${importDefault} from '${path$2}';`;
@@ -2361,7 +2401,7 @@ const generateMutatorImports = ({ mutators, implementation, oneMore }) => {
 const generateDependency = ({ deps, isAllowSyntheticDefaultImports, dependency, specsName, key, onlyTypes }) => {
 	const defaultDep = deps.find((e) => e.default && (isAllowSyntheticDefaultImports || !e.syntheticDefaultImport));
 	const namespaceImportDep = defaultDep ? void 0 : deps.find((e) => !!e.namespaceImport || !isAllowSyntheticDefaultImports && e.syntheticDefaultImport);
-	const depsString = uniq(deps.filter((e) => !e.default && !e.syntheticDefaultImport && !e.namespaceImport).map(({ name, alias }) => alias ? `${name} as ${alias}` : name)).toSorted().join(",\n  ");
+	const depsString = unique(deps.filter((e) => !e.default && !e.syntheticDefaultImport && !e.namespaceImport).map(({ name, alias }) => alias ? `${name} as ${alias}` : name)).toSorted().join(",\n  ");
 	let importString = "";
 	const namespaceImportString = namespaceImportDep ? `import * as ${namespaceImportDep.name} from '${dependency}';` : "";
 	if (namespaceImportString) {
@@ -2773,7 +2813,7 @@ const generateInterface = ({ name, schema, context, suffix }) => {
 * @param schemas
 */
 const generateSchemasDefinition = (schemas = {}, context, suffix, filters) => {
-	if (isEmpty(schemas)) return [];
+	if (isEmptyish(schemas)) return [];
 	const transformedSchemas = resolveDiscriminators(schemas, context);
 	let generateSchemas = Object.entries(transformedSchemas);
 	if (filters?.schemas) {
@@ -2784,7 +2824,7 @@ const generateSchemasDefinition = (schemas = {}, context, suffix, filters) => {
 			return mode === "include" ? isMatch : !isMatch;
 		});
 	}
-	return generateSchemas.reduce((acc, [name, schema]) => {
+	const models = generateSchemas.reduce((acc, [name, schema]) => {
 		const schemaName = sanitize(`${pascal(name)}${suffix}`, {
 			underscore: "_",
 			whitespace: "_",
@@ -2840,6 +2880,16 @@ const generateSchemasDefinition = (schemas = {}, context, suffix, filters) => {
 			return acc;
 		}
 	}, []);
+	const seenNames = /* @__PURE__ */ new Set();
+	const deduplicatedModels = [];
+	for (const schema of models) {
+		const normalizedName = conventionName(schema.name, context.output.namingConvention);
+		if (!seenNames.has(normalizedName)) {
+			seenNames.add(normalizedName);
+			deduplicatedModels.push(schema);
+		}
+	}
+	return deduplicatedModels;
 };
 function shouldCreateInterface(schema) {
 	return (!schema.type || schema.type === "object") && !schema.allOf && !schema.oneOf && !schema.anyOf && !isReference(schema) && !schema.nullable && !schema.enum;
@@ -3039,20 +3089,18 @@ const writeSchemas = async ({ schemaPath, schemas, target, namingConvention, fil
 	if (indexFiles) {
 		const schemaFilePath = join(schemaPath, `/index${fileExtension}`);
 		await fs$1.ensureFile(schemaFilePath);
-		const schemaNamesSet = /* @__PURE__ */ new Set();
+		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) if (schemaNamesSet.has(schema.name)) duplicateNamesMap.set(schema.name, (duplicateNamesMap.get(schema.name) || 1) + 1);
-		else schemaNamesSet.add(schema.name);
-		if (duplicateNamesMap.size > 0) throw new Error("Duplicate schema names detected:\n" + [...duplicateNamesMap].map((duplicate) => `  ${duplicate[1]}x ${duplicate[0]}`).join("\n"));
+		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"));
 		try {
-			const stringData = (await fs$1.readFile(schemaFilePath)).toString();
-			const ext = fileExtension.endsWith(".ts") ? fileExtension.slice(0, -3) : fileExtension;
-			const importStatements = schemas.filter((schema) => {
-				const name = conventionName(schema.name, namingConvention);
-				return !stringData.includes(`export * from './${name}${ext}'`) && !stringData.includes(`export * from "./${name}${ext}"`);
-			}).map((schema) => `export * from './${conventionName(schema.name, namingConvention)}${ext}';`);
-			const fileContent = `${header}\n${[...stringData.match(/export \* from(.*)('|")/g)?.map((s) => s + ";") ?? [], ...importStatements].sort().join("\n")}`;
-			await fs$1.writeFile(schemaFilePath, fileContent);
+			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" });
 		} catch (error) {
 			throw new Error(`Oups... 🍻. An Error occurred while writing schema index file ${schemaFilePath} => ${error}`);
 		}
@@ -3062,7 +3110,7 @@ const writeSchemas = async ({ schemaPath, schemas, target, namingConvention, fil
 //#endregion
 //#region src/writers/generate-imports-for-builder.ts
 const generateImportsForBuilder = (output, imports, relativeSchemasPath) => {
-	return output.schemas && !output.indexFiles ? uniqBy(imports, "name").map((i) => {
+	return output.schemas && !output.indexFiles ? uniqueBy(imports, (x) => x.name).map((i) => {
 		const name = conventionName(i.name, output.namingConvention);
 		return {
 			exports: [i],
@@ -3616,5 +3664,5 @@ const writeTagsMode = async ({ builder, output, specsName, 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, generateVerbsOptions, getArray, getBody, getEnum, getEnumDescriptions, getEnumImplementation, getEnumNames, getExtension, getFileInfo, getFullRoute, getIsBodyVerb, getKey, getMockFileExtensionByTypeName, getNumberWord, getObject, getOperationId, getOrvalGeneratedTypes, getParameters, getParams, getParamsInPath, getProps, getQueryParams, getRefInfo, getResReqTypes, getResponse, getRoute, getRouteAsArray, getScalar, getTypedResponse, ibmOpenapiValidator, ibmOpenapiValidatorErrors, ibmOpenapiValidatorWarnings, isBoolean, isDirectory, isFunction, isModule, isNull, isNumber, isNumeric, isObject, isReference, isRootKey, isSchema, isString, isSyntheticDefaultImportsAllow, isUndefined, isUrl, isVerb, jsDoc, jsStringEscape, kebab, keyValuePairsToJsDoc, log, logError, mergeDeep, mismatchArgsMessage, openApiConverter, 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 };
-//# sourceMappingURL=index.js.map
+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, generateVerbsOptions, getArray, getBody, getEnum, getEnumDescriptions, getEnumImplementation, getEnumNames, getExtension, getFileInfo, getFullRoute, getIsBodyVerb, getKey, getMockFileExtensionByTypeName, getNumberWord, getObject, getOperationId, getOrvalGeneratedTypes, getParameters, getParams, getParamsInPath, getPropertySafe, getProps, getQueryParams, getRefInfo, getResReqTypes, getResponse, getRoute, getRouteAsArray, getScalar, getTypedResponse, ibmOpenapiValidator, ibmOpenapiValidatorErrors, ibmOpenapiValidatorWarnings, isBoolean, isDirectory, isFunction, isModule, isNull, isNumber, isNumeric, isObject, isReference, isRootKey, isSchema, isString, isSyntheticDefaultImportsAllow, isUndefined, isUrl, isVerb, jsDoc, jsStringEscape, kebab, keyValuePairsToJsDoc, log, logError, mergeDeep, mismatchArgsMessage, openApiConverter, 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 };
+//# sourceMappingURL=index.mjs.map