Fixed FormPath types

Author: ciscoheat

src/lib/client/proxies.ts

@@ -11,7 +11,9 @@ export type ProxyOptions = {
 	taint?: TaintOption;
 };
 
-type CorrectProxyType<In, Out, T extends Record<string, unknown>, Path extends FormPath<T>> =
+type FormPaths<T extends Record<string, unknown>> = FormPath<T> | FormPathLeaves<T>;
+
+type CorrectProxyType<In, Out, T extends Record<string, unknown>, Path extends FormPaths<T>> =
 	NonNullable<FormPathType<T, Path>> extends In ? Writable<Out> : never;
 
 type DefaultOptions = {
@@ -40,7 +42,7 @@ const defaultOptions = {
 
 ///// Proxy functions ///////////////////////////////////////////////
 
-export function booleanProxy<T extends Record<string, unknown>, Path extends FormPath<T>>(
+export function booleanProxy<T extends Record<string, unknown>, Path extends FormPaths<T>>(
 	form: Writable<T> | SuperForm<T, unknown>,
 	path: Path,
 	options?: Prettify<Pick<DefaultOptions, 'trueStringValue' | 'taint'>>
@@ -51,7 +53,7 @@ export function booleanProxy<T extends Record<string, unknown>, Path extends For
 	}) as CorrectProxyType<boolean, string, T, Path>;
 }
 
-export function intProxy<T extends Record<string, unknown>, Path extends FormPath<T>>(
+export function intProxy<T extends Record<string, unknown>, Path extends FormPaths<T>>(
 	form: Writable<T> | SuperForm<T, unknown>,
 	path: Path,
 	options?: Prettify<Pick<DefaultOptions, 'empty' | 'initiallyEmptyIfZero' | 'taint'>>
@@ -62,7 +64,7 @@ export function intProxy<T extends Record<string, unknown>, Path extends FormPat
 	}) as CorrectProxyType<number, string, T, Path>;
 }
 
-export function numberProxy<T extends Record<string, unknown>, Path extends FormPath<T>>(
+export function numberProxy<T extends Record<string, unknown>, Path extends FormPaths<T>>(
 	form: Writable<T> | SuperForm<T, unknown>,
 	path: Path,
 	options?: Prettify<Pick<DefaultOptions, 'empty' | 'delimiter' | 'initiallyEmptyIfZero' | 'taint'>>
@@ -73,7 +75,7 @@ export function numberProxy<T extends Record<string, unknown>, Path extends Form
 	}) as CorrectProxyType<number, string, T, Path>;
 }
 
-export function dateProxy<T extends Record<string, unknown>, Path extends FormPath<T>>(
+export function dateProxy<T extends Record<string, unknown>, Path extends FormPaths<T>>(
 	form: Writable<T> | SuperForm<T, unknown>,
 	path: Path,
 	options?: {
@@ -111,7 +113,7 @@ export function stringProxy<T extends Record<string, unknown>, Path extends Form
  * @param field Form field
  * @param type 'number' | 'int' | 'boolean'
  */
-function _stringProxy<T extends Record<string, unknown>, Path extends FormPath<T>>(
+function _stringProxy<T extends Record<string, unknown>, Path extends FormPaths<T>>(
 	form: Writable<T> | SuperForm<T, unknown>,
 	path: Path,
 	type: 'number' | 'int' | 'boolean' | 'date' | 'string',
@@ -460,7 +462,7 @@ function isSuperForm<T extends Record<string, unknown>>(
 
 export type FieldProxy<T> = Writable<T>;
 
-export function fieldProxy<T extends Record<string, unknown>, Path extends FormPath<T>>(
+export function fieldProxy<T extends Record<string, unknown>, Path extends FormPaths<T>>(
 	form: Writable<T> | SuperForm<T, unknown>,
 	path: Path,
 	options?: ProxyOptions

src/lib/stringPath.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 export function splitPath(path: string) {
 	return path
 		.toString()
@@ -20,7 +21,6 @@ type BuiltInObjects = Date | Set<unknown> | File;
 
 export type AllKeys<T> = T extends T ? keyof T : never;
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type PickType<T, K extends AllKeys<T>> = T extends { [k in K]: any } ? T[K] : never;
 
 // Thanks to https://dev.to/lucianbc/union-type-merging-in-typescript-9al
@@ -31,27 +31,27 @@ export type MergeUnion<T> = {
 /**
  * Lists all paths in an object as string accessors.
  */
-export type FormPath<T extends object, Type = never> = string &
+export type FormPath<T extends object, Type = any> = string &
 	StringPath<T, { filter: 'all'; objAppend: never; path: ''; type: Type }>;
 
 /**
  * List paths in an object as string accessors, but only with non-objects as accessible properties.
  * Similar to the leaves in a node tree, if you look at the object as a tree structure.
  */
-export type FormPathLeaves<T extends object, Type = never> = string &
+export type FormPathLeaves<T extends object, Type = any> = string &
 	StringPath<T, { filter: 'leaves'; objAppend: never; path: ''; type: Type }>;
 
 /**
  * List paths in an object as string accessors, but only with non-objects as accessible properties.
  * Also includes the _errors field for objects and arrays.
  */
-export type FormPathLeavesWithErrors<T extends object, Type = never> = string &
+export type FormPathLeavesWithErrors<T extends object, Type = any> = string &
 	StringPath<T, { filter: 'leaves'; objAppend: '_errors'; path: ''; type: Type }>;
 
 /**
  * List all arrays in an object as string accessors.
  */
-export type FormPathArrays<T extends object, Type = never> = string &
+export type FormPathArrays<T extends object, Type = any> = string &
 	StringPath<T, { filter: 'arrays'; objAppend: never; path: ''; type: Type }>;
 
 type Concat<
@@ -63,7 +63,7 @@ type StringPathOptions = {
 	filter: 'arrays' | 'leaves' | 'all';
 	objAppend: string | never;
 	path: string;
-	type: unknown | never;
+	type: any;
 };
 
 type If<

src/routes/(v1)/tests/reset-component-2/TextField.svelte

@@ -8,7 +8,6 @@
 	export let field: string;
 	export let form;
 
-	// @ts-expect-error Purposefully untyped
 	const { value, errors } = formFieldProxy(form, field);
 </script>
 

src/routes/(v2)/v2/Navigation.svelte

@@ -39,7 +39,8 @@
 		'onchange-target',
 		'issue-356',
 		'issue-358',
-		'issue-360'
+		'issue-360',
+		'unknown-in-schema'
 	].sort();
 </script>
 

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

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

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

@@ -0,0 +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 FormCmptAge from './FormCmptAge.svelte';
+
+	export let data;
+
+	const form = superForm(data.form, {
+		taintedMessage: false
+		//dataType: 'json',
+		//validators: zod(schema)
+	});
+</script>
+
+<FormCmptAge {form} field="age" />
+<FormCmptAge {form} field="homePlanet" />

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

@@ -0,0 +1,20 @@
+<script lang="ts" context="module">
+	type T = Record<string, unknown>;
+	type Value = number;
+</script>
+
+<script lang="ts" generics="T extends Record<string, unknown>">
+	import {
+		formFieldProxy,
+		type SuperForm,
+		type FormPathLeaves,
+		type FormFieldProxy
+	} from '$lib/index.js';
+
+	export let form: SuperForm<T>;
+	export let field: FormPathLeaves<T, Value>;
+
+	const { value } = formFieldProxy(form, field) as FormFieldProxy<Value>;
+</script>
+
+{$value.toExponential()}

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

@@ -0,0 +1,7 @@
+import { z } from 'zod';
+
+export const schema = z.object({
+	name: z.string(),
+	age: z.number(),
+	homePlanet: z.unknown()
+});