@orval/core 8.9.0 → 8.9.1

package/dist/index.d.mts

@@ -959,6 +959,8 @@ interface GeneratorClient {
   implementation: string;
   imports: GeneratorImport[];
   mutators?: GeneratorMutator[];
+  /** When set, overrides the default verbOption.doc prepended to the implementation */
+  docComment?: string;
 }
 interface GeneratorMutatorParsingInfo {
   numberOfParams: number;
@@ -1643,10 +1645,10 @@ declare function combineSchemas({
 declare function resolveDiscriminators(schemas: OpenApiSchemasObject, context: ContextSpec): OpenApiSchemasObject;
 //#endregion
 //#region src/getters/enum.d.ts
-declare function getEnumNames(schemaObject: OpenApiSchemaObject | undefined): string[] | undefined;
-declare function getEnumDescriptions(schemaObject: OpenApiSchemaObject | undefined): string[] | undefined;
-declare function getEnum(value: string, enumName: string, names: string[] | undefined, enumGenerationType: EnumGeneration, descriptions?: string[], enumNamingConvention?: NamingConvention): string;
-declare function getEnumImplementation(value: string, names?: string[], descriptions?: string[], enumNamingConvention?: NamingConvention): string;
+declare function getEnumNames(schemaObject: OpenApiSchemaObject | undefined): (string | undefined)[] | undefined;
+declare function getEnumDescriptions(schemaObject: OpenApiSchemaObject | undefined): (string | undefined)[] | undefined;
+declare function getEnum(value: string, enumName: string, names: (string | undefined)[] | undefined, enumGenerationType: EnumGeneration, descriptions?: (string | undefined)[], enumNamingConvention?: NamingConvention): string;
+declare function getEnumImplementation(value: string, names?: (string | undefined)[], descriptions?: (string | undefined)[], enumNamingConvention?: NamingConvention): string;
 interface CombinedEnumInput {
   value: string;
   isRef: boolean;

package/dist/index.mjs

@@ -1038,12 +1038,20 @@ function replaceSpecialCharacters(key) {
 function getEnumNames(schemaObject) {
 	const names = schemaObject?.["x-enumNames"] ?? schemaObject?.["x-enumnames"] ?? schemaObject?.["x-enum-varnames"];
 	if (!names) return;
-	return names.map((name) => jsStringEscape(name));
+	if (Array.isArray(names)) return names.map((name) => jsStringEscape(name));
+	if (typeof names === "object") return (schemaObject?.enum ?? []).map((enumVal) => {
+		const key = String(enumVal);
+		return key in names ? jsStringEscape(names[key]) : void 0;
+	});
 }
 function getEnumDescriptions(schemaObject) {
 	const descriptions = schemaObject?.["x-enumDescriptions"] ?? schemaObject?.["x-enumdescriptions"] ?? schemaObject?.["x-enum-descriptions"];
 	if (!descriptions) return;
-	return descriptions.map((description) => jsStringEscape(description));
+	if (Array.isArray(descriptions)) return descriptions.map((description) => jsStringEscape(description));
+	if (typeof descriptions === "object") return (schemaObject?.enum ?? []).map((enumVal) => {
+		const key = String(enumVal);
+		return key in descriptions ? jsStringEscape(descriptions[key]) : void 0;
+	});
 }
 function getEnum(value, enumName, names, enumGenerationType, descriptions, enumNamingConvention) {
 	if (enumGenerationType === EnumGeneration.CONST) return getTypeConstEnum(value, enumName, names, descriptions, enumNamingConvention);
@@ -2273,6 +2281,8 @@ function getObject({ item, name, context, nullable, formDataContext }) {
 						const keyType = getIndexSignatureKey(schemaItem);
 						acc.value += `\n  [key: ${keyType}]: ${resolvedValue.value};\n}`;
 					}
+					acc.imports.push(...resolvedValue.imports);
+					acc.schemas.push(...resolvedValue.schemas);
 					acc.dependencies.push(...resolvedValue.dependencies);
 				}
 				else acc.value += "\n}";
@@ -3274,18 +3284,18 @@ function addDependency({ implementation, exports, dependency, projectName, isAll
 		});
 		if (types.length > 0) {
 			let uniqueTypes = types;
-			if (values.length > 0) {
-				uniqueTypes = types.filter((t) => !values.some((v) => v.name === t.name && (v.alias ?? "") === (t.alias ?? "")));
-				dep += "\n";
+			if (values.length > 0) uniqueTypes = types.filter((t) => !values.some((v) => v.name === t.name && (v.alias ?? "") === (t.alias ?? "")));
+			if (uniqueTypes.length > 0) {
+				if (values.length > 0) dep += "\n";
+				dep += generateDependency({
+					deps: uniqueTypes,
+					isAllowSyntheticDefaultImports,
+					dependency,
+					projectName,
+					key,
+					onlyTypes: true
+				});
 			}
-			dep += generateDependency({
-				deps: uniqueTypes,
-				isAllowSyntheticDefaultImports,
-				dependency,
-				projectName,
-				key,
-				onlyTypes: true
-			});
 		}
 		return dep;
 	}).join("\n") + "\n";
@@ -4644,8 +4654,8 @@ async function writeSplitMode({ builder, output, projectName, header, needSchema
 			isAllowSyntheticDefaultImports,
 			options: isFunction(output.mock) ? void 0 : output.mock
 		});
-		const schemasPath = output.schemas ? void 0 : nodePath.join(dirname, filename + ".schemas" + extension);
-		if (schemasPath && needSchema) await writeGeneratedFile(schemasPath, generateSchemasInline ? header + generateSchemasInline() : header + generateModelsInline(builder.schemas));
+		const schemasPath = !output.schemas && needSchema ? nodePath.join(dirname, filename + ".schemas" + extension) : void 0;
+		if (schemasPath) await writeGeneratedFile(schemasPath, generateSchemasInline ? header + generateSchemasInline() : header + generateModelsInline(builder.schemas));
 		if (mutators) implementationData += generateMutatorImports({
 			mutators,
 			implementation
@@ -4853,8 +4863,8 @@ async function writeSplitTagsMode({ builder, output, projectName, header, needSc
 				isAllowSyntheticDefaultImports,
 				options: isFunction(output.mock) ? void 0 : output.mock
 			});
-			const schemasPath = output.schemas ? void 0 : nodePath.join(dirname, filename + ".schemas" + extension);
-			if (schemasPath && needSchema) await writeGeneratedFile(schemasPath, generateSchemasInline ? header + generateSchemasInline() : header + generateModelsInline(builder.schemas));
+			const schemasPath = !output.schemas && needSchema ? nodePath.join(dirname, filename + ".schemas" + extension) : void 0;
+			if (schemasPath) await writeGeneratedFile(schemasPath, generateSchemasInline ? header + generateSchemasInline() : header + generateModelsInline(builder.schemas));
 			if (mutators) implementationData += generateMutatorImports({
 				mutators,
 				implementation,
@@ -4962,8 +4972,8 @@ async function writeTagsMode({ builder, output, projectName, header, needSchema,
 					options: isFunction(output.mock) ? void 0 : output.mock
 				});
 			}
-			const schemasPath = output.schemas ? void 0 : nodePath.join(dirname, filename + ".schemas" + extension);
-			if (schemasPath && needSchema) await writeGeneratedFile(schemasPath, generateSchemasInline ? header + generateSchemasInline() : header + generateModelsInline(builder.schemas));
+			const schemasPath = !output.schemas && needSchema ? nodePath.join(dirname, filename + ".schemas" + extension) : void 0;
+			if (schemasPath) await writeGeneratedFile(schemasPath, generateSchemasInline ? header + generateSchemasInline() : header + generateModelsInline(builder.schemas));
 			if (mutators) data += generateMutatorImports({
 				mutators,
 				implementation