Class-validator adapter!

Author: ciscoheat

src/lib/adapters/adapters.ts

@@ -20,7 +20,7 @@ export type InferIn<T extends Schema> = NonNullable<InferInSchema<T>>;
 
 export type ValidationLibrary =
 	| 'arktype'
-	| 'classValidator'
+	| 'classvalidator'
 	| 'custom'
 	| 'joi'
 	| 'superform'

src/lib/adapters/class-validator.ts renamed to src/lib/adapters/classvalidator.ts

@@ -6,20 +6,24 @@ import {
 	type InferIn,
 	type ValidationResult,
 	type ClientValidationAdapter,
-	type RequiredDefaultsOptions,
+	type RequiredDefaultsOptions
 } from './adapters.js';
 import { memoize } from '$lib/memoize.js';
+import type { Schema } from '@typeschema/class-validator';
 
-import {
-	validate as classValidatorValidate,
-	type Schema
-} from '@typeschema/class-validator';
+async function modules() {
+	const { validate } = await import(/* webpackIgnore: true */ '@typeschema/class-validator');
+	return { validate };
+}
+
+const fetchModule = /* @__PURE__ */ memoize(modules);
 
 async function validate<T extends Schema>(
 	schema: T,
 	data: unknown
 ): Promise<ValidationResult<Infer<T>>> {
-	const result = await classValidatorValidate<T>(schema, data);
+	const { validate } = await fetchModule();
+	const result = await validate<T>(schema, data);
 	if (result.success) {
 		return {
 			data: result.data as Infer<T>,
@@ -35,26 +39,26 @@ async function validate<T extends Schema>(
 	};
 }
 
-function _classValidator<T extends Schema>(
+function _classvalidator<T extends Schema>(
 	schema: T,
 	options: RequiredDefaultsOptions<Infer<T>>
 ): ValidationAdapter<Infer<T>, InferIn<T>> {
 	return createAdapter({
-		superFormValidationLibrary: 'classValidator',
+		superFormValidationLibrary: 'classvalidator',
 		validate: async (data: unknown) => validate(schema, data),
 		jsonSchema: createJsonSchema(options),
 		defaults: options.defaults
 	});
 }
 
-function _classValidatorClient<T extends Schema>(
+function _classvalidatorClient<T extends Schema>(
 	schema: T
 ): ClientValidationAdapter<Infer<T>, InferIn<T>> {
 	return {
-		superFormValidationLibrary: 'classValidator',
+		superFormValidationLibrary: 'classvalidator',
 		validate: async (data) => validate(schema, data)
 	};
 }
 
-export const classValidator = /* @__PURE__ */ memoize(_classValidator);
-export const classValidatorClient = /* @__PURE__ */ memoize(_classValidatorClient);
+export const classvalidator = /* @__PURE__ */ memoize(_classvalidator);
+export const classvalidatorClient = /* @__PURE__ */ memoize(_classvalidatorClient);

src/lib/adapters/typeSchema.ts

@@ -3,7 +3,7 @@ import type { Type } from 'arktype';
 import type { AnySchema } from 'joi';
 import type {
 	Infer as ClassValidatorInfer,
-	InferIn  as ClassValidatorInferIn,
+	InferIn as ClassValidatorInferIn,
 	Schema as ClassValidatorSchema
 } from '@typeschema/class-validator';
 
@@ -80,7 +80,9 @@ interface ArkTypeResolver extends Resolver {
 
 interface ClassValidatorResolver extends Resolver {
 	base: ClassValidatorSchema;
-	input: this['schema'] extends ClassValidatorSchema ? ClassValidatorInferIn<this['schema']> : never;
+	input: this['schema'] extends ClassValidatorSchema
+		? ClassValidatorInferIn<this['schema']>
+		: never;
 	output: this['schema'] extends ClassValidatorSchema ? ClassValidatorInfer<this['schema']> : never;
 }
 
@@ -191,7 +193,7 @@ interface RuntypesResolver extends Resolver {
 
 type Registry = {
 	arktype: ArkTypeResolver;
-	classValidator: ClassValidatorResolver;
+	classvalidator: ClassValidatorResolver;
 	custom: CustomResolver;
 	joi: JoiResolver;
 	typebox: TypeBoxResolver;

src/routes/(v2)/v2/class-validator/+page.server.ts

@@ -0,0 +1,25 @@
+import { classvalidator } from '$lib/adapters/classvalidator.js';
+import { message, superValidate } from '$lib/server/index.js';
+import { schema } from './schema.js';
+import { fail } from '@sveltejs/kit';
+
+const defaults = new schema();
+
+export const load = async () => {
+	const form = await superValidate(classvalidator(schema, { defaults }));
+	return { form };
+};
+
+export const actions = {
+	default: async ({ request }) => {
+		const formData = await request.formData();
+		console.log(formData);
+
+		const form = await superValidate(formData, classvalidator(schema, { defaults }));
+		console.log(form);
+
+		if (!form.valid) return fail(400, { form });
+
+		return message(form, 'Posted OK!');
+	}
+};

src/routes/(v2)/v2/class-validator/+page.svelte

@@ -0,0 +1,54 @@
+<script lang="ts">
+	import { classvalidatorClient } from '$lib/adapters/classvalidator.js';
+	import { superForm } from '$lib/client/index.js';
+	import SuperDebug from '$lib/client/SuperDebug.svelte';
+	import { schema } from './schema.js';
+
+	export let data;
+
+	const { form, errors, tainted, message, enhance } = superForm(data.form, {
+		taintedMessage: false,
+		validators: classvalidatorClient(schema)
+		//dataType: 'json',
+	});
+</script>
+
+<SuperDebug data={{ $form, $errors, $tainted }} />
+
+{#if $message}<h4>{$message}</h4>{/if}
+
+<form method="POST" use:enhance>
+	<label>
+		Name: <input
+			name="name"
+			bind:value={$form.name}
+			aria-invalid={$errors.name ? 'true' : undefined}
+		/>
+		{#if $errors.name}<span class="invalid">{$errors.name}</span>{/if}
+	</label>
+	<label>
+		Email: <input
+			name="email"
+			bind:value={$form.email}
+			aria-invalid={$errors.email ? 'true' : undefined}
+		/>
+		{#if $errors.email}<span class="invalid">{$errors.email}</span>{/if}
+	</label>
+	<div>
+		<button>Submit</button>
+	</div>
+</form>
+
+<style lang="scss">
+	form {
+		margin: 2rem 0;
+
+		input {
+			background-color: #dedede;
+		}
+
+		.invalid {
+			color: crimson;
+		}
+	}
+</style>

src/routes/(v2)/v2/class-validator/schema.ts

@@ -0,0 +1,13 @@
+import { IsEmail, IsString, MinLength } from 'class-validator';
+
+class ClassValidatorSchema {
+	@IsString()
+	@MinLength(2)
+	name: string = '';
+
+	@IsString()
+	@IsEmail()
+	email: string = '';
+}
+
+export const schema = ClassValidatorSchema;

src/tests/superValidate.test.ts

@@ -23,8 +23,19 @@ import { z, type ZodErrorMap } from 'zod';
 import { valibot } from '$lib/adapters/valibot.js';
 import * as v from 'valibot';
 
-import { classValidator } from '$lib/adapters/class-validator.js';
-import { ArrayMinSize, IsOptional, IsString, IsEmail, IsArray, MinLength, IsInt, Min, IsDate, Matches } from 'class-validator';
+import { classvalidator } from '$lib/adapters/classvalidator.js';
+import {
+	ArrayMinSize,
+	IsOptional,
+	IsString,
+	IsEmail,
+	IsArray,
+	MinLength,
+	IsInt,
+	Min,
+	IsDate,
+	Matches
+} from 'class-validator';
 
 //import { ajv } from '$lib/adapters/ajv.js';
 //import type { JSONSchema } from '$lib/jsonSchema/index.js';
@@ -500,7 +511,7 @@ describe('class-validator', () => {
 		extra: string | null = null;
 	}
 
-	const adapter = classValidator(ClassValidatorSchema, { defaults });
+	const adapter = classvalidator(ClassValidatorSchema, { defaults });
 	schemaTest(adapter, ['email', 'date', 'nospace', 'tags'], 'simple');
 });