Skip to content

Fix incorrect argument order in JSON merging functions #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix incorrect argument order in JSON merging functions #79

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/lib/load/load-settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function mergeArrays(key: string, current: any[], incoming: any[]): any[] {

function mergeJsonStrings(current: string, incoming: string): string {
try {
return JSON.stringify(customDefu(JSON.parse(current), JSON.parse(incoming)))
return JSON.stringify(customDefu(JSON.parse(incoming), JSON.parse(current)))
} catch {
return incoming // If not valid JSON, return the incoming value
}
Expand All @@ -57,7 +57,7 @@ export default async function loadSettings(dir: string) {
const settings = readFile('settings', dir)
try {
const currentSettings = await api.client.request(readSettings())
const mergedSettings = customDefu(currentSettings, settings) as DirectusSettings
const mergedSettings = customDefu(settings, currentSettings) as DirectusSettings
await api.client.request(updateSettings(mergedSettings))
} catch (error) {
catchError(error)
Expand Down