From e1d7533384f792e4f7158619ee820ae5a0b1a38a Mon Sep 17 00:00:00 2001 From: Baptiste Arnaud Date: Wed, 20 Apr 2022 11:33:44 -0700 Subject: [PATCH] =?UTF-8?q?feat(engine):=20=F0=9F=9A=A7=20Help=20to=20debu?= =?UTF-8?q?g=20evaluated=20expressions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/bot-engine/src/services/variable.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/bot-engine/src/services/variable.ts b/packages/bot-engine/src/services/variable.ts index d1545cf3e..2f2c1b2ba 100644 --- a/packages/bot-engine/src/services/variable.ts +++ b/packages/bot-engine/src/services/variable.ts @@ -26,17 +26,15 @@ export const parseVariables = } export const evaluateExpression = (variables: Variable[]) => (str: string) => { + const evaluating = parseVariables(variables, { fieldToParse: 'id' })( + str.includes('return ') ? str : `return ${str}` + ) try { - const func = Function( - ...variables.map((v) => v.id), - parseVariables(variables, { fieldToParse: 'id' })( - str.includes('return ') ? str : `return ${str}` - ) - ) + const func = Function(...variables.map((v) => v.id), evaluating) const evaluatedResult = func(...variables.map((v) => v.value)) return isNotDefined(evaluatedResult) ? '' : evaluatedResult } catch (err) { - console.log(err) + console.log(`Evaluating: ${evaluating}`, err) return str } }