cybercyst/bruno
1
0
Fork 0
mirror of https://github.com/usebruno/bruno.git synced 2025-05-05 15:32:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4483 from usebruno/fix/mock-builtin-bugs

Browse Source 
Fix: Mock/Random built-in variables related issues
This commit is contained in:
Anoop M D 2025-04-14 12:11:44 +05:30 committed by GitHub
commit 492449b7c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/bruno-electron/src/ipc/network/interpolate-vars.js
View File

@ -14,11 +14,25 @@ const getContentType = (headers = {}) => {
return contentType;
};
const interpolateMockVars = (str) => {
const interpolateMockVars = (str, { escapeJSONStrings }) => {
const patternRegex = /\{\{\$(\w+)\}\}/g;
return str.replace(patternRegex, (match, keyword) => {
const replacement = mockDataFunctions[keyword]?.();
return replacement || match;
let replacement = mockDataFunctions[keyword]?.();
if (replacement === undefined) return match;
replacement = String(replacement);
if (!escapeJSONStrings) return replacement;
// All the below chars inside of a JSON String field
// will make it invalid JSON. So we will have to escape them with `\`.
// This is not exhaustive but selective to what faker-js can output.
if (!/[\\\n\r\t\"]/.test(replacement)) return replacement;
return replacement
.replace(/\\/g, '\\\\')
.replace(/\n/g, '\\n')
.replace(/\r/g, '\\r')
.replace(/\t/g, '\\t')
.replace(/\"/g, '\\"');
});
};
@ -43,7 +57,7 @@ const interpolateVars = (request, envVariables = {}, runtimeVariables = {}, proc
});
});
const _interpolate = (str) => {
const _interpolate = (str, { escapeJSONStrings } = {}) => {
if (!str || !str.length || typeof str !== 'string') {
return str;
}
@ -64,7 +78,7 @@ const interpolateVars = (request, envVariables = {}, runtimeVariables = {}, proc
}
};
return interpolateMockVars(interpolate(str, combinedVars));
return interpolateMockVars(interpolate(str, combinedVars), { escapeJSONStrings });
};
request.url = _interpolate(request.url);
@ -83,12 +97,12 @@ const interpolateVars = (request, envVariables = {}, runtimeVariables = {}, proc
if (contentType.includes('json') && !Buffer.isBuffer(request.data)) {
if (typeof request.data === 'string') {
if (request.data.length) {
request.data = _interpolate(request.data);
request.data = _interpolate(request.data, { escapeJSONStrings: true });
}
} else if (typeof request.data === 'object') {
try {
let parsed = JSON.stringify(request.data);
parsed = _interpolate(parsed);
const jsonDoc = JSON.stringify(request.data);
const parsed = _interpolate(jsonDoc, { escapeJSONStrings: true });
request.data = JSON.parse(parsed);
} catch (err) {}
}