diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2024-11-01 18:33:06 -0400 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2024-11-20 22:22:29 -0500 |
| commit | 194bc20af1f87724e528ab60aa528f5873fb0665 (patch) | |
| tree | 48ed061bb2fb326c5931dee5fdae9a3faae033e4 /packages/frontend/src/scripts | |
| parent | factor out Following Feed list into SkFollowingRecentNotes.vue (diff) | |
| download | sharkey-194bc20af1f87724e528ab60aa528f5873fb0665.tar.gz sharkey-194bc20af1f87724e528ab60aa528f5873fb0665.tar.bz2 sharkey-194bc20af1f87724e528ab60aa528f5873fb0665.zip | |
fix type of deepMerge
Diffstat (limited to 'packages/frontend/src/scripts')
| -rw-r--r-- | packages/frontend/src/scripts/merge.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/frontend/src/scripts/merge.ts b/packages/frontend/src/scripts/merge.ts index 9794a300da..89fdda0cbb 100644 --- a/packages/frontend/src/scripts/merge.ts +++ b/packages/frontend/src/scripts/merge.ts @@ -18,7 +18,7 @@ function isPureObject(value: unknown): value is Record<string | number | symbol, * valueにないキーをdefからもらう（再帰的）\ * nullはそのまま、undefinedはdefの値 **/ -export function deepMerge<X extends Record<string | number | symbol, unknown>>(value: DeepPartial<X>, def: X): X { +export function deepMerge<X extends object>(value: DeepPartial<X>, def: X): X { if (isPureObject(value) && isPureObject(def)) { const result = deepClone(value as Cloneable) as X; for (const [k, v] of Object.entries(def) as [keyof X, X[keyof X]][]) { |