@orval/mock 8.29.0 → 8.31.0

package/README.md

@@ -3,7 +3,7 @@
 [![tests](https://github.com/orval-labs/orval/actions/workflows/tests.yaml/badge.svg)](https://github.com/orval-labs/orval/actions/workflows/tests.yaml)
 
 <p align="center">
-  <img src="./logo/orval-logo-horizontal.svg?raw=true" width="500" height="160" alt="orval - Restful Client Generator" />
+  <img src="../../logo/orval-logo-horizontal.svg?raw=true" width="500" height="160" alt="orval - Restful Client Generator" />
 </p>
 <h1 align="center">
   Visit <a href="https://orval.dev" target="_blank">orval.dev</a> for docs, guides, API and beer!

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { EnumGeneration, OutputMockType, OutputMode, PropertySortOrder, camelPathParamName, compareNatural, compareVersions, escapeRegExp, generalJSTypesWithArray, generateDependencyImports, getKey, getOperationTagKey, getRefInfo, getRequiredKeys, isBoolean, isFunction, isMswMock, isNumber, isObject, isReference, isString, jsStringLiteralEscape, mergeDeep, pascal, resolveRef, stringify, toColonRoutePath } from "@orval/core";
+import { EnumGeneration, OutputMockType, OutputMode, PropertySortOrder, camelPathParamName, compareNatural, compareVersions, escapeRegExp, generalJSTypesWithArray, generateDependencyImports, getKey, getOperationTagKey, getRefInfo, getRequiredKeys, getStringLiteralType, isBoolean, isFunction, isMswMock, isNumber, isObject, isReference, isString, jsStringLiteralEscape, mergeDeep, pascal, resolveRef, safeNumericConstraint, stringify, toColonRoutePath } from "@orval/core";
 import { prop } from "remeda";
 //#region src/mock-types.ts
 function isStrictMock(mockOptions) {
@@ -911,18 +911,20 @@ function getMockScalar({ item, imports, mockOptions, operationId, tags, combine,
 		case "number":
 		case "integer": {
 			const intFunction = context.output.override.useBigInt && (item.format === "int64" || item.format === "uint64") ? "bigInt" : "int";
-			const numMin = typeof item.exclusiveMinimum === "number" ? item.exclusiveMinimum : item.minimum ?? safeMockOptions.numberMin;
-			const numMax = typeof item.exclusiveMaximum === "number" ? item.exclusiveMaximum : item.maximum ?? safeMockOptions.numberMax;
+			const specMin = safeNumericConstraint(item.minimum, "minimum");
+			const specMax = safeNumericConstraint(item.maximum, "maximum");
+			const numMin = typeof item.exclusiveMinimum === "number" ? safeNumericConstraint(item.exclusiveMinimum, "exclusiveMinimum") : specMin ?? safeMockOptions.numberMin;
+			const numMax = typeof item.exclusiveMaximum === "number" ? safeNumericConstraint(item.exclusiveMaximum, "exclusiveMaximum") : specMax ?? safeMockOptions.numberMax;
 			const intParts = [];
 			if (numMin !== void 0) intParts.push(`min: ${numMin}`);
 			if (numMax !== void 0) intParts.push(`max: ${numMax}`);
-			if (isFakerV9 && item.multipleOf !== void 0) intParts.push(`multipleOf: ${item.multipleOf}`);
+			if (isFakerV9 && item.multipleOf !== void 0) intParts.push(`multipleOf: ${safeNumericConstraint(item.multipleOf, "multipleOf")}`);
 			let value = getNullable(`faker.number.${intFunction}(${intParts.length > 0 ? `{${intParts.join(", ")}}` : ""})`, isNullable, nonNullableOption);
 			if (type === "number") {
 				const floatParts = [];
 				if (numMin !== void 0) floatParts.push(`min: ${numMin}`);
 				if (numMax !== void 0) floatParts.push(`max: ${numMax}`);
-				if (isFakerV9 && item.multipleOf !== void 0) floatParts.push(`multipleOf: ${item.multipleOf}`);
+				if (isFakerV9 && item.multipleOf !== void 0) floatParts.push(`multipleOf: ${safeNumericConstraint(item.multipleOf, "multipleOf")}`);
 				else if (safeMockOptions.fractionDigits !== void 0) floatParts.push(`fractionDigits: ${safeMockOptions.fractionDigits}`);
 				value = getNullable(`faker.number.float(${floatParts.length > 0 ? `{${floatParts.join(", ")}}` : ""})`, isNullable, nonNullableOption);
 			}
@@ -1027,8 +1029,8 @@ function getMockScalar({ item, imports, mockOptions, operationId, tags, combine,
 			});
 			if (extractedItemCall) mapValue = extractedItemCall;
 			if (combine && !value.startsWith("faker") && !value.startsWith("{") && !value.startsWith("Array.from")) mapValue = `{${value}}`;
-			const arrSchemaMin = item.minItems;
-			const arrSchemaMax = item.maxItems;
+			const arrSchemaMin = safeNumericConstraint(item.minItems, "minItems");
+			const arrSchemaMax = safeNumericConstraint(item.maxItems, "maxItems");
 			const arrGlobalMin = safeMockOptions.arrayMin;
 			const arrGlobalMax = safeMockOptions.arrayMax;
 			let arrMin;
@@ -1051,8 +1053,8 @@ function getMockScalar({ item, imports, mockOptions, operationId, tags, combine,
 			};
 		}
 		case "string": {
-			const schemaMin = item.minLength;
-			const schemaMax = item.maxLength;
+			const schemaMin = safeNumericConstraint(item.minLength, "minLength");
+			const schemaMax = safeNumericConstraint(item.maxLength, "maxLength");
 			const globalMin = safeMockOptions.stringMin;
 			const globalMax = safeMockOptions.stringMax;
 			let strMin;
@@ -1359,7 +1361,7 @@ function resolveMockValue({ schema, mockOptions, operationId, tags, combine, con
 			if (!splitMockImplementations.some((f) => f.includes(`export const ${funcName}`))) {
 				const discriminatedProperty = newSchema.discriminator?.propertyName;
 				let overrideType = `Partial<${newSchema.name}>`;
-				if (discriminatedProperty) overrideType = `Omit<${overrideType}, '${discriminatedProperty}'>`;
+				if (discriminatedProperty) overrideType = `Omit<${overrideType}, ${getStringLiteralType(discriminatedProperty)}>`;
 				const { param, returnType, returnCast } = getMockFactorySignatureParts(newSchema.name, mockOptions, {
 					isOverridable: true,
 					overrideType
@@ -1711,6 +1713,24 @@ function getMockOptionsDataOverride(operationTags, operationId, override) {
 }
 //#endregion
 //#region src/msw/index.ts
+/**
+* Resolves an OpenAPI response key to the numeric status the generated handler
+* emits.
+*
+* The key comes straight from the document and lands in an unquoted expression
+* position (`{ status: 200 }`), so there is no quote to escape and no way to
+* make a non-numeric value safe there — a key like
+* `2,x:(<expression>)` would splice live code into the handler. Parse it, and
+* refuse the document rather than emitting whatever it says.
+*
+* `default` maps to 200 and a `NXX` wildcard to `N00`, matching what the
+* handler previously emitted for those keys.
+*/
+function assertSafeStatusCode(status) {
+	const normalized = status === "default" ? "200" : /^\dXX$/.test(status) ? `${status[0]}00` : status;
+	if (!/^\d{3}$/.test(normalized)) throw new Error(`orval: refusing to generate a mock handler for an OpenAPI response key that is not a status code (got "${status}"). This value would otherwise be emitted verbatim into generated source.`);
+	return Number(normalized);
+}
 function getMSWDependencies(options) {
 	const locale = options?.locale;
 	const fakerDependency = {
@@ -1789,7 +1809,7 @@ function generateDefinition(name, route, getResponseMockFunctionNameBase, handle
 	const binaryTypeRewriteRegex = new RegExp(String.raw`\b(?:${["Blob", ...binaryRefNames].map((n) => escapeRegExp(n)).join("|")})\b`, "g");
 	const mockReturnType = isBinaryResponse ? returnType.replaceAll(binaryTypeRewriteRegex, "ArrayBuffer") : returnType;
 	const isVoidUnionType = mockReturnType !== "void" && mockReturnType.split("|").some((part) => part.trim() === "void");
-	const noContentStatusCode = isVoidUnionType ? responses.find((r) => r.value === "void")?.key ?? "204" : void 0;
+	const noContentStatusCode = isVoidUnionType ? assertSafeStatusCode(responses.find((r) => r.value === "void")?.key ?? "204") : void 0;
 	const nonVoidMockReturnType = isVoidUnionType ? mockReturnType.split("|").filter((part) => part.trim() !== "void").join(" | ").trim() : mockReturnType;
 	const hasJsonContentType = contentTypesByPreference.some((ct) => ct.includes("json") || ct.includes("+json"));
 	const hasStringReturnType = isTypeExactlyString(mockReturnType) || isUnionContainingString(mockReturnType);
@@ -1824,7 +1844,7 @@ function generateDefinition(name, route, getResponseMockFunctionNameBase, handle
 	const resolvedResponseExpr = `overrideResponse !== undefined
     ? (typeof overrideResponse === "function" ? await overrideResponse(${infoParam}) : overrideResponse)
     : ${getResponseMockFunctionName}()`;
-	const statusCode = status === "default" ? 200 : status.replace(/XX$/, "00");
+	const statusCode = assertSafeStatusCode(status);
 	const binaryContentType = (preferredContentTypeMatch && isBinaryLikeContentType(preferredContentTypeMatch) ? preferredContentTypeMatch : contentTypes.find((ct) => isBinaryLikeContentType(ct))) ?? "application/octet-stream";
 	const firstTextCt = isExactlyStringReturnType && !!preferredContentTypeMatch && !isTextLikeContentType(preferredContentTypeMatch) && hasTextLikeContentType ? contentTypes.find((ct) => isTextLikeContentType(ct)) : contentTypesByPreference.find((ct) => isTextLikeContentType(ct));
 	const textHelper = firstTextCt === "application/xml" || firstTextCt?.endsWith("+xml") ? "xml" : firstTextCt === "text/html" ? "html" : "text";