From cf3e50f084de4b4a73e97f4662cc0ccf3ed9984f Mon Sep 17 00:00:00 2001 From: Siddharth Gelera Date: Tue, 16 Sep 2025 12:47:45 +0530 Subject: [PATCH] fix: only add to settings if they were added --- packages/bruno-lang/v2/src/bruToJson.js | 27 +++++++++++++------------ 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/packages/bruno-lang/v2/src/bruToJson.js b/packages/bruno-lang/v2/src/bruToJson.js index 29fb7025d..572e126bd 100644 --- a/packages/bruno-lang/v2/src/bruToJson.js +++ b/packages/bruno-lang/v2/src/bruToJson.js @@ -287,7 +287,7 @@ const createGetNumFromRecord = (obj) => (key, { fallback } = {}) => { if (!(key in obj)) return fallback; - const asNumber = typeof obj[key] === 'number' ? obj[key] : Number(obj.key); + const asNumber = typeof obj[key] === 'number' ? obj[key] : Number(obj[key]); if (isNaN(asNumber)) { return fallback; } @@ -425,21 +425,22 @@ const sem = grammar.createSemantics().addAttribute('ast', { settings(_1, dictionary) { let settings = mapPairListToKeyValPair(dictionary.ast); - const getNumFromRecord = createGetNumFromRecord(settings); - const keepAliveInterval = getNumFromRecord('keepAliveInterval', { - fallback: 0 - }); - const connectionTimeout = getNumFromRecord('connectionTimeout', { - fallback: 250 - }); - - return { + const result = { settings: { - encodeUrl: typeof settings.encodeUrl === 'boolean' ? settings.encodeUrl : settings.encodeUrl === 'true', - keepAliveInterval, - connectionTimeout + encodeUrl: typeof settings.encodeUrl === 'boolean' ? settings.encodeUrl : settings.encodeUrl === 'true' } }; + + const getNumFromRecord = createGetNumFromRecord(settings); + const keepAliveInterval = getNumFromRecord('keepAliveInterval'); + const connectionTimeout = getNumFromRecord('connectionTimeout'); + + if (keepAliveInterval || connectionTimeout) { + result.settings.keepAliveInterval = keepAliveInterval; + result.settings.connectionTimeout = connectionTimeout; + } + + return result; }, grpc(_1, dictionary) { return {