🧐 Add exportResults script

packages/bot-engine/blocks/integrations/sendEmail/executeSendEmailBlock.tsx

@@ -11,7 +11,6 @@ import {
 import { createTransport } from 'nodemailer'
 import Mail from 'nodemailer/lib/mailer'
 import { byId, isDefined, isEmpty, isNotDefined, omit } from '@typebot.io/lib'
-import { getDefinedVariables, parseAnswers } from '@typebot.io/lib/results'
 import { decrypt } from '@typebot.io/lib/api/encryption/decrypt'
 import { defaultFrom, defaultTransportOptions } from './constants'
 import { findUniqueVariableValue } from '@typebot.io/variables/findUniqueVariableValue'
@@ -20,6 +19,7 @@ import { ExecuteIntegrationResponse } from '../../../types'
 import prisma from '@typebot.io/lib/prisma'
 import { parseVariables } from '@typebot.io/variables/parseVariables'
 import { defaultSendEmailOptions } from '@typebot.io/schemas/features/blocks/integrations/sendEmail/constants'
+import { parseAnswers } from '@typebot.io/lib/results/parseAnswers'
 
 export const sendEmailSuccessDescription = 'Email successfully sent'
 export const sendEmailErrorDescription = 'Email not sent'
@@ -248,7 +248,7 @@ const getEmailBody = async ({
       text: !isBodyCode ? body : undefined,
     }
   const answers = parseAnswers({
-    variables: getDefinedVariables(typebot.variables),
+    variables: typebot.variables,
     answers: answersInSession,
   })
   return {

packages/bot-engine/blocks/integrations/webhook/executeWebhookBlock.ts

@@ -14,7 +14,6 @@ import {
 } from '@typebot.io/schemas'
 import { stringify } from 'qs'
 import { isDefined, isEmpty, isNotDefined, omit } from '@typebot.io/lib'
-import { getDefinedVariables, parseAnswers } from '@typebot.io/lib/results'
 import got, { Method, HTTPError, OptionsInit } from 'got'
 import { resumeWebhookExecution } from './resumeWebhookExecution'
 import { ExecuteIntegrationResponse } from '../../../types'
@@ -27,6 +26,7 @@ import {
   maxTimeout,
 } from '@typebot.io/schemas/features/blocks/integrations/webhook/constants'
 import { env } from '@typebot.io/env'
+import { parseAnswers } from '@typebot.io/lib/results/parseAnswers'
 
 type ParsedWebhook = ExecutableWebhook & {
   basicAuth: { username?: string; password?: string }
@@ -297,7 +297,7 @@ const getBodyContent = async ({
     ? JSON.stringify(
         parseAnswers({
           answers,
-          variables: getDefinedVariables(variables),
+          variables,
         })
       )
     : body ?? undefined

packages/bot-engine/blocks/integrations/webhook/parseSampleResult.ts

@@ -8,9 +8,9 @@ import {
   Variable,
 } from '@typebot.io/schemas'
 import { isInputBlock, byId, isNotDefined } from '@typebot.io/lib'
-import { parseResultHeader } from '@typebot.io/lib/results'
 import { InputBlockType } from '@typebot.io/schemas/features/blocks/inputs/constants'
 import { LogicBlockType } from '@typebot.io/schemas/features/blocks/logic/constants'
+import { parseResultHeader } from '@typebot.io/lib/results/parseResultHeader'
 
 export const parseSampleResult =
   (

packages/bot-engine/blocks/integrations/zemanticAi/executeZemanticAiBlock.ts

@@ -7,10 +7,10 @@ import {
 import got from 'got'
 import { decrypt } from '@typebot.io/lib/api/encryption/decrypt'
 import { byId, isDefined, isEmpty } from '@typebot.io/lib'
-import { getDefinedVariables, parseAnswers } from '@typebot.io/lib/results'
 import prisma from '@typebot.io/lib/prisma'
 import { ExecuteIntegrationResponse } from '../../../types'
 import { updateVariablesInSession } from '@typebot.io/variables/updateVariablesInSession'
+import { parseAnswers } from '@typebot.io/lib/results/parseAnswers'
 
 const URL = 'https://api.zemantic.ai/v1/search-documents'
 
@@ -50,7 +50,7 @@ export const executeZemanticAiBlock = async (
   const { typebot, answers } = newSessionState.typebotsQueue[0]
 
   const templateVars = parseAnswers({
-    variables: getDefinedVariables(typebot.variables),
+    variables: typebot.variables,
     answers: answers,
   })
 

packages/bot-engine/queries/createResultIfNotExist.ts

@@ -1,5 +1,4 @@
 import prisma from '@typebot.io/lib/prisma'
-import { getDefinedVariables } from '@typebot.io/lib/results'
 import { TypebotInSession } from '@typebot.io/schemas'
 
 type Props = {
@@ -27,7 +26,7 @@ export const createResultIfNotExist = async ({
         typebotId: typebot.id,
         isCompleted: isCompleted ? true : false,
         hasStarted,
-        variables: getDefinedVariables(typebot.variables),
+        variables: typebot.variables,
       },
     ],
   })

packages/bot-engine/queries/upsertResult.ts

@@ -1,6 +1,6 @@
 import prisma from '@typebot.io/lib/prisma'
-import { getDefinedVariables } from '@typebot.io/lib/results'
 import { TypebotInSession } from '@typebot.io/schemas'
+import { filterVariablesWithValues } from '@typebot.io/variables/filterVariablesWithValues'
 
 type Props = {
   resultId: string
@@ -18,7 +18,7 @@ export const upsertResult = async ({
     where: { id: resultId },
     select: { id: true },
   })
-  const variablesWithValue = getDefinedVariables(typebot.variables)
+  const variablesWithValue = filterVariablesWithValues(typebot.variables)
 
   if (existingResult) {
     return prisma.result.updateMany({