defaults didn't infer the input type.

Author: ciscoheat

CHANGELOG.md

@@ -15,7 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- `defaults` didn't generate correct `SuperValidated` data, making `superForm` confused. Also fixed type signature and removed the `jsonSchema` option that wasn't applicable.
+- `defaults` didn't infer the input type, and didn't generate correct `SuperValidated` data, making `superForm` confused. Also fixed type signature and removed the `jsonSchema` option that wasn't applicable.
 - A successful `PageData` result from `invalidateAll` was overwritten by the `ActionData` result.
 - Using `goto` in events didn't work when the target page redirected.
 - `FormPath` and `FormPathLeaves` didn't handle fields with type `unknown` and `any`.

src/lib/defaults.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import type { ValidationAdapter, ClientValidationAdapter } from './adapters/adapters.js';
 import type { SuperValidateOptions, SuperValidated } from './superValidate.js';
 
@@ -9,47 +10,50 @@ type SuperSchemaOptions<T extends Record<string, unknown>> = Pick<
 >;
 
 export function defaults<
-	T extends Record<string, unknown>,
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	M = App.Superforms.Message extends never ? any : App.Superforms.Message
->(adapter: ValidationAdapter<T>, options?: SuperSchemaOptions<T>): SuperValidated<T, M>;
+	Out extends Record<string, unknown>,
+	M = App.Superforms.Message extends never ? any : App.Superforms.Message,
+	In extends Record<string, unknown> = Out
+>(
+	adapter: ValidationAdapter<Out, In>,
+	options?: SuperSchemaOptions<Out>
+): SuperValidated<Out, M, In>;
 
 export function defaults<
-	T extends Record<string, unknown>,
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	M = App.Superforms.Message extends never ? any : App.Superforms.Message
+	Out extends Record<string, unknown>,
+	M = App.Superforms.Message extends never ? any : App.Superforms.Message,
+	In extends Record<string, unknown> = Out
 >(
-	defaults: SuperSchemaData<T>,
-	adapter: ValidationAdapter<T>,
-	options?: SuperSchemaOptions<T>
-): SuperValidated<T, M>;
+	defaults: SuperSchemaData<Out>,
+	adapter: ValidationAdapter<Out, In>,
+	options?: SuperSchemaOptions<Out>
+): SuperValidated<Out, M, In>;
 
 export function defaults<
-	T extends Record<string, unknown>,
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	M = App.Superforms.Message extends never ? any : App.Superforms.Message
+	Out extends Record<string, unknown>,
+	M = App.Superforms.Message extends never ? any : App.Superforms.Message,
+	In extends Record<string, unknown> = Out
 >(
-	defaults: T,
-	adapter: ClientValidationAdapter<T>,
-	options?: SuperSchemaOptions<T>
-): SuperValidated<T, M>;
+	defaults: Out,
+	adapter: ClientValidationAdapter<Out, In>,
+	options?: SuperSchemaOptions<Out>
+): SuperValidated<Out, M, In>;
 
 export function defaults<
-	T extends Record<string, unknown>,
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	M = App.Superforms.Message extends never ? any : App.Superforms.Message
+	Out extends Record<string, unknown>,
+	M = App.Superforms.Message extends never ? any : App.Superforms.Message,
+	In extends Record<string, unknown> = Out
 >(
-	data: SuperSchemaData<T> | ValidationAdapter<T> | T,
-	adapter?: ValidationAdapter<T> | ClientValidationAdapter<T> | SuperSchemaOptions<T>,
-	options?: SuperSchemaOptions<T>
-): SuperValidated<T, M> {
+	data: SuperSchemaData<Out> | ValidationAdapter<Out, In> | Out,
+	adapter?: ValidationAdapter<Out, In> | ClientValidationAdapter<Out, In> | SuperSchemaOptions<Out>,
+	options?: SuperSchemaOptions<Out>
+): SuperValidated<Out, M, In> {
 	if (data && 'superFormValidationLibrary' in data) {
-		options = adapter as SuperSchemaOptions<T>;
+		options = adapter as SuperSchemaOptions<Out>;
 		adapter = data;
 		data = null;
 	}
 
-	const validator = adapter as ValidationAdapter<T>;
+	const validator = adapter as ValidationAdapter<Out, In>;
 	const optionDefaults = options?.defaults ?? validator.defaults;
 
 	return {
@@ -63,6 +67,8 @@ export function defaults<
 	};
 }
 
-export function defaultValues<T extends Record<string, unknown>>(adapter: ValidationAdapter<T>): T {
+export function defaultValues<T extends Record<string, unknown>>(
+	adapter: ValidationAdapter<T, Record<string, unknown>>
+): T {
 	return adapter.defaults;
 }

src/routes/(v2)/v2/unknown-in-schema/+page.server.ts

@@ -1,12 +1,16 @@
 import { zod } from '$lib/adapters/zod.js';
 import { message, superValidate } from '$lib/server/index.js';
-import { anySchema, schema } from './schema.js';
+import { anySchema, schema, userSchema } from './schema.js';
 import { fail } from '@sveltejs/kit';
 
 export const load = async () => {
 	const form = await superValidate(zod(schema));
 	const anyForm = await superValidate(zod(anySchema));
-	return { form, anyForm };
+	const userForm = await superValidate(
+		{ name: 'some name', options: [{ color: 'option-1-color', value: 'option-1' }] },
+		zod(userSchema)
+	);
+	return { form, anyForm, userForm };
 };
 
 export const actions = {

src/routes/(v2)/v2/unknown-in-schema/+page.svelte

@@ -1,13 +1,17 @@
 <script lang="ts">
-	import { superForm } from '$lib/client/index.js';
-	//import { zod } from '$lib/adapters/zod.js'
-	//import { schema } from './schema.js';
+	import { defaults, superForm } from '$lib/client/index.js';
+	import { zod } from '$lib/adapters/zod.js';
+	import { userSchema } from './schema.js';
 	import FormCmptAge from './FormCmptAge.svelte';
 
 	export let data;
 
 	const form = superForm(data.form, { taintedMessage: false });
 	const anyForm = superForm(data.anyForm, { taintedMessage: false });
+
+	const formValidated = defaults(zod(userSchema));
+	const options: unknown[] = formValidated.data.options;
+	console.log(options.length);
 </script>
 
 <FormCmptAge {form} field="age" />

src/routes/(v2)/v2/unknown-in-schema/schema.ts

@@ -10,3 +10,28 @@ export const anySchema = z.object({
 	name: z.string(),
 	age: z.any()
 });
+
+export const userSchema = z.object({
+	name: z.string(),
+	options: z
+		.array(
+			z.object({
+				color: z.string().trim().nullable(),
+				value: z.string().trim()
+			})
+		)
+		.default([])
+});
+
+/**
+* 
+* Expected type
+* ----------------
+ name: string;
+ options: {
+			value: string;
+			color: string | null;
+	}[];
+* 
+*/
+export type UserSchemaInffered = z.infer<typeof userSchema>;