mirrors/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia synced 2024-11-08 06:39:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update render.js

Browse Source 
(Feature Request #1580) Merge Environment nested objects instead of overwrite them
This commit is contained in:
Gabrz 2019-08-11 11:12:48 +02:00
parent 5ce2825ea9
commit e4137d83d2
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
packages/insomnia-app/app/common/render.js
View File

@ -55,9 +55,11 @@ export async function buildRenderContext(
// from top-most parent to bottom-most child // from top-most parent to bottom-most child
// Do an Object.assign, but render each property as it overwrites. This // Do an Object.assign, but render each property as it overwrites. This
// way we can keep same-name variables from the parent context. // way we can keep same-name variables from the parent context.
const renderContext = baseContext; let renderContext = baseContext;
for (const envObject: Object of envObjects) {
const keys = _getOrderedEnvironmentKeys(envObject); // Made the rendering into a recursive function to handle nested Objects
async function renderSubContext(subObject: Object, subContext: Object): Promise<any> {
const keys = _getOrderedEnvironmentKeys(subObject);
for (const key of keys) { for (const key of keys) {
/* /*
* If we're overwriting a string, try to render it first using the same key from the base * If we're overwriting a string, try to render it first using the same key from the base
@ -70,27 +72,37 @@ export async function buildRenderContext(
* A regular Object.assign would yield { base_url: '{{ base_url }}/foo' } and the * A regular Object.assign would yield { base_url: '{{ base_url }}/foo' } and the
* original base_url of google.com would be lost. * original base_url of google.com would be lost.
*/ */
if (typeof renderContext[key] === 'string') { if (typeof subContext[key] === 'string') {
const isSelfRecursive = envObject[key].match(`{{ ?${key}[ |][^}]*}}`); const isSelfRecursive = subObject[key].match(`{{ ?${key}[ |][^}]*}}`);
if (isSelfRecursive) { if (isSelfRecursive) {
// If we're overwriting a variable that contains itself, make sure we // If we're overwriting a variable that contains itself, make sure we
// render it first // render it first
renderContext[key] = await render( subContext[key] = await render(
envObject[key], subObject[key],
renderContext, // Only render with key being overwritten subContext, // Only render with key being overwritten
null, null,
KEEP_ON_ERROR, KEEP_ON_ERROR,
'Environment', 'Environment',
); );
} else { } else {
// Otherwise it's just a regular replacement // Otherwise it's just a regular replacement
renderContext[key] = envObject[key]; subContext[key] = subObject[key];
} }
} else if (typeof subContext[key] === 'object') {
// Context is of type object, Call this function recursively to handle nested objects.
subContext[key] = renderSubContext(subObject[key], subContext[key]);
} else { } else {
renderContext[key] = envObject[key]; // Context type is undefined, add the Object to the Context.
subContext[key] = subObject[key];
} }
} }
return subContext;
}
for (const envObject: Object of envObjects) {
// For every environment render the Objects
renderContext = await renderSubContext(envObject, renderContext);
} }
// Render the context with itself to fill in the rest. // Render the context with itself to fill in the rest.
@ -127,7 +139,6 @@ export async function buildRenderContext(
finalRenderContext[key] = renderResult; finalRenderContext[key] = renderResult;
} }
} }
return finalRenderContext; return finalRenderContext;
} }