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

Renaming variables and parameters

Browse Source
This commit is contained in:
Jason Casareno
2022-08-01 13:15:01 -07:00
parent 11b8bb4571
commit f515ac4f52
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/hoppscotch-data/src/variables.ts
View File

@@ -32,9 +32,9 @@ const ENV_EXPAND_LOOP = "ENV_EXPAND_LOOP" as const
export function parseTemplateStringEV(
str: string,
variables: Environment["variables"],
pathVariables: Variables
myVariables: Variables
) {
if (!variables || !str || !pathVariables) {
if (!variables || !str || !myVariables) {
return E.right(str)
}
@@ -55,7 +55,7 @@ export function parseTemplateStringEV(
while (result.match(REGEX_MY_VAR) != null && depth <= ENV_MAX_EXPAND_LIMIT) {
result = decodeURI(encodeURI(result)).replace(
REGEX_MY_VAR,
(_, p1) => pathVariables.find((x) => x.key === p1)?.value || ""
(_, p1) => myVariables.find((x) => x.key === p1)?.value || ""
)
}
@@ -70,9 +70,9 @@ export function parseTemplateStringEV(
export const parseTemplateStringV = (
str: string,
variables: Environment["variables"],
pathVariables: Variables
myVariables: Variables
) =>
pipe(
parseTemplateStringEV(str, variables, pathVariables),
parseTemplateStringEV(str, variables, myVariables),
E.getOrElse(() => str)
)