Support for any in FormPath and FormPathLeaves.

Author: ciscoheat

CHANGELOG.md

@@ -18,7 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `defaults` 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.
-- `FormPathLeaves` didn't handle fields with type `unknown`.
+- `FormPath` and `FormPathLeaves` didn't handle fields with type `unknown` and `any`.
 
 ## [2.5.0] - 2024-02-21
 

src/lib/stringPath.ts

@@ -54,6 +54,9 @@ export type FormPathLeavesWithErrors<T extends object, Type = any> = string &
 export type FormPathArrays<T extends object, Type = any> = string &
 	StringPath<T, { filter: 'arrays'; objAppend: never; path: ''; type: Type }>;
 
+// Thanks to https://stackoverflow.com/a/77451367/70894
+type IsAny<T> = boolean extends (T extends never ? true : false) ? true : false;
+
 type Concat<
 	Path extends string,
 	Next extends string
@@ -148,24 +151,26 @@ type StringPath<
 												}
 											>
 										: never)
-						:
-								| If<
-										Options,
-										'filter',
-										'all',
-										Concat<Options['path'], K>,
-										unknown extends T[K] ? Concat<Options['path'], K> : never,
-										T[K]
-								  >
-								| StringPath<
-										NonNullable<T[K]>,
-										{
-											filter: Options['filter'];
-											objAppend: Options['objAppend'];
-											path: Concat<Options['path'], K>;
-											type: Options['type'];
-										}
-								  >
+						: IsAny<T[K]> extends true
+							? Concat<Options['path'], K>
+							:
+									| If<
+											Options,
+											'filter',
+											'all',
+											Concat<Options['path'], K>,
+											unknown extends T[K] ? Concat<Options['path'], K> : never,
+											T[K]
+									  >
+									| StringPath<
+											NonNullable<T[K]>,
+											{
+												filter: Options['filter'];
+												objAppend: Options['objAppend'];
+												path: Concat<Options['path'], K>;
+												type: Options['type'];
+											}
+									  >
 					: If<Options, 'filter', 'leaves' | 'all', Concat<Options['path'], K>, never, T[K]>;
 			}[Extract<AllKeys<T>, string>];
 

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

@@ -1,11 +1,12 @@
 import { zod } from '$lib/adapters/zod.js';
 import { message, superValidate } from '$lib/server/index.js';
-import { schema } from './schema.js';
+import { anySchema, schema } from './schema.js';
 import { fail } from '@sveltejs/kit';
 
 export const load = async () => {
 	const form = await superValidate(zod(schema));
-	return { form };
+	const anyForm = await superValidate(zod(anySchema));
+	return { form, anyForm };
 };
 
 export const actions = {

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

@@ -6,12 +6,10 @@
 
 	export let data;
 
-	const form = superForm(data.form, {
-		taintedMessage: false
-		//dataType: 'json',
-		//validators: zod(schema)
-	});
+	const form = superForm(data.form, { taintedMessage: false });
+	const anyForm = superForm(data.anyForm, { taintedMessage: false });
 </script>
 
 <FormCmptAge {form} field="age" />
 <FormCmptAge {form} field="homePlanet" />
+<FormCmptAge form={anyForm} field="age" />

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

@@ -5,3 +5,8 @@ export const schema = z.object({
 	age: z.number(),
 	homePlanet: z.unknown()
 });
+
+export const anySchema = z.object({
+	name: z.string(),
+	age: z.any()
+});

src/tests/legacy/paths.test-d.ts

@@ -339,6 +339,28 @@ test('FormPath with unknown type', () => {
 	const t3: FPA = 'homePlanet';
 });
 
+test('FormPath with any type', () => {
+	const schema = z.object({
+		name: z.string(),
+		age: z.any()
+	});
+
+	type FP = FormPath<z.infer<typeof schema>>;
+	type FPL = FormPathLeaves<z.infer<typeof schema>>;
+	type FPA = FormPathArrays<z.infer<typeof schema>>;
+
+	const t1: FP = 'age';
+	const t11: FP = 'age[3]';
+	const t2: FPL = 'age';
+	const t21: FPL = 'age[3]';
+	const t3: FPA = 'age';
+
+	// @ts-expect-error Invalid path
+	const f1: FP = 'nope';
+	// @ts-expect-error Invalid path
+	const f2: FPA = 'age[3]';
+});
+
 ///////////////////////////////////////////////////
 
 // Recursive schema test