MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-03-28 23:11:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

refactor(cli): fix settings merging so that settings using the new json format take priority over ones using the old format (#15116)

Browse Source
This commit is contained in:
Jacob Richman
2025-12-15 19:59:24 -08:00
committed by GitHub
parent 2995af6a21
commit 5ea5107d05
5 changed files with 276 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/cli/src/utils/deepMerge.test.ts
View File

@@ -199,4 +199,28 @@ describe('customDeepMerge', () => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
expect((result as any)['hooks']['disabled']).toEqual(['hook-a', 'hook-b']);
});
it('should overwrite primitive with object', () => {
const target = { a: 1 };
const source = { a: { b: 2 } };
const getMergeStrategy = () => undefined;
const result = customDeepMerge(getMergeStrategy, target, source);
expect(result).toEqual({ a: { b: 2 } });
});
it('should overwrite object with primitive', () => {
const target = { a: { b: 2 } };
const source = { a: 1 };
const getMergeStrategy = () => undefined;
const result = customDeepMerge(getMergeStrategy, target, source);
expect(result).toEqual({ a: 1 });
});
it('should not overwrite with undefined', () => {
const target = { a: 1 };
const source = { a: undefined };
const getMergeStrategy = () => undefined;
const result = customDeepMerge(getMergeStrategy, target, source);
expect(result).toEqual({ a: 1 });
});
});