vrr/qwen-code
2
0
Fork 0
mirror of https://github.com/QwenLM/qwen-code.git synced 2026-04-28 19:52:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Refactor: Improve env var resolution in settings

Browse source 
Refactors the `resolveEnvVarsInObject` function in settings to
explicitly handle primitive types (null, undefined, boolean, number)
at the beginning of the function. This clarifies the logic for
subsequent string, array, and object processing.
This commit is contained in:
jerop 2025-06-06 15:32:39 +00:00 • committed by Jerop Kipruto
parent 4e9d365407
commit 8c28250bb3
2 changed files with 62 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

52
packages/cli/src/config/settings.test.ts
View file

@ -482,6 +482,57 @@ describe('Settings Loading and Merging', () => {
delete process.env.ITEM_1;
delete process.env.ITEM_2;
});
it('should correctly pass through null, boolean, and number types, and handle undefined properties', () => {
process.env.MY_ENV_STRING = 'env_string_value';
process.env.MY_ENV_STRING_NESTED = 'env_string_nested_value';
const userSettingsContent = {
nullVal: null,
trueVal: true,
falseVal: false,
numberVal: 123.45,
stringVal: '$MY_ENV_STRING',
nestedObj: {
nestedNull: null,
nestedBool: true,
nestedNum: 0,
nestedString: 'literal',
anotherEnv: '${MY_ENV_STRING_NESTED}',
},
};
(mockFsExistsSync as Mock).mockImplementation(
(p: fs.PathLike) => p === USER_SETTINGS_PATH,
);
(fs.readFileSync as Mock).mockImplementation(
(p: fs.PathOrFileDescriptor) => {
if (p === USER_SETTINGS_PATH)
return JSON.stringify(userSettingsContent);
return '{}';
},
);
const settings = loadSettings(MOCK_WORKSPACE_DIR);
expect(settings.user.settings.nullVal).toBeNull();
expect(settings.user.settings.trueVal).toBe(true);
expect(settings.user.settings.falseVal).toBe(false);
expect(settings.user.settings.numberVal).toBe(123.45);
expect(settings.user.settings.stringVal).toBe('env_string_value');
expect(settings.user.settings.undefinedVal).toBeUndefined();
expect(settings.user.settings.nestedObj.nestedNull).toBeNull();
expect(settings.user.settings.nestedObj.nestedBool).toBe(true);
expect(settings.user.settings.nestedObj.nestedNum).toBe(0);
expect(settings.user.settings.nestedObj.nestedString).toBe('literal');
expect(settings.user.settings.nestedObj.anotherEnv).toBe(
'env_string_nested_value',
);
delete process.env.MY_ENV_STRING;
delete process.env.MY_ENV_STRING_NESTED;
});
});
describe('LoadedSettings class', () => {
@ -518,6 +569,7 @@ describe('Settings Loading and Merging', () => {
);
loadedSettings.setValue(SettingScope.Workspace, 'theme', 'ocean');
expect(loadedSettings.workspace.settings.theme).toBe('ocean');
expect(loadedSettings.merged.theme).toBe('ocean');
});