Zod adapter now supports ZodType.

Author: ciscoheat

CHANGELOG.md

@@ -16,7 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Empty file entries didn't return `null` for nullable schema fields. **Ensure that all required file fields aren't set to nullable.**
 - Allowed `string` index in `$errors` and `$tainted`.
 - `submit` can now be passed directly to event handlers.
-- Updated to latest `valibot-json-schema`, with support for [enum_](https://valibot.dev/guides/enums/), amongst others.
+- Updated to latest `valibot-json-schema`, with support for [enum\_](https://valibot.dev/guides/enums/), amongst others.
+- Zod adapter now supports `ZodType`.
 
 ## [2.6.2] - 2024-02-25
 

src/lib/adapters/zod.ts

@@ -1,4 +1,4 @@
-import type { AnyZodObject, ZodDefault, ZodEffects, ZodUnion } from 'zod';
+import type { AnyZodObject, ZodDefault, ZodEffects, ZodType, ZodTypeDef, ZodUnion } from 'zod';
 import type { JSONSchema7 } from 'json-schema';
 import {
 	type AdapterOptions,
@@ -27,7 +27,11 @@ type ZodObjectUnion<T extends AnyZodObject> = ZodUnion<
 	[ZodValidation<T>, ZodValidation<T>, ...ZodValidation<T>[]]
 >;
 
-export type ZodValidation<T extends AnyZodObject | ZodObjectUnion<AnyZodObject>> =
+type ZodObjectType = ZodType<Record<string, unknown>, ZodTypeDef, Record<string, unknown>>;
+
+type ZodObjectTypes = AnyZodObject | ZodObjectUnion<AnyZodObject> | ZodObjectType;
+
+export type ZodValidation<T extends ZodObjectTypes> =
 	| T
 	| ZodEffects<T>
 	| ZodEffects<ZodEffects<T>>
@@ -47,7 +51,7 @@ export type ZodValidation<T extends AnyZodObject | ZodObjectUnion<AnyZodObject>>
 			ZodEffects<ZodEffects<ZodEffects<ZodEffects<ZodEffects<ZodEffects<ZodEffects<T>>>>>>>
 	  >;
 
-async function validate<T extends ZodValidation<AnyZodObject | ZodObjectUnion<AnyZodObject>>>(
+async function validate<T extends ZodValidation<ZodObjectTypes>>(
 	schema: T,
 	data: unknown
 ): Promise<ValidationResult<Infer<T>>> {
@@ -64,7 +68,7 @@ async function validate<T extends ZodValidation<AnyZodObject | ZodObjectUnion<An
 	};
 }
 
-function _zod<T extends ZodValidation<AnyZodObject | ZodObjectUnion<AnyZodObject>>>(
+function _zod<T extends ZodValidation<ZodObjectTypes>>(
 	schema: T,
 	options?: AdapterOptions<T>
 ): ValidationAdapter<Infer<T>, InferIn<T>> {
@@ -76,7 +80,7 @@ function _zod<T extends ZodValidation<AnyZodObject | ZodObjectUnion<AnyZodObject
 	});
 }
 
-function _zodClient<T extends ZodValidation<AnyZodObject | ZodObjectUnion<AnyZodObject>>>(
+function _zodClient<T extends ZodValidation<ZodObjectTypes>>(
 	schema: T
 ): ClientValidationAdapter<Infer<T>, InferIn<T>> {
 	return {

src/tests/superValidate.test.ts

@@ -47,6 +47,7 @@ import { vine } from '$lib/adapters/vine.js';
 import Vine from '@vinejs/vine';
 import { traversePath } from '$lib/traversal.js';
 import { splitPath } from '$lib/stringPath.js';
+import { SchemaError } from '$lib/index.js';
 
 ///// Test data /////////////////////////////////////////////////////
 
@@ -439,6 +440,26 @@ describe('Zod', () => {
 		expect(adapter.constraints.letter?.required).toBe(true);
 	});
 
+	it('should accept ZodType for the adapter', () => {
+		type User = {
+			userId: string;
+			name: string;
+			manager?: User | null;
+		};
+
+		const UserSchema: z.ZodType<User> = z.object({
+			userId: z.string().uuid(),
+			name: z.string(),
+			manager: z.union([z.null(), z.lazy(() => UserSchema)])
+		});
+
+		zod(UserSchema);
+
+		const NumberSchema: z.ZodType<number> = z.number().int();
+		// @ts-expect-error Not an object schema
+		expect(() => zod(NumberSchema)).toThrowError(SchemaError);
+	});
+
 	schemaTest(zod(schema));
 });