Merged environment.ts and variables.ts

packages/hoppscotch-data/src/environment.ts

@@ -16,7 +16,7 @@ export type Variables = {
 
 
 const REGEX_ENV_VAR = /<<([^>]*)>>/g // "<<myVariable>>"
-const REGEX_PATH_VAR = /{{([^}]*)}}/g // "{{myVariable}}"
+const REGEX_MY_VAR = /{{([^}]*)}}/g // "{{myVariable}}"
 
 /**
  * How much times can we expand environment variables
@@ -67,13 +67,20 @@ export const parseBodyEnvVariables = (
 export function parseTemplateStringE(
   str: string,
   variables: Environment["variables"],
+  myVariables?: Variables
 ) {
+  /*
   if (!variables || !str ) {
     return E.right(str)
   }
+  */
 
+  if (!variables || !str || !myVariables) {
+    return E.right(str)
+  }
   let result = str
   let depth = 0
+  let errorBound = 0
 
   while (result.match(REGEX_ENV_VAR) != null && depth <= ENV_MAX_EXPAND_LIMIT) {
     result = decodeURI(encodeURI(result)).replace(
@@ -83,9 +90,18 @@ export function parseTemplateStringE(
     depth++
   }
 
-  return depth > ENV_MAX_EXPAND_LIMIT
-    ? E.left(ENV_EXPAND_LOOP)
-    : E.right(result)
+  while (result.match(REGEX_MY_VAR) != null && errorBound <= ENV_MAX_EXPAND_LIMIT) {
+    result = decodeURI(encodeURI(result)).replace(
+      REGEX_MY_VAR,
+      (_, p1) => myVariables.find((x) => x.key === p1)?.value || ""
+    )
+    errorBound++
+  }
+  if(depth > ENV_MAX_EXPAND_LIMIT && errorBound <= ENV_MAX_EXPAND_LIMIT) {
+    return E.right(result)
+  }else{
+    return E.left(ENV_EXPAND_LOOP)
+  }
 }
 
 /**
@@ -93,9 +109,10 @@ export function parseTemplateStringE(
  */
 export const parseTemplateString = (
   str: string,
-  variables: Environment["variables"]
+  variables: Environment["variables"],
+  myVariables?: Variables
 ) =>
   pipe(
-    parseTemplateStringE(str, variables),
+    parseTemplateStringE(str, variables, myVariables),
     E.getOrElse(() => str)
   )