fanhuadesenlinnn/clash-party
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/mihomo-party-org/clash-party.git synced 2026-09-20 08:03:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: guard deepMerge + syntax behind isOverride

Browse Source
This commit is contained in:
Memory
2026-04-27 20:30:11 +08:00
committed by GitHub
parent 176f48c1de
commit 14ea267b67
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/core/factory.ts
View File

@@ -237,7 +237,7 @@ async function applyOverrides(
case 'yaml': {
let patch = parse(content) || {}
if (typeof patch !== 'object') patch = {}
profile = deepMerge(profile, patch)
profile = deepMerge(profile, patch, true)
break
}
}

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

@@ -10,7 +10,7 @@ function trimWrap(str: string): string {
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>, isOverride?: boolean): T {
for (const key in other) {
if (isObject(other[key])) {
if (key.endsWith('!')) {
@@ -19,14 +19,14 @@ export function deepMerge<T extends object>(target: T, other: Partial<T>): T {
} else {
const k = trimWrap(key)
if (!target[k]) Object.assign(target, { [k]: {} })
deepMerge(target[k] as object, other[k] as object)
deepMerge(target[k] as object, other[k] as object, isOverride)
}
} else if (Array.isArray(other[key])) {
if (key.startsWith('+')) {
if (isOverride && key.startsWith('+')) {
const k = trimWrap(key.slice(1))
if (!target[k]) Object.assign(target, { [k]: [] })
target[k] = [...other[key], ...(target[k] as never[])]
} else if (key.endsWith('+')) {
} else if (isOverride && key.endsWith('+')) {
const k = trimWrap(key.slice(0, -1))
if (!target[k]) Object.assign(target, { [k]: [] })
target[k] = [...(target[k] as never[]), ...other[key]]