From 14183d8b917cf9af1550226422200fbbd7f1dde5 Mon Sep 17 00:00:00 2001 From: Jason Casareno Date: Fri, 29 Jul 2022 18:07:06 -0700 Subject: [PATCH] Debugging effective final url (WIP) --- packages/hoppscotch-app/helpers/utils/EffectiveURL.ts | 1 - packages/hoppscotch-data/src/pathVariables.ts | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/hoppscotch-app/helpers/utils/EffectiveURL.ts b/packages/hoppscotch-app/helpers/utils/EffectiveURL.ts index 06814bda4..e8e8e08ff 100644 --- a/packages/hoppscotch-app/helpers/utils/EffectiveURL.ts +++ b/packages/hoppscotch-app/helpers/utils/EffectiveURL.ts @@ -19,7 +19,6 @@ import { arrayFlatMap, arraySort } from "../functional/array" import { toFormData } from "../functional/formData" import { tupleToRecord } from "../functional/record" import { getGlobalVariables } from "~/newstore/environments" -import { parseTemplateStringEV } from "@hoppscotch/data/src/pathVariables" export interface EffectiveHoppRESTRequest extends HoppRESTRequest { /** diff --git a/packages/hoppscotch-data/src/pathVariables.ts b/packages/hoppscotch-data/src/pathVariables.ts index 4809ace30..411e8e22f 100644 --- a/packages/hoppscotch-data/src/pathVariables.ts +++ b/packages/hoppscotch-data/src/pathVariables.ts @@ -64,9 +64,10 @@ export function parseTemplateStringEV( * @deprecated Use `parseTemplateStringE` instead */ -export const parseTemplateStringEV = ( +export const parseTemplateStringV = ( str: string, - variables: Environment["variables"] + variables: Environment["variables"], + pathVariables: Variables ) => pipe( parseTemplateStringEV(str, variables, pathVariables),