YuuMJ1997/mihomo-party
1
0
Fork 0
mirror of https://gh.catmak.name/https://github.com/mihomo-party-org/mihomo-party synced 2025-12-27 05:00:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

correction of merge syntax

Browse Source
This commit is contained in:
pompurin404 2024-10-11 10:55:03 +08:00
parent b1e39ab4b3
commit e7ba8e7739
No known key found for this signature in database
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/utils/merge.ts
View File

@ -3,27 +3,36 @@ function isObject(item: any): boolean {
return item && typeof item === 'object' && !Array.isArray(item) return item && typeof item === 'object' && !Array.isArray(item)
} }
function trimWrap(str: string): string {
if (str.startsWith('<') && str.endsWith('>')) {
return str.slice(1, -1)
}
return str
}
export function deepMerge<T extends object>(target: T, other: Partial<T>): T { export function deepMerge<T extends object>(target: T, other: Partial<T>): T {
for (const key in other) { for (const key in other) {
if (isObject(other[key])) { if (isObject(other[key])) {
if (key.endsWith('!')) { if (key.endsWith('!')) {
const k = key.slice(0, -1) const k = trimWrap(key.slice(0, -1))
target[k] = other[key] target[k] = other[key]
} else { } else {
if (!target[key]) Object.assign(target, { [key]: {} }) const k = trimWrap(key)
deepMerge(target[key] as object, other[key] as object) if (!target[k]) Object.assign(target, { [k]: {} })
deepMerge(target[k] as object, other[k] as object)
} }
} else if (Array.isArray(other[key])) { } else if (Array.isArray(other[key])) {
if (key.startsWith('+')) { if (key.startsWith('+')) {
const k = key.slice(1) const k = trimWrap(key.slice(1))
if (!target[k]) Object.assign(target, { [k]: [] }) if (!target[k]) Object.assign(target, { [k]: [] })
target[k] = [...other[key], ...(target[k] as never[])] target[k] = [...other[key], ...(target[k] as never[])]
} else if (key.endsWith('+')) { } else if (key.endsWith('+')) {
const k = key.slice(0, -1) const k = trimWrap(key.slice(0, -1))
if (!target[k]) Object.assign(target, { [k]: [] }) if (!target[k]) Object.assign(target, { [k]: [] })
target[k] = [...(target[k] as never[]), ...other[key]] target[k] = [...(target[k] as never[]), ...other[key]]
} else { } else {
Object.assign(target, { [key]: other[key] }) const k = trimWrap(key)
Object.assign(target, { [k]: other[key] })
} }
} else { } else {
Object.assign(target, { [key]: other[key] }) Object.assign(target, { [key]: other[key] })