From 396fe32c5c0738eeae175a0dbd80c116aa158cab Mon Sep 17 00:00:00 2001
From: Matt DeKok <matt@dekok.dev>
Date: Sun, 23 Nov 2025 16:05:01 -0600
Subject: [PATCH 1/4] fix: improves fields type for generic components

---
 packages/kit/src/exports/public.d.ts   | 14 ++++++++++++--
 packages/kit/src/types/private.d.ts    |  2 ++
 packages/kit/test/types/remote.test.ts | 17 ++++++++++++++++-
 packages/kit/types/index.d.ts          | 13 ++++++++++++-
 4 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/packages/kit/src/exports/public.d.ts b/packages/kit/src/exports/public.d.ts
index ce45549aa6b3..2b50442ade59 100644
--- a/packages/kit/src/exports/public.d.ts
+++ b/packages/kit/src/exports/public.d.ts
@@ -15,7 +15,8 @@ import {
 	PrerenderUnseenRoutesHandlerValue,
 	PrerenderOption,
 	RequestOptions,
-	RouteSegment
+	RouteSegment,
+	IsAny
 } from '../types/private.js';
 import { BuildData, SSRNodeLoader, SSRRoute, ValidatedConfig } from 'types';
 import { SvelteConfig } from '@sveltejs/vite-plugin-svelte';
@@ -2073,7 +2074,16 @@ export type RemoteForm<Input extends RemoteFormInput | void, Output> = {
 	/** The number of pending submissions */
 	get pending(): number;
 	/** Access form fields using object notation */
-	fields: RemoteFormFields<Input>;
+	fields: IsAny<Input> extends true
+		? RecursiveFormFields
+		: Input extends void
+			? {
+					/** Validation issues, if any */
+					issues(): RemoteFormIssue[] | undefined;
+					/** Validation issues belonging to this or any of the fields that belong to it, if any */
+					allIssues(): RemoteFormIssue[] | undefined;
+				}
+			: RemoteFormFields<Input>;
 	/** Spread this onto a `<button>` or `<input type="submit">` */
 	buttonProps: {
 		type: 'submit';
diff --git a/packages/kit/src/types/private.d.ts b/packages/kit/src/types/private.d.ts
index da512ed777c5..d5dbd64a80ff 100644
--- a/packages/kit/src/types/private.d.ts
+++ b/packages/kit/src/types/private.d.ts
@@ -241,3 +241,5 @@ export interface RouteSegment {
 }
 
 export type TrailingSlash = 'never' | 'always' | 'ignore';
+
+export type IsAny<T> = 0 extends 1 & T ? true : false;
diff --git a/packages/kit/test/types/remote.test.ts b/packages/kit/test/types/remote.test.ts
index e30f43fc17d8..3349a912559a 100644
--- a/packages/kit/test/types/remote.test.ts
+++ b/packages/kit/test/types/remote.test.ts
@@ -1,6 +1,12 @@
 import { query, prerender, command, form } from '$app/server';
 import { StandardSchemaV1 } from '@standard-schema/spec';
-import { RemotePrerenderFunction, RemoteQueryFunction, invalid } from '@sveltejs/kit';
+import {
+	RemoteForm,
+	RemoteFormInput,
+	RemotePrerenderFunction,
+	RemoteQueryFunction,
+	invalid
+} from '@sveltejs/kit';
 
 const schema: StandardSchemaV1<string> = null as any;
 const schema2: StandardSchemaV1<string, number> = null as any;
@@ -359,6 +365,15 @@ function form_tests() {
 	// doesn't use data
 	const f9 = form(() => Promise.resolve({ success: true }));
 	f9.result?.success === true;
+
+	function f10<
+		Schema extends StandardSchemaV1<RemoteFormInput, unknown>,
+		Form extends RemoteForm<StandardSchemaV1.InferInput<Schema>, unknown>
+	>(data: StandardSchemaV1.InferInput<Schema>, form: Form) {
+		form.fields.set(data);
+		form.fields.allIssues();
+	}
+	void f10;
 }
 form_tests();
 
diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts
index b3611645dc44..77ed2794b392 100644
--- a/packages/kit/types/index.d.ts
+++ b/packages/kit/types/index.d.ts
@@ -2049,7 +2049,16 @@ declare module '@sveltejs/kit' {
 		/** The number of pending submissions */
 		get pending(): number;
 		/** Access form fields using object notation */
-		fields: RemoteFormFields<Input>;
+		fields: IsAny<Input> extends true
+		? RecursiveFormFields
+		: Input extends void
+			? {
+					/** Validation issues, if any */
+					issues(): RemoteFormIssue[] | undefined;
+					/** Validation issues belonging to this or any of the fields that belong to it, if any */
+					allIssues(): RemoteFormIssue[] | undefined;
+				}
+			: RemoteFormFields<Input>;
 		/** Spread this onto a `<button>` or `<input type="submit">` */
 		buttonProps: {
 			type: 'submit';
@@ -2391,6 +2400,8 @@ declare module '@sveltejs/kit' {
 	}
 
 	type TrailingSlash = 'never' | 'always' | 'ignore';
+
+	type IsAny<T> = 0 extends (1 & T) ? true : false;
 	interface Asset {
 		file: string;
 		size: number;

From 50c28fc2e30f844ff8e70b3203311a7b1a0f2ff1 Mon Sep 17 00:00:00 2001
From: Matt DeKok <matt@dekok.dev>
Date: Sun, 23 Nov 2025 16:19:34 -0600
Subject: [PATCH 2/4] changeset

---
 .changeset/shaky-bobcats-dig.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/shaky-bobcats-dig.md

diff --git a/.changeset/shaky-bobcats-dig.md b/.changeset/shaky-bobcats-dig.md
new file mode 100644
index 000000000000..09007d960285
--- /dev/null
+++ b/.changeset/shaky-bobcats-dig.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: improves fields type for generic components

From c805b36b2824b3f1c515a9f8188a6095d09682b8 Mon Sep 17 00:00:00 2001
From: Matt DeKok <matt@dekok.dev>
Date: Sun, 23 Nov 2025 16:27:15 -0600
Subject: [PATCH 3/4] fix generated types

---
 packages/kit/types/index.d.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts
index 77ed2794b392..e251bf190be8 100644
--- a/packages/kit/types/index.d.ts
+++ b/packages/kit/types/index.d.ts
@@ -2050,15 +2050,15 @@ declare module '@sveltejs/kit' {
 		get pending(): number;
 		/** Access form fields using object notation */
 		fields: IsAny<Input> extends true
-		? RecursiveFormFields
-		: Input extends void
-			? {
-					/** Validation issues, if any */
-					issues(): RemoteFormIssue[] | undefined;
-					/** Validation issues belonging to this or any of the fields that belong to it, if any */
-					allIssues(): RemoteFormIssue[] | undefined;
-				}
-			: RemoteFormFields<Input>;
+			? RecursiveFormFields
+			: Input extends void
+				? {
+						/** Validation issues, if any */
+						issues(): RemoteFormIssue[] | undefined;
+						/** Validation issues belonging to this or any of the fields that belong to it, if any */
+						allIssues(): RemoteFormIssue[] | undefined;
+					}
+				: RemoteFormFields<Input>;
 		/** Spread this onto a `<button>` or `<input type="submit">` */
 		buttonProps: {
 			type: 'submit';
@@ -2401,7 +2401,7 @@ declare module '@sveltejs/kit' {
 
 	type TrailingSlash = 'never' | 'always' | 'ignore';
 
-	type IsAny<T> = 0 extends (1 & T) ? true : false;
+	type IsAny<T> = 0 extends 1 & T ? true : false;
 	interface Asset {
 		file: string;
 		size: number;

From 0f984c11a605c5be2859deab7ed23a485682e655 Mon Sep 17 00:00:00 2001
From: Matt DeKok <matt@dekok.dev>
Date: Sun, 23 Nov 2025 19:47:23 -0600
Subject: [PATCH 4/4] cleaner type for intellisense

---
 packages/kit/src/exports/public.d.ts   | 23 +++++++++++++----------
 packages/kit/test/types/remote.test.ts |  1 +
 packages/kit/types/index.d.ts          | 23 +++++++++++++----------
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/packages/kit/src/exports/public.d.ts b/packages/kit/src/exports/public.d.ts
index 2b50442ade59..8a49431b50a5 100644
--- a/packages/kit/src/exports/public.d.ts
+++ b/packages/kit/src/exports/public.d.ts
@@ -1950,6 +1950,18 @@ type UnknownField<Value> = RemoteFormFieldMethods<Value> & {
 	[key: string | number]: UnknownField<any>;
 };
 
+type RemoteFormFieldsRoot<Input extends RemoteFormInput | void> =
+	IsAny<Input> extends true
+		? RecursiveFormFields
+		: Input extends void
+			? {
+					/** Validation issues, if any */
+					issues(): RemoteFormIssue[] | undefined;
+					/** Validation issues belonging to this or any of the fields that belong to it, if any */
+					allIssues(): RemoteFormIssue[] | undefined;
+				}
+			: RemoteFormFields<Input>;
+
 /**
  * Recursive type to build form fields structure with proxy access
  */
@@ -2074,16 +2086,7 @@ export type RemoteForm<Input extends RemoteFormInput | void, Output> = {
 	/** The number of pending submissions */
 	get pending(): number;
 	/** Access form fields using object notation */
-	fields: IsAny<Input> extends true
-		? RecursiveFormFields
-		: Input extends void
-			? {
-					/** Validation issues, if any */
-					issues(): RemoteFormIssue[] | undefined;
-					/** Validation issues belonging to this or any of the fields that belong to it, if any */
-					allIssues(): RemoteFormIssue[] | undefined;
-				}
-			: RemoteFormFields<Input>;
+	fields: RemoteFormFieldsRoot<Input>;
 	/** Spread this onto a `<button>` or `<input type="submit">` */
 	buttonProps: {
 		type: 'submit';
diff --git a/packages/kit/test/types/remote.test.ts b/packages/kit/test/types/remote.test.ts
index 3349a912559a..e428dcbcfdcd 100644
--- a/packages/kit/test/types/remote.test.ts
+++ b/packages/kit/test/types/remote.test.ts
@@ -366,6 +366,7 @@ function form_tests() {
 	const f9 = form(() => Promise.resolve({ success: true }));
 	f9.result?.success === true;
 
+	// generic form
 	function f10<
 		Schema extends StandardSchemaV1<RemoteFormInput, unknown>,
 		Form extends RemoteForm<StandardSchemaV1.InferInput<Schema>, unknown>
diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts
index e251bf190be8..3394d7916677 100644
--- a/packages/kit/types/index.d.ts
+++ b/packages/kit/types/index.d.ts
@@ -1925,6 +1925,18 @@ declare module '@sveltejs/kit' {
 		[key: string | number]: UnknownField<any>;
 	};
 
+	type RemoteFormFieldsRoot<Input extends RemoteFormInput | void> =
+		IsAny<Input> extends true
+			? RecursiveFormFields
+			: Input extends void
+				? {
+						/** Validation issues, if any */
+						issues(): RemoteFormIssue[] | undefined;
+						/** Validation issues belonging to this or any of the fields that belong to it, if any */
+						allIssues(): RemoteFormIssue[] | undefined;
+					}
+				: RemoteFormFields<Input>;
+
 	/**
 	 * Recursive type to build form fields structure with proxy access
 	 */
@@ -2049,16 +2061,7 @@ declare module '@sveltejs/kit' {
 		/** The number of pending submissions */
 		get pending(): number;
 		/** Access form fields using object notation */
-		fields: IsAny<Input> extends true
-			? RecursiveFormFields
-			: Input extends void
-				? {
-						/** Validation issues, if any */
-						issues(): RemoteFormIssue[] | undefined;
-						/** Validation issues belonging to this or any of the fields that belong to it, if any */
-						allIssues(): RemoteFormIssue[] | undefined;
-					}
-				: RemoteFormFields<Input>;
+		fields: RemoteFormFieldsRoot<Input>;
 		/** Spread this onto a `<button>` or `<input type="submit">` */
 		buttonProps: {
 			type: 'submit';