Fix inaccurate InputElementProps type for text/select fields (#14908)

* Fix inaccurate InputElementProps type for text/select fields

* add another case for the multiple attribute

* format

* Merge branch 'main' into patch-2

* generate types

* Merge branch 'patch-2' of https://github.com/TheOnlyTails/kit into patch-2

* added changeset

* Merge branch 'main' into patch-2

diff --git a/.changeset/upset-tires-retire.md b/.changeset/upset-tires-retire.md
new file mode 100644 (file)
index 0000000..18cac46
--- /dev/null
+++ b/.changeset/upset-tires-retire.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/kit': patch
+---
+
+fix: improved the accuracy of the types of the output of `field.as('...')`

diff --git a/packages/kit/src/exports/public.d.ts b/packages/kit/src/exports/public.d.ts
index 3516689dce67248c1715089ce5d58ffc2e2b4674..39174438f805b887580e5ed4d25093486b23531c 100644 (file)
--- a/packages/kit/src/exports/public.d.ts
+++ b/packages/kit/src/exports/public.d.ts
@@ -1865,13 +1865,28 @@ type InputElementProps<T extends keyof InputTypeMap> = T extends 'checkbox' | 'r
                                get files(): FileList | null;
                                set files(v: FileList | null);
                        }
-               : {
-                               name: string;
-                               type: T;
-                               'aria-invalid': boolean | 'false' | 'true' | undefined;
-                               get value(): string | number;
-                               set value(v: string | number);
-                       };
+               : T extends 'select' | 'select multiple'
+                       ? {
+                                       name: string;
+                                       multiple: T extends 'select' ? false : true;
+                                       'aria-invalid': boolean | 'false' | 'true' | undefined;
+                                       get value(): string | number;
+                                       set value(v: string | number);
+                               }
+                       : T extends 'text'
+                               ? {
+                                               name: string;
+                                               'aria-invalid': boolean | 'false' | 'true' | undefined;
+                                               get value(): string | number;
+                                               set value(v: string | number);
+                                       }
+                               : {
+                                               name: string;
+                                               type: T;
+                                               'aria-invalid': boolean | 'false' | 'true' | undefined;
+                                               get value(): string | number;
+                                               set value(v: string | number);
+                                       };
 
 type RemoteFormFieldMethods<T> = {
        /** The values that will be submitted */

diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts
index 0ddf7ca088449646ca6461c351f23b17a92c0e77..548bc7a78d83addfb37cf145243c95425549b35d 100644 (file)
--- a/packages/kit/types/index.d.ts
+++ b/packages/kit/types/index.d.ts
@@ -1841,13 +1841,28 @@ declare module '@sveltejs/kit' {
                                        get files(): FileList | null;
                                        set files(v: FileList | null);
                                }
-                       : {
-                                       name: string;
-                                       type: T;
-                                       'aria-invalid': boolean | 'false' | 'true' | undefined;
-                                       get value(): string | number;
-                                       set value(v: string | number);
-                               };
+                       : T extends 'select' | 'select multiple'
+                               ? {
+                                               name: string;
+                                               multiple: T extends 'select' ? false : true;
+                                               'aria-invalid': boolean | 'false' | 'true' | undefined;
+                                               get value(): string | number;
+                                               set value(v: string | number);
+                                       }
+                               : T extends 'text'
+                                       ? {
+                                                       name: string;
+                                                       'aria-invalid': boolean | 'false' | 'true' | undefined;
+                                                       get value(): string | number;
+                                                       set value(v: string | number);
+                                               }
+                                       : {
+                                                       name: string;
+                                                       type: T;
+                                                       'aria-invalid': boolean | 'false' | 'true' | undefined;
+                                                       get value(): string | number;
+                                                       set value(v: string | number);
+                                               };
 
        type RemoteFormFieldMethods<T> = {
                /** The values that will be submitted */