Migrate valibot to v0.31.0-rc-5. (#437)

All tests passing.

Author: slowsage

package.json

@@ -110,7 +110,7 @@
 		"joi": "^17.13.1",
 		"superstruct": "^1.0.4",
 		"svelte": "3.x || 4.x || >=5.0.0-next.51",
-		"valibot": ">=0.28.1 <=0.30.0",
+		"valibot": ">=0.31.0 <=0.32.0",
 		"yup": "^1.4.0",
 		"zod": "^3.23.8"
 	},
@@ -145,15 +145,15 @@
 	},
 	"optionalDependencies": {
 		"@exodus/schemasafe": "^1.3.0",
-		"@gcornut/valibot-json-schema": "^0.0.27",
+		"@gcornut/valibot-json-schema": "^0.31.0",
 		"@sinclair/typebox": "^0.32.30",
 		"@sodaru/yup-to-json-schema": "^2.0.1",
 		"@vinejs/vine": "^1.8.0",
 		"arktype": "2.0.0-dev.15",
 		"joi": "^17.13.1",
 		"json-schema-to-ts": "^3.1.0",
 		"superstruct": "^1.0.4",
-		"valibot": "^0.30.0",
+		"valibot": "^0.31.0",
 		"yup": "^1.4.0",
 		"zod": "^3.23.8",
 		"zod-to-json-schema": "^3.23.0"

pnpm-lock.yaml

@@ -1,7 +1,12 @@
 import type { TSchema, Static as Static$1 } from '@sinclair/typebox';
 import type { Type } from 'arktype';
 import type { AnySchema } from 'joi';
-import type { BaseSchema, BaseSchemaAsync, Input, Output } from 'valibot';
+import type {
+	GenericSchema,
+	GenericSchemaAsync,
+	InferInput as Input,
+	InferOutput as Output
+} from 'valibot';
 import type { Schema as Schema$2, InferType } from 'yup';
 import type { ZodSchema, input, output } from 'zod';
 import type { SchemaTypes, Infer as VineInfer } from '@vinejs/vine/types';
@@ -47,7 +52,7 @@ type InferSchema<TResolver extends Resolver> = TResolver['base'];
 
 type ValidationIssue = {
 	message: string;
-	path?: Array<string | number | symbol>;
+	path?: Array<string | number | symbol | unknown>;
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -94,9 +99,11 @@ interface TypeBoxResolver extends Resolver {
 }
 
 interface ValibotResolver extends Resolver {
-	base: BaseSchema | BaseSchemaAsync;
-	input: this['schema'] extends BaseSchema | BaseSchemaAsync ? Input<this['schema']> : never;
-	output: this['schema'] extends BaseSchema | BaseSchemaAsync ? Output<this['schema']> : never;
+	base: GenericSchema | GenericSchemaAsync;
+	input: this['schema'] extends GenericSchema | GenericSchemaAsync ? Input<this['schema']> : never;
+	output: this['schema'] extends GenericSchema | GenericSchemaAsync
+		? Output<this['schema']>
+		: never;
 }
 
 interface YupResolver extends Resolver {

src/lib/adapters/typeSchema.ts

@@ -7,21 +7,29 @@ import {
 	type ValidationResult,
 	type ClientValidationAdapter
 } from './adapters.js';
-import { safeParseAsync, type BaseSchema, type BaseSchemaAsync, type SchemaConfig } from 'valibot';
+import {
+	safeParseAsync,
+	type GenericSchema,
+	type GenericSchemaAsync,
+	type Config,
+	type GenericIssue,
+	type IssuePathItem,
+	type SetPathItem
+} from 'valibot';
 import { memoize } from '$lib/memoize.js';
 import {
 	type ToJSONSchemaOptions,
 	toJSONSchema as valibotToJSON
 } from '@gcornut/valibot-json-schema';
 import type { JSONSchema } from '../jsonSchema/index.js';
 
-type SupportedSchemas = BaseSchema | BaseSchemaAsync;
+type SupportedSchemas = GenericSchema | GenericSchemaAsync;
 
 const defaultOptions = {
 	strictObjectTypes: true,
 	dateStrategy: 'integer' as const,
 	ignoreUnknownValidation: true,
-	customSchemaConversion: { special: () => ({}), instance: () => ({}) }
+	customSchemaConversion: { custom: () => ({}), instance: () => ({}) }
 } satisfies ToJSONSchemaOptions;
 
 /* @__NO_SIDE_EFFECTS__ */
@@ -32,7 +40,7 @@ export const valibotToJSONSchema = (options: ToJSONSchemaOptions) => {
 async function validate<T extends SupportedSchemas>(
 	schema: T,
 	data: unknown,
-	config?: SchemaConfig
+	config?: Config<GenericIssue<unknown>>
 ): Promise<ValidationResult<Infer<T>>> {
 	const result = await safeParseAsync(schema, data, config);
 	if (result.success) {
@@ -44,7 +52,7 @@ async function validate<T extends SupportedSchemas>(
 	return {
 		issues: result.issues.map(({ message, path }) => ({
 			message,
-			path: path?.map(({ key }) => key) as string[]
+			path: (path as Exclude<IssuePathItem, SetPathItem>[])?.map(({ key }) => key) as string[]
 		})),
 		success: false
 	};
@@ -54,7 +62,7 @@ function _valibot<T extends SupportedSchemas>(
 	schema: T,
 	options: Omit<ToJSONSchemaOptions, 'schema'> &
 		AdapterOptions<Infer<T>> & {
-			config?: SchemaConfig;
+			config?: Config<GenericIssue<unknown>>;
 		} = {}
 ): ValidationAdapter<Infer<T>, InferIn<T>> {
 	return createAdapter({

src/lib/adapters/valibot.ts

@@ -4,22 +4,24 @@ import {
 	object,
 	boolean,
 	minLength,
-	toTrimmed,
+	trim,
 	picklist,
+	pipe,
 	literal,
 	date
 } from 'valibot';
 
 const roleOptions = ['USER', 'PREMIUM', 'ADMIN'] as const;
 
 export const userSchema = object({
-	firstName: string([toTrimmed(), minLength(1, 'Please enter your first name.')]),
-	lastName: string([toTrimmed(), minLength(1, 'Please enter your last name.')]),
-	email: string([
-		toTrimmed(),
+	firstName: pipe(string(), trim(), minLength(1, 'Please enter your first name.')),
+	lastName: pipe(string(), trim(), minLength(1, 'Please enter your last name.')),
+	email: pipe(
+		string(),
+		trim(),
 		email('The email address is not valid.'),
 		minLength(1, 'An email address is required.')
-	]),
+	),
 	role: picklist(roleOptions, 'You must have a role.'),
 	verified: boolean(),
 	terms: literal(true, 'You must accept the terms and privacy policy.'),
@@ -29,11 +31,12 @@ export const userSchema = object({
 });
 
 export const emailSchema = object({
-	email: string([
-		toTrimmed(),
+	email: pipe(
+		string(),
+		trim(),
 		email('The email address is not valid.'),
 		minLength(1, 'An email address is required.')
-	])
+	)
 });
 
 export type UserSchema = typeof userSchema;

src/routes/(v2)/v2/issue-366/schema.ts

@@ -1,4 +1,4 @@
-import { array, integer, minLength, minValue, number, object, string } from 'valibot';
+import { array, integer, minLength, minValue, number, object, pipe, string } from 'valibot';
 
 /*
 export const schema2 = z
@@ -15,11 +15,11 @@ export const schema2 = z
 */
 
 export const schema = object({
-	name: string([minLength(1, 'Name is too short')]),
+	name: pipe(string(), minLength(1, 'Name is too short')),
 	tags: array(
 		object({
-			id: number([integer(), minValue(3)]),
-			name: string([minLength(2)])
+			id: pipe(number(), integer(), minValue(3)),
+			name: pipe(string(), minLength(2))
 		})
 	)
 });