blsmedia/bot
2
0
Fork 0
Code Activity

feat(engine): ✨ Improve variables in executed codes

Browse Source
This commit is contained in:
Baptiste Arnaud
2022-03-31 16:41:18 +02:00
parent 82f7bf0ed6
commit db10f1ee89
11 changed files with 155 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/bot-engine/src/services/logic.ts
View File

@ -63,9 +63,8 @@ const executeSetVariable = (
): EdgeId | undefined => {
if (!step.options?.variableId || !step.options.expressionToEvaluate)
return step.outgoingEdgeId
const expression = step.options.expressionToEvaluate
const evaluatedExpression = evaluateExpression(
parseVariables(variables)(expression)
const evaluatedExpression = evaluateExpression(variables)(
step.options.expressionToEvaluate
)
const existingVariable = variables.find(byId(step.options.variableId))
if (!existingVariable) return step.outgoingEdgeId
@ -132,7 +131,11 @@ const executeCode = async (
{ typebot: { variables } }: LogicContext
) => {
if (!step.options.content) return
await Function(parseVariables(variables)(step.options.content))()
const func = Function(
...variables.map((v) => v.id),
parseVariables(variables, { fieldToParse: 'id' })(step.options.content)
)
await func(...variables.map((v) => v.value))
return step.outgoingEdgeId
}