btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Minor changes

Browse Source
This commit is contained in:
Jason Casareno
2022-08-03 16:18:15 -07:00
parent 775bf9a9c3
commit 4f71b163ea
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/hoppscotch-data/src/environment.ts
View File

@@ -69,15 +69,10 @@ export function parseTemplateStringE(
variables: Environment["variables"], variables: Environment["variables"],
myVariables?: Variables myVariables?: Variables
) { ) {
/*
if (!variables || !str ) {
return E.right(str)
}
*/
if (!variables || !str || !myVariables) { if (!variables || !str || !myVariables) {
return E.right(str) return E.right(str)
} }
let result = str let result = str
let depth = 0 let depth = 0
let errorBound = 0 let errorBound = 0
@@ -97,11 +92,8 @@ export function parseTemplateStringE(
) )
errorBound++ errorBound++
} }
if(depth > ENV_MAX_EXPAND_LIMIT && errorBound <= ENV_MAX_EXPAND_LIMIT) {
return E.right(result) return depth <= ENV_MAX_EXPAND_LIMIT && errorBound <= ENV_MAX_EXPAND_LIMIT ? E.right(result) : E.left(ENV_EXPAND_LOOP);
}else{
return E.left(ENV_EXPAND_LOOP)
}
} }
/** /**