Superstruct fixes

Author: ciscoheat

CHANGELOG.md

@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Type inference for validation errors didn't include `_errors` for objects, only for arrays.
+- Type inference for validation errors didn't include `_errors` for all objects, only for arrays.
 
 ## [2.15.2] - 2024-06-26
 

src/lib/adapters/superstruct.ts

@@ -10,15 +10,10 @@ import {
 import type { Struct } from 'superstruct';
 import { memoize } from '$lib/memoize.js';
 
-// async function modules() {
-// 	const { validate } = await import(/* webpackIgnore: true */ 'superstruct');
-// 	return { validate };
-// }
-
-// const fetchModule = /* @__PURE__ */ memoize(modules);
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-async function validate<T extends Struct<any, any>>(
+type StructObject<T extends Record<string, unknown>> = Struct<T, any>;
+
+async function validate<T extends StructObject<Infer<T>>>(
 	schema: T,
 	data: unknown
 ): Promise<ValidationResult<Infer<T>>> {
@@ -39,8 +34,7 @@ async function validate<T extends Struct<any, any>>(
 	};
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function _superstruct<T extends Struct<any, any>>(
+function _superstruct<T extends StructObject<Infer<T>>>(
 	schema: T,
 	options: RequiredDefaultsOptions<Infer<T>>
 ): ValidationAdapter<Infer<T>> {
@@ -52,7 +46,9 @@ function _superstruct<T extends Struct<any, any>>(
 	});
 }
 
-function _superstructClient<T extends Struct>(schema: T): ClientValidationAdapter<Infer<T>> {
+function _superstructClient<T extends StructObject<Infer<T>>>(
+	schema: T
+): ClientValidationAdapter<Infer<T>> {
 	return {
 		superFormValidationLibrary: 'superstruct',
 		validate: async (data) => validate(schema, data)

src/routes/(v2)/v2/superstruct/+page.server.ts

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

src/routes/(v2)/v2/superstruct/+page.svelte

@@ -0,0 +1,54 @@
+<script lang="ts">
+	import { superForm } from '$lib/client/index.js';
+	import SuperDebug from '$lib/client/SuperDebug.svelte';
+	import { superstructClient } from '$lib/adapters/superstruct.js';
+	import { schema } from './schema.js';
+
+	export let data;
+
+	const { form, errors, tainted, message, enhance } = superForm(data.form, {
+		taintedMessage: false,
+		//dataType: 'json',
+		validators: superstructClient(schema)
+	});
+</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/superstruct/schema.ts

@@ -0,0 +1,8 @@
+import { object, string, size, define } from 'superstruct';
+
+const email = () => define<string>('email', (value) => String(value).includes('@'));
+
+export const schema = object({
+	name: size(string(), 2, 100),
+	email: email()
+});

src/tests/superValidate.test.ts

@@ -761,7 +761,7 @@ describe('vine', () => {
 });
 
 describe('superstruct', () => {
-	const email = () => ssDefine('email', (value) => String(value).includes('@'));
+	const email = () => ssDefine<string>('email', (value) => String(value).includes('@'));
 
 	const schema = ssObject({
 		name: ssOptional(ssString()),