Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/beige-dogs-sell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

fix: fix `RecursiveFormFields` type for recursive or unknown schemas
5 changes: 0 additions & 5 deletions .changeset/easy-plants-remain.md

This file was deleted.

6 changes: 6 additions & 0 deletions packages/kit/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @sveltejs/kit

## 2.46.5
### Patch Changes


- fix: ensure `form` remote functions' `fields.set` triggers reactivity ([#14661](https://github.com/sveltejs/kit/pull/14661))

## 2.46.4
### Patch Changes

Expand Down
2 changes: 1 addition & 1 deletion packages/kit/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sveltejs/kit",
"version": "2.46.4",
"version": "2.46.5",
"description": "SvelteKit is the fastest way to build Svelte apps",
"keywords": [
"framework",
Expand Down
22 changes: 17 additions & 5 deletions packages/kit/src/exports/public.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1917,19 +1917,31 @@ type RemoteFormFieldContainer<Value> = RemoteFormFieldMethods<Value> & {
/**
* Recursive type to build form fields structure with proxy access
*/
type RemoteFormFields<T> =
export type RemoteFormFields<T, Leaf extends boolean = false> =
WillRecurseIndefinitely<T> extends true
? RecursiveFormFields
? RecursiveFormFields<Leaf>
: NonNullable<T> extends string | number | boolean | File
? RemoteFormField<NonNullable<T>>
: T extends string[] | File[]
? RemoteFormField<T> & { [K in number]: RemoteFormField<T[number]> }
: T extends Array<infer U>
? RemoteFormFieldContainer<T> & { [K in number]: RemoteFormFields<U> }
: RemoteFormFieldContainer<T> & { [K in keyof T]-?: RemoteFormFields<T[K]> };
? RemoteFormFieldContainer<T> & {
[K in number]: RemoteFormFields<
U,
U extends RemoteFormFieldValue | unknown ? true : false
>;
}
: RemoteFormFieldContainer<T> & {
[K in keyof T]-?: RemoteFormFields<
T[K],
T[K] extends RemoteFormFieldValue | unknown ? true : false
>;
};

// By breaking this out into its own type, we avoid the TS recursion depth limit
type RecursiveFormFields = RemoteFormField<any> & { [key: string | number]: RecursiveFormFields };
type RecursiveFormFields<Leaf extends boolean = false> = (Leaf extends true
? RemoteFormField<any>
: RemoteFormFieldContainer<any>) & { [key: string | number]: RecursiveFormFields<true> };

type MaybeArray<T> = T | T[];

Expand Down
2 changes: 1 addition & 1 deletion packages/kit/src/version.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// generated during release, do not modify

/** @type {string} */
export const VERSION = '2.46.4';
export const VERSION = '2.46.5';
22 changes: 17 additions & 5 deletions packages/kit/types/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1893,19 +1893,31 @@ declare module '@sveltejs/kit' {
/**
* Recursive type to build form fields structure with proxy access
*/
type RemoteFormFields<T> =
export type RemoteFormFields<T, Leaf extends boolean = false> =
WillRecurseIndefinitely<T> extends true
? RecursiveFormFields
? RecursiveFormFields<Leaf>
: NonNullable<T> extends string | number | boolean | File
? RemoteFormField<NonNullable<T>>
: T extends string[] | File[]
? RemoteFormField<T> & { [K in number]: RemoteFormField<T[number]> }
: T extends Array<infer U>
? RemoteFormFieldContainer<T> & { [K in number]: RemoteFormFields<U> }
: RemoteFormFieldContainer<T> & { [K in keyof T]-?: RemoteFormFields<T[K]> };
? RemoteFormFieldContainer<T> & {
[K in number]: RemoteFormFields<
U,
U extends RemoteFormFieldValue | unknown ? true : false
>;
}
: RemoteFormFieldContainer<T> & {
[K in keyof T]-?: RemoteFormFields<
T[K],
T[K] extends RemoteFormFieldValue | unknown ? true : false
>;
};

// By breaking this out into its own type, we avoid the TS recursion depth limit
type RecursiveFormFields = RemoteFormField<any> & { [key: string | number]: RecursiveFormFields };
type RecursiveFormFields<Leaf extends boolean = false> = (Leaf extends true
? RemoteFormField<any>
: RemoteFormFieldContainer<any>) & { [key: string | number]: RecursiveFormFields<true> };

type MaybeArray<T> = T | T[];

Expand Down
Loading