@orval/mock 8.36.0 → 8.37.0

package/dist/index.mjs

@@ -520,6 +520,7 @@ function getMockObject({ item, mockOptions, operationId, tags, combine, context,
 			if (!isRequired && !resolvedValue.overrided && !hasDefault) {
 				if (resolvedValue.nullWrapped) return `${keyDefinition}: ${resolvedValue.value}`;
 				const omitValue = mockOptions?.nonNullable || !hasNullable ? "undefined" : "null";
+				if (omitValue === "undefined" && mockOptions?.exactOptional) return `...(faker.datatype.boolean() ? {${keyDefinition}: ${resolvedValue.value}} : {})`;
 				return `${keyDefinition}: faker.helpers.arrayElement([${resolvedValue.value}, ${omitValue}])`;
 			}
 			if (Array.isArray(prop.type) && prop.type.includes("null") && !resolvedValue.nullWrapped && !resolvedValue.overrided && !mockOptions?.nonNullable) return `${keyDefinition}: faker.helpers.arrayElement([${resolvedValue.value}, null])`;
@@ -934,7 +935,10 @@ function getMockScalar({ item, imports, mockOptions, operationId, tags, combine,
 				value = getNullable(`faker.number.float(${floatParts.length > 0 ? `{${floatParts.join(", ")}}` : ""})`, isNullable, nonNullableOption);
 			}
 			const numberImports = [];
-			if (item.enum) value = getEnum(item, numberImports, context, existingReferencedProperties, "number");
+			if (item.enum) value = getEnum(item, numberImports, context, existingReferencedProperties, {
+				type: "number",
+				exactOptional: safeMockOptions.exactOptional
+			});
 			else if ("const" in item) value = JSON.stringify(item.const);
 			return {
 				value,
@@ -947,7 +951,10 @@ function getMockScalar({ item, imports, mockOptions, operationId, tags, combine,
 		case "boolean": {
 			let value = "faker.datatype.boolean()";
 			const booleanImports = [];
-			if (item.enum) value = getEnum(item, booleanImports, context, existingReferencedProperties, "boolean");
+			if (item.enum) value = getEnum(item, booleanImports, context, existingReferencedProperties, {
+				type: "boolean",
+				exactOptional: safeMockOptions.exactOptional
+			});
 			else if ("const" in item) value = JSON.stringify(item.const);
 			return {
 				value,
@@ -1076,7 +1083,10 @@ function getMockScalar({ item, imports, mockOptions, operationId, tags, combine,
 			if (strMin !== void 0 && strMax !== void 0) strLenParts.push(`min: ${strMin}`, `max: ${strMax}`);
 			let value = `faker.string.alpha(${strLenParts.length > 0 ? `{length: {${strLenParts.join(", ")}}}` : ""})`;
 			const stringImports = [];
-			if (item.enum) value = getEnum(item, stringImports, context, existingReferencedProperties, "string");
+			if (item.enum) value = getEnum(item, stringImports, context, existingReferencedProperties, {
+				type: "string",
+				exactOptional: safeMockOptions.exactOptional
+			});
 			else if (item.pattern) value = `faker.helpers.fromRegExp(${JSON.stringify(item.pattern)})`;
 			else if ("const" in item) value = JSON.stringify(item.const);
 			return {
@@ -1097,7 +1107,7 @@ function getMockScalar({ item, imports, mockOptions, operationId, tags, combine,
 			if (item.enum) {
 				const enumImports = [];
 				return {
-					value: getEnum(item, enumImports, context, existingReferencedProperties),
+					value: getEnum(item, enumImports, context, existingReferencedProperties, { exactOptional: safeMockOptions.exactOptional }),
 					enums: item.enum,
 					imports: enumImports,
 					name: item.name
@@ -1180,7 +1190,7 @@ function safeTypeIdentifier(name) {
 	const identifier = name.endsWith("[]") ? name.slice(0, -2) : name;
 	return /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(identifier) ? identifier : void 0;
 }
-function getEnum(item, imports, context, existingReferencedProperties, type) {
+function getEnum(item, imports, context, existingReferencedProperties, { type, exactOptional } = {}) {
 	if (!item.enum) return "";
 	let enumValue = `[${item.enum.filter((e) => e !== null).map((e) => formatEnumMember(e)).join(",")}]`;
 	if (context.output.override.enumGenerationType === EnumGeneration.ENUM) {
@@ -1196,7 +1206,8 @@ function getEnum(item, imports, context, existingReferencedProperties, type) {
 			if (!parentReference) return "";
 			const parentIdentifier = safeTypeIdentifier(parentReference);
 			if (parentIdentifier) {
-				enumValue += ` as ${parentIdentifier}[${getStringLiteralType(item.name)}]`;
+				const indexedType = `${parentIdentifier}[${getStringLiteralType(item.name)}]`;
+				enumValue += exactOptional ? ` as Exclude<${indexedType}, undefined>` : ` as ${indexedType}`;
 				if (!item.path?.endsWith("[]")) enumValue += "[]";
 				imports.push({ name: parentIdentifier });
 			} else enumValue += " as const";
@@ -1638,6 +1649,7 @@ function getMockWithoutFunc(spec, override) {
 		numberMax: override?.mock?.numberMax,
 		required: override?.mock?.required,
 		nonNullable: override?.mock?.nonNullable,
+		exactOptional: override?.mock?.exactOptional,
 		fractionDigits: override?.mock?.fractionDigits,
 		...override?.mock?.properties ? { properties: getMockPropertiesWithoutFunc(override.mock.properties, spec) } : {},
 		...override?.mock?.format ? { format: getMockPropertiesWithoutFunc(override.mock.format, spec) } : {},