@orval/zod 8.36.0 → 8.38.0

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { ClientBuilder, ClientDependenciesBuilder, ClientGeneratorsBuilder, ContextSpec, GeneratorMutator, GeneratorVerbOptions, OpenApiParameterObject, OpenApiReferenceObject, OpenApiSchemaObject, PackageJson, ZodCoerceType, ZodVariantOption, ZodVersionOption } from "@orval/core";
+import { ClientBuilder, ClientDependenciesBuilder, ClientGeneratorsBuilder, ContextSpec, GeneratorMutator, GeneratorVerbOptions, OpenApiNonBooleanSchemaObject, OpenApiParameterObject, OpenApiReferenceObject, OpenApiSchemaObject, PackageJson, ZodCoerceType, ZodVariantOption, ZodVersionOption } from "@orval/core";
 //#region src/compatible-v4.d.ts
 export declare const isZodVersionV4: (packageJson: PackageJson) => boolean;
 /**
@@ -87,7 +87,7 @@ interface DateTimeOptions {
 interface TimeOptions {
   precision?: -1 | 0 | 1 | 2 | 3;
 }
-export declare const generateZodValidationSchemaDefinition: (schema: OpenApiSchemaObject | OpenApiReferenceObject | undefined, context: ContextSpec, name: string, strict: boolean, isZodV4: boolean, rules?: {
+export declare const generateZodValidationSchemaDefinition: (schemaInput: OpenApiSchemaObject | OpenApiReferenceObject | undefined, context: ContextSpec, name: string, strict: boolean, isZodV4: boolean, rules?: {
   required?: boolean;
   /**
    * Required keys inherited from sibling `allOf` members. Per JSON Schema /
@@ -178,7 +178,7 @@ export declare const parseZodValidationSchemaDefinition: (input: ZodValidationSc
  *  3. If resolved to a concrete schema, inline it (same as `$ref`).
  *  4. If unresolved, external, or a generic parameter → return `{}`.
  */
-export declare const dereference: (schema: OpenApiSchemaObject | OpenApiReferenceObject, context: ContextSpec) => OpenApiSchemaObject;
+export declare const dereference: (schema: OpenApiSchemaObject | OpenApiReferenceObject, context: ContextSpec) => OpenApiNonBooleanSchemaObject;
 /**
  * Generate zod schema for form-data request body.
  * Handles file type detection for top-level properties based on encoding.contentType

package/dist/index.mjs

@@ -1,9 +1,5 @@
-import { EnumGeneration, assertSafeNumericConstraint, buildDynamicScope, buildInlineDynamicScope, camel, compareVersions, createLogger, generateMutator, getDynamicAnchorName, getEnumImplementation, getEnumMembers, getEnumValueInfo, getFormDataFieldFileType, getNumberWord, getRefInfo, getRequiredKeys, hasEnumMetadata, isBoolean, isDynamicReference, isNumber, isObject, isSchemaNullable, isString, jsStringEscape, jsStringLiteralEscape, pascal, resolveDynamicRef, resolveRef, safeNumericConstraint, stringify } from "@orval/core";
+import { EnumGeneration, assertSafeNumericConstraint, buildDynamicScope, buildInlineDynamicScope, camel, compareVersions, createLogger, generateMutator, getDynamicAnchorName, getEnumImplementation, getEnumMembers, getEnumValueInfo, getFormDataFieldFileType, getNumberWord, getRefInfo, getRequiredKeys, hasEnumMetadata, isBoolean, isDynamicReference, isNumber, isObject, isSchemaNullable, isString, jsStringEscape, jsStringLiteralEscape, pascal, resolveDynamicRef, resolveRef, safeNumericConstraint, stringify, toObjectSchema, unique } from "@orval/core";
 import jsesc from "jsesc";
-import { unique } from "remeda";
-//#region src/logger.ts
-const logger = createLogger("@orval/zod");
-//#endregion
 //#region src/compatible-v4.ts
 const getZodPackageVersion = (packageJson) => {
 	return packageJson.resolvedVersions?.zod ?? packageJson.dependencies?.zod ?? packageJson.devDependencies?.zod ?? packageJson.peerDependencies?.zod;
@@ -131,6 +127,9 @@ const renderZodExport = (block) => {
 	return `${constLine}\n\n${companionLines(block.name)}`;
 };
 //#endregion
+//#region src/logger.ts
+const logger = createLogger("@orval/zod");
+//#endregion
 //#region src/index.ts
 const getZodDependencies = (_hasGlobalMutator, _hasParamsSerializerOptions, _packageJson, _httpClient, _hasTagsMutator, override) => [{
 	exports: [{
@@ -166,9 +165,10 @@ const predefinedZodFormats = /* @__PURE__ */ new Set([
 	"uuid"
 ]);
 const resolveZodType = (schema) => {
+	if (typeof schema !== "object") return schema ? "unknown" : "never";
 	const schemaTypeValue = schema.type;
 	if (Array.isArray(schemaTypeValue)) {
-		const nonNullTypes = schemaTypeValue.filter((t) => isString(t)).filter((t) => t !== "null" && possibleSchemaTypes.has(t));
+		const nonNullTypes = schemaTypeValue.filter((t) => t !== "null" && possibleSchemaTypes.has(t));
 		if (nonNullTypes.length > 1) return { multiType: nonNullTypes };
 		const type = nonNullTypes[0];
 		if (type === "array" && "prefixItems" in schema) return "tuple";
@@ -252,6 +252,7 @@ function needsInlineDefault(schema, seen = /* @__PURE__ */ new Set()) {
 	return false;
 }
 const removeReadOnlyProperties = (schema) => {
+	if (typeof schema !== "object") return toObjectSchema(schema);
 	if (schema.properties && isObject(schema.properties)) {
 		const filteredProperties = {};
 		for (const [key, value] of Object.entries(schema.properties)) {
@@ -282,11 +283,16 @@ const decodeDiscriminatorSeparator = (fn) => {
 	};
 };
 const resolveUnionMemberSchema = (member, context) => {
-	if (member && "$ref" in member && typeof member.$ref === "string") return tryResolveRefSchema(member.$ref, context);
+	if (typeof member !== "object") return toObjectSchema(member);
+	if ("$ref" in member && typeof member.$ref === "string") {
+		const resolved = tryResolveRefSchema(member.$ref, context);
+		return resolved ? toObjectSchema(resolved) : void 0;
+	}
 	return member;
 };
 const isPlainObjectSchema = (schema) => {
-	if (!schema || schema.oneOf || schema.anyOf || schema.allOf) return false;
+	if (!schema || typeof schema !== "object") return false;
+	if (schema.oneOf || schema.anyOf || schema.allOf) return false;
 	return schema.type === "object" || isObject(schema.properties) && Object.keys(schema.properties).length > 0;
 };
 const SHAPELESS_MEMBER_KEYS = /* @__PURE__ */ new Set([
@@ -296,13 +302,13 @@ const SHAPELESS_MEMBER_KEYS = /* @__PURE__ */ new Set([
 	"not"
 ]);
 const isConstraintOnlyMember = (member) => {
-	if ("$ref" in member) return false;
+	if (typeof member !== "object" || "$ref" in member) return false;
 	const schema = member;
 	if (!Array.isArray(schema.required) || schema.required.length === 0) return false;
 	return Object.keys(schema).every((key) => SHAPELESS_MEMBER_KEYS.has(key));
 };
 const getForbiddenKeys = (member) => {
-	if (!isObject(member.not)) return void 0;
+	if (typeof member !== "object" || typeof member.not !== "object") return;
 	const not = member.not;
 	const branches = Array.isArray(not.anyOf) ? not.anyOf : Array.isArray(not.required) ? [not] : [];
 	const forbidden = /* @__PURE__ */ new Set();
@@ -310,14 +316,14 @@ const getForbiddenKeys = (member) => {
 	return forbidden.size > 0 ? [...forbidden] : void 0;
 };
 const hasLiteralDiscriminator = (schema, property) => {
-	if (!schema || !isObject(schema.properties)) return false;
+	if (!schema || typeof schema !== "object" || !isObject(schema.properties)) return false;
 	const propertySchema = schema.properties[property];
 	if (!isObject(propertySchema)) return false;
 	return propertySchema.const !== void 0 || Array.isArray(propertySchema.enum);
 };
 const collectDiscriminatorValues = (member, property, context) => {
 	const readValues = (schema) => {
-		if (!schema || !isObject(schema.properties)) return null;
+		if (!schema || typeof schema !== "object" || !isObject(schema.properties)) return null;
 		const propertySchema = schema.properties[property];
 		if (!isObject(propertySchema)) return null;
 		const constValue = propertySchema.const;
@@ -351,11 +357,12 @@ const isDiscriminatableMember = (member, property, useReusableSchemas, context)
 	if (!isPlainObjectSchema(resolved)) return false;
 	return hasLiteralDiscriminator(resolved, property);
 };
-const generateZodValidationSchemaDefinition = (schema, context, name, strict, isZodV4, rules) => {
-	if (!schema) return {
-		functions: [],
+const generateZodValidationSchemaDefinition = (schemaInput, context, name, strict, isZodV4, rules) => {
+	if (schemaInput == null || typeof schemaInput !== "object") return {
+		functions: schemaInput === true ? [["unknown", void 0]] : schemaInput === false ? [["never", void 0]] : [],
 		consts: []
 	};
+	let schema = schemaInput;
 	const CHAINABLE_SIBLINGS = /* @__PURE__ */ new Set(["default", "description"]);
 	const isChainable = (k) => CHAINABLE_SIBLINGS.has(k);
 	const applyChainableSiblings = (functions, consts, siblingSchema) => {
@@ -457,8 +464,9 @@ const generateZodValidationSchemaDefinition = (schema, context, name, strict, is
 		const separator = schema.allOf ? "allOf" : schema.oneOf ? "oneOf" : "anyOf";
 		const schemas = schema.allOf ?? schema.oneOf ?? schema.anyOf;
 		const discriminatorProperty = (() => {
-			if (!context.output?.override?.zod?.generateDiscriminatedUnion || !(schema.oneOf || schema.anyOf) || !schema.discriminator?.propertyName || schemas.length <= 1) return;
-			const property = schema.discriminator.propertyName;
+			const propertyName = schema.discriminator?.propertyName;
+			if (!context.output?.override?.zod?.generateDiscriminatedUnion || !(schema.oneOf || schema.anyOf) || typeof propertyName !== "string" || schemas.length <= 1) return;
+			const property = propertyName;
 			if (!schemas.every((member) => isDiscriminatableMember(member, property, useReusableSchemas, context))) return;
 			const seenValues = /* @__PURE__ */ new Set();
 			for (const member of schemas) {
@@ -474,7 +482,7 @@ const generateZodValidationSchemaDefinition = (schema, context, name, strict, is
 		})();
 		const unionSeparator = discriminatorProperty ? encodeDiscriminatorSeparator(separator, discriminatorProperty) : separator;
 		const allOfRequired = schema.allOf ? [.../* @__PURE__ */ new Set([...getRequiredKeys(schema, name), ...schemas.flatMap((member, index) => {
-			const isRef = "$ref" in member && typeof member.$ref === "string";
+			const isRef = typeof member === "object" && member !== null && "$ref" in member && typeof member.$ref === "string";
 			const resolved = isRef ? tryResolveRefSchema(member.$ref, context) : member;
 			if (!resolved) return [];
 			return getRequiredKeys(resolved, isRef ? member.$ref : `${name}.allOf[${index}]`);
@@ -482,8 +490,9 @@ const generateZodValidationSchemaDefinition = (schema, context, name, strict, is
 		const withSiblingProperties = (member) => {
 			const properties = schema.properties;
 			if (!(schema.oneOf || schema.anyOf) || !isObject(properties) || Object.keys(properties).length === 0 || !isConstraintOnlyMember(member)) return member;
+			if (typeof member !== "object") return member;
 			const required = member.required;
-			if (!required.every((key) => Object.hasOwn(properties, key))) return member;
+			if (!required?.every((key) => Object.hasOwn(properties, key))) return member;
 			const forbidden = getForbiddenKeys(member);
 			let propertyOverrides;
 			if (forbidden) {
@@ -500,7 +509,7 @@ const generateZodValidationSchemaDefinition = (schema, context, name, strict, is
 				type: "object",
 				properties,
 				required,
-				description: member.description,
+				description: typeof member === "object" ? member.description : void 0,
 				"x-orval-property-overrides": propertyOverrides
 			};
 		};
@@ -587,7 +596,7 @@ const generateZodValidationSchemaDefinition = (schema, context, name, strict, is
 		} else {
 			defaultValue = formatDefaultValue(schema.default);
 			const hasEnumOrObjectItems = schema.items && typeof schema.items === "object" && ("enum" in schema.items || schema.items.type === "object" || "$ref" in schema.items || needsInlineDefault(schema.items));
-			const isArrayWithEnumItems = Array.isArray(schema.default) && type === "array" && schema.items && "enum" in schema.items && schema.default.length > 0;
+			const isArrayWithEnumItems = Array.isArray(schema.default) && type === "array" && schema.items && typeof schema.items === "object" && "enum" in schema.items && schema.default.length > 0;
 			const isArrayWithObjectItems = Array.isArray(schema.default) && type === "array" && hasEnumOrObjectItems && schema.default.length > 0;
 			if (isArrayWithEnumItems || isArrayWithObjectItems) {
 				defaultVarName = defaultValue;
@@ -637,9 +646,8 @@ const generateZodValidationSchemaDefinition = (schema, context, name, strict, is
 			* >
 			* > Omitting this keyword has the same assertion behavior as an empty array.
 			*/
-			if ("prefixItems" in schema) {
-				const schema31 = schema;
-				const prefixItems = Array.isArray(schema31.prefixItems) ? schema31.prefixItems : [];
+			if (schema.prefixItems) {
+				const prefixItems = Array.isArray(schema.prefixItems) ? schema.prefixItems : [];
 				if (prefixItems.length > 0) {
 					functions.push(["tuple", prefixItems.map((item, idx) => generateZodValidationSchemaDefinition(dereference(item, context), context, camel(`${name}-${idx}-item`), strict, isZodV4, {
 						required: true,
@@ -1343,26 +1351,28 @@ function extractSchemaNameFromRef($ref) {
 *  4. If unresolved, external, or a generic parameter → return `{}`.
 */
 const dereference = (schema, context) => {
-	const refName = "$ref" in schema ? schema.$ref : void 0;
+	if (typeof schema !== "object") return toObjectSchema(schema);
+	const refName = typeof schema.$ref === "string" ? schema.$ref : void 0;
 	if (refName && context.parents?.includes(refName)) return {};
-	if (isDynamicReference(schema)) return dereferenceDynamicRef(schema, context);
+	if (isDynamicReference(schema)) return toObjectSchema(dereferenceDynamicRef(schema, context));
 	const childContext = {
 		...context,
 		...refName ? { parents: [...context.parents ?? [], refName] } : void 0
 	};
-	const resolvedSchema = "$ref" in schema ? (() => {
+	const resolvedSchema = typeof schema.$ref === "string" ? (() => {
 		const referencedSchema = tryResolveRefSchema(schema.$ref, context);
-		if (!referencedSchema || !isObject(referencedSchema)) return;
+		if (!referencedSchema) return;
+		if (typeof referencedSchema !== "object") return toObjectSchema(referencedSchema);
 		const siblingProperties = Object.fromEntries(Object.entries(schema).filter(([key]) => key !== "$ref"));
 		return {
 			...referencedSchema,
 			...siblingProperties
 		};
 	})() : schema;
-	if (!resolvedSchema) return {};
+	if (!resolvedSchema || typeof resolvedSchema !== "object") return typeof resolvedSchema === "boolean" ? toObjectSchema(resolvedSchema) : {};
 	const resolvedContext = buildScopedContext(childContext, refName, resolvedSchema);
-	if (isDynamicReference(resolvedSchema)) return dereferenceDynamicRef(resolvedSchema, resolvedContext);
-	return dereferenceProperties(resolvedSchema, resolvedContext);
+	if (isDynamicReference(resolvedSchema)) return toObjectSchema(dereferenceDynamicRef(resolvedSchema, resolvedContext));
+	return toObjectSchema(dereferenceProperties(resolvedSchema, resolvedContext));
 };
 function dereferenceProperties(schema, context) {
 	return Object.entries(schema).reduce((acc, [key, value]) => {
@@ -1426,6 +1436,10 @@ function encodeSegment(segment) {
 * and contentMediaType. Mirrors type gen's resolveFormDataRootObject.
 */
 const generateFormDataZodSchema = (schema, context, name, strict, isZodV4, encoding, useReusableSchemas) => {
+	if (typeof schema !== "object") return generateZodValidationSchemaDefinition(schema, context, name, strict, isZodV4, {
+		required: true,
+		useReusableSchemas
+	});
 	const propertyOverrides = {};
 	if (schema.properties) for (const key of Object.keys(schema.properties)) {
 		const propSchema = schema.properties[key];
@@ -1501,7 +1515,7 @@ const parseBodyAndResponse = ({ data, context, name, strict, generate, isZodV4,
 		const min = safeNumericConstraint(rawMin, "minimum/minLength/minItems");
 		const max = safeNumericConstraint(rawMax, "maximum/maxLength/maxItems");
 		const rawItems = useReusableSchemas ? (() => {
-			return resolveRef(schema, context).schema.items ?? resolvedJsonSchema.items;
+			return toObjectSchema(typeof schema === "boolean" ? schema : resolveRef(schema, context).schema).items ?? resolvedJsonSchema.items;
 		})() : resolvedJsonSchema.items;
 		return {
 			input: generateZodValidationSchemaDefinition(parseType === "body" ? removeReadOnlyProperties(rawItems) : rawItems, context, name, strict, isZodV4, {
@@ -1537,7 +1551,7 @@ const parseResponseSchema = ({ verb, pathRoute, override }, context) => {
 	return {
 		isZodV4,
 		...parseBodyAndResponse({
-			data: getSingleResponse(context.spec.paths?.[pathRoute]?.[verb]?.responses),
+			data: getSingleResponse((verb === "query" ? void 0 : context.spec.paths?.[pathRoute]?.[verb])?.responses),
 			context,
 			name: "response",
 			strict: override.zod.strict.response,
@@ -1613,10 +1627,10 @@ const parseParameters = ({ data, context, operationName, isZodV4, strict, genera
 	const constNameRegistry = {};
 	const defintionsByParameters = data.reduce((acc, val) => {
 		const { schema: parameter } = resolveRef(val, context);
-		if (!parameter.schema) return acc;
-		if (!parameter.in || !parameter.name) return acc;
-		const schemaForGen = useReusableSchemas ? parameter.description ? Object.assign({}, parameter.schema, { description: parameter.description }) : parameter.schema : (() => {
-			const s = dereference(parameter.schema, context);
+		if (!("schema" in parameter) || !parameter.in || !parameter.name) return acc;
+		const parameterSchema = typeof parameter.schema === "boolean" ? toObjectSchema(parameter.schema) : parameter.schema;
+		const schemaForGen = useReusableSchemas ? parameter.description ? Object.assign({}, parameterSchema, { description: parameter.description }) : parameterSchema : (() => {
+			const s = dereference(parameterSchema, context);
 			s.description = parameter.description;
 			return s;
 		})();
@@ -1699,7 +1713,8 @@ const generateZodRoute = async ({ operationId, operationName, typeName, verb, ov
 	const useReusableSchemas = context.output.override.zod.generateReusableSchemas;
 	const spec = context.spec.paths?.[pathRoute];
 	if (spec == void 0) throw new Error(`No such path ${pathRoute} in ${context.projectName}`);
-	const parameters = [...spec.parameters ?? [], ...spec[verb]?.parameters ?? []];
+	const operation = verb === "query" ? void 0 : spec[verb];
+	const parameters = [...spec.parameters ?? [], ...operation?.parameters ?? []];
 	const parsedParameters = parseParameters({
 		data: parameters,
 		context,
@@ -1709,7 +1724,7 @@ const generateZodRoute = async ({ operationId, operationName, typeName, verb, ov
 		generate: override.zod.generate,
 		useReusableSchemas
 	});
-	const requestBody = spec[verb]?.requestBody;
+	const requestBody = operation?.requestBody;
 	const parsedBody = parseBodyAndResponse({
 		data: requestBody,
 		context,
@@ -1720,7 +1735,7 @@ const generateZodRoute = async ({ operationId, operationName, typeName, verb, ov
 		parseType: "body",
 		useReusableSchemas
 	});
-	const responses = context.output.override.zod.generateEachHttpStatus ? Object.entries(spec[verb]?.responses ?? {}) : [["", getSingleResponse(spec[verb]?.responses)]];
+	const responses = context.output.override.zod.generateEachHttpStatus ? Object.entries(operation?.responses ?? {}) : [["", getSingleResponse(operation?.responses)]];
 	const parsedResponses = responses.map(([code, response]) => parseBodyAndResponse({
 		data: response,
 		context,
@@ -1875,7 +1890,7 @@ const generateZodRoute = async ({ operationId, operationName, typeName, verb, ov
 					let isNoContent;
 					if (isEachHttpStatusMode) isNoContent = noContentStatusCodes.has(statusCode);
 					else {
-						const specResponseKeys = new Set(Object.keys(spec[verb]?.responses ?? {}));
+						const specResponseKeys = new Set(Object.keys(operation?.responses ?? {}));
 						isNoContent = !(specResponseKeys.has("200") || specResponseKeys.has("2XX") || specResponseKeys.has("2xx"));
 					}
 					const noContentSchema = isNoContent ? zodVariant === "mini" ? zodMiniCall("void") : "zod.void()" : zodVariant === "mini" ? zodMiniCall("unknown") : "zod.unknown()";