🐛 Await support in set variable and script code

Closes #467
baptisteArno · Apr 17, 2023 · 918dffb · 918dffb
1 parent 5610fe0
commit 918dffb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/packages/embeds/js/src/features/blocks/logic/script/executeScript.ts b/packages/embeds/js/src/features/blocks/logic/script/executeScript.ts
@@ -1,7 +1,13 @@
 import type { ScriptToExecute } from '@typebot.io/schemas'
 
+// eslint-disable-next-line @typescript-eslint/no-empty-function
+const AsyncFunction = Object.getPrototypeOf(async function () {}).constructor
+
 export const executeScript = async ({ content, args }: ScriptToExecute) => {
-  const func = Function(...args.map((arg) => arg.id), parseContent(content))
+  const func = AsyncFunction(
+    ...args.map((arg) => arg.id),
+    parseContent(content)
+  )
   try {
     await func(...args.map((arg) => arg.value))
   } catch (err) {

diff --git a/packages/embeds/js/src/features/blocks/logic/setVariable/executeSetVariable.ts b/packages/embeds/js/src/features/blocks/logic/setVariable/executeSetVariable.ts
@@ -1,12 +1,15 @@
 import { isNotDefined } from '@typebot.io/lib'
 import type { ScriptToExecute } from '@typebot.io/schemas'
 
+// eslint-disable-next-line @typescript-eslint/no-empty-function
+const AsyncFunction = Object.getPrototypeOf(async function () {}).constructor
+
 export const executeSetVariable = async ({
   content,
   args,
 }: ScriptToExecute): Promise<{ replyToSend: string | undefined }> => {
   try {
-    const func = Function(
+    const func = AsyncFunction(
       ...args.map((arg) => arg.id),
       content.includes('return ') ? content : `return ${content}`
     )
@@ -15,6 +18,7 @@ export const executeSetVariable = async ({
       replyToSend: safeStringify(replyToSend),
     }
   } catch (err) {
+    console.error(err)
     return {
       replyToSend: safeStringify(content),
     }