Merge commit 'refs/pull/528/merge' of github.com:ciscoheat/sveltekit-superforms

Author: ciscoheat

package.json

@@ -167,7 +167,7 @@
 		"joi": "^17.13.3",
 		"json-schema-to-ts": "^3.1.1",
 		"superstruct": "^2.0.2",
-		"valibot": "1.0.0-beta.9",
+		"valibot": "^1.0.0-beta.9",
 		"yup": "^1.5.0",
 		"zod": "^3.24.1",
 		"zod-to-json-schema": "^3.24.1"

src/lib/adapters/adapters.ts

@@ -9,14 +9,19 @@ import type {
 	Schema,
 	ValidationResult,
 	Infer as InferSchema,
-	InferIn as InferInSchema
+	InferIn as InferInSchema,
+	Registry
 } from './typeSchema.js';
 import { simpleSchema } from './simple-schema/index.js';
 
 export type { Schema, ValidationIssue, ValidationResult } from './typeSchema.js';
 
-export type Infer<T extends Schema> = NonNullable<InferSchema<T>>;
-export type InferIn<T extends Schema> = NonNullable<InferInSchema<T>>;
+export type Infer<T extends Schema, K extends keyof Registry = keyof Registry> = NonNullable<
+	InferSchema<T, K>
+>;
+export type InferIn<T extends Schema, K extends keyof Registry = keyof Registry> = NonNullable<
+	InferInSchema<T, K>
+>;
 
 export type ValidationLibrary =
 	| 'arktype'

src/lib/adapters/typeSchema.ts

@@ -14,7 +14,7 @@ import type {
 	InferOutput as Output
 } from 'valibot';
 import type { Schema as Schema$2, InferType } from 'yup';
-import type { ZodSchema, input, output } from 'zod';
+import type { ZodTypeAny, input, output } from 'zod';
 import type { SchemaTypes, Infer as VineInfer } from '@vinejs/vine/types';
 import type { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import type { Struct, Infer as Infer$2 } from 'superstruct';
@@ -128,9 +128,9 @@ interface YupResolver extends Resolver {
 }
 
 interface ZodResolver extends Resolver {
-	base: ZodSchema;
-	input: this['schema'] extends ZodSchema ? input<this['schema']> : never;
-	output: this['schema'] extends ZodSchema ? output<this['schema']> : never;
+	base: ZodTypeAny;
+	input: this['schema'] extends ZodTypeAny ? input<this['schema']> : never;
+	output: this['schema'] extends ZodTypeAny ? output<this['schema']> : never;
 }
 
 interface VineResolver extends Resolver {
@@ -198,8 +198,7 @@ interface RuntypesResolver extends Resolver {
 }
 
 */
-
-type Registry = {
+export type Registry = {
 	arktype: ArkTypeResolver;
 	classvalidator: ClassValidatorResolver;
 	custom: CustomResolver;
@@ -221,15 +220,15 @@ type Registry = {
     */
 };
 
-type Infer<TSchema extends Schema> = UnknownIfNever<
+type Infer<TSchema extends Schema, Keys extends keyof Registry = keyof Registry> = UnknownIfNever<
 	{
-		[K in keyof Registry]: IfDefined<InferOutput<Registry[K], TSchema>>;
-	}[keyof Registry]
+		[K in Keys]: IfDefined<InferOutput<Registry[K], TSchema>>;
+	}[Keys]
 >;
-type InferIn<TSchema extends Schema> = UnknownIfNever<
+type InferIn<TSchema extends Schema, Keys extends keyof Registry = keyof Registry> = UnknownIfNever<
 	{
-		[K in keyof Registry]: IfDefined<InferInput<Registry[K], TSchema>>;
-	}[keyof Registry]
+		[K in Keys]: IfDefined<InferInput<Registry[K], TSchema>>;
+	}[Keys]
 >;
 
 /*

src/lib/adapters/zod.ts

@@ -1,12 +1,4 @@
-import type {
-	AnyZodObject,
-	ZodDefault,
-	ZodEffects,
-	ZodErrorMap,
-	ZodType,
-	ZodTypeDef,
-	ZodUnion
-} from 'zod';
+import { type ZodErrorMap, type ZodType, type ZodTypeDef } from 'zod';
 import type { JSONSchema7 } from 'json-schema';
 import {
 	type AdapterOptions,
@@ -32,68 +24,55 @@ export const zodToJSONSchema = (...params: Parameters<typeof zodToJson>) => {
 	return zodToJson(...params) as JSONSchema7;
 };
 
-type ZodObjectUnion<T extends AnyZodObject> = ZodUnion<
-	[ZodValidation<T>, ZodValidation<T>, ...ZodValidation<T>[]]
+// allows for any object schema
+// allows `undefined` in the input type to account for ZodDefault
+export type ZodObjectType = ZodType<
+	Record<string, unknown>,
+	ZodTypeDef,
+	Record<string, unknown> | undefined
 >;
+export type ZodObjectTypes = ZodObjectType;
 
-export type ZodObjectType = ZodType<Record<string, unknown>, ZodTypeDef, Record<string, unknown>>;
-
-export type ZodObjectTypes = AnyZodObject | ZodObjectUnion<AnyZodObject> | ZodObjectType;
+// left in for compatibility reasons
+export type ZodValidation<T extends ZodObjectTypes = ZodObjectTypes> = T;
 
-export type ZodValidation<T extends ZodObjectTypes> =
-	| T
-	| ZodEffects<T>
-	| ZodEffects<ZodEffects<T>>
-	| ZodEffects<ZodEffects<ZodEffects<T>>>
-	| ZodEffects<ZodEffects<ZodEffects<ZodEffects<T>>>>
-	| ZodEffects<ZodEffects<ZodEffects<ZodEffects<ZodEffects<T>>>>>
-	| ZodEffects<ZodEffects<ZodEffects<ZodEffects<ZodEffects<ZodEffects<T>>>>>>
-	| ZodEffects<ZodEffects<ZodEffects<ZodEffects<ZodEffects<ZodEffects<ZodEffects<T>>>>>>>
-	| ZodDefault<T>
-	| ZodDefault<ZodEffects<T>>
-	| ZodDefault<ZodEffects<ZodEffects<T>>>
-	| ZodDefault<ZodEffects<ZodEffects<ZodEffects<T>>>>
-	| ZodDefault<ZodEffects<ZodEffects<ZodEffects<ZodEffects<T>>>>>
-	| ZodDefault<ZodEffects<ZodEffects<ZodEffects<ZodEffects<ZodEffects<T>>>>>>
-	| ZodDefault<ZodEffects<ZodEffects<ZodEffects<ZodEffects<ZodEffects<ZodEffects<T>>>>>>>
-	| ZodDefault<
-			ZodEffects<ZodEffects<ZodEffects<ZodEffects<ZodEffects<ZodEffects<ZodEffects<T>>>>>>>
-	  >;
-
-async function validate<T extends ZodValidation<ZodObjectTypes>>(
+async function validate<T extends ZodValidation>(
 	schema: T,
 	data: unknown,
 	errorMap: ZodErrorMap | undefined
-): Promise<ValidationResult<Infer<T>>> {
+): Promise<ValidationResult<Infer<T, 'zod'>>> {
 	const result = await schema.safeParseAsync(data, { errorMap });
 	if (result.success) {
 		return {
-			data: result.data as Infer<T>,
+			data: result.data as Infer<T, 'zod'>,
 			success: true
 		};
 	}
+
 	return {
 		issues: result.error.issues.map(({ message, path }) => ({ message, path })),
 		success: false
 	};
 }
 
-function _zod<T extends ZodValidation<ZodObjectTypes>>(
+function _zod<T extends ZodValidation>(
 	schema: T,
-	options?: AdapterOptions<Infer<T>> & { errorMap?: ZodErrorMap; config?: Partial<Options> }
-): ValidationAdapter<Infer<T>, InferIn<T>> {
+	options?: AdapterOptions<Infer<T, 'zod'>> & { errorMap?: ZodErrorMap; config?: Partial<Options> }
+): ValidationAdapter<Infer<T, 'zod'>, InferIn<T, 'zod'>> {
 	return createAdapter({
 		superFormValidationLibrary: 'zod',
-		validate: async (data) => validate(schema, data, options?.errorMap),
+		validate: async (data) => {
+			return validate(schema, data, options?.errorMap);
+		},
 		jsonSchema: options?.jsonSchema ?? zodToJSONSchema(schema, options?.config),
 		defaults: options?.defaults
 	});
 }
 
-function _zodClient<T extends ZodValidation<ZodObjectTypes>>(
+function _zodClient<T extends ZodValidation>(
 	schema: T,
 	options?: { errorMap?: ZodErrorMap }
-): ClientValidationAdapter<Infer<T>, InferIn<T>> {
+): ClientValidationAdapter<Infer<T, 'zod'>, InferIn<T, 'zod'>> {
 	return {
 		superFormValidationLibrary: 'zod',
 		validate: async (data) => validate(schema, data, options?.errorMap)